soc.git
3 years agowhoops detected page name wrong, for special case fixedshift
Luke Kenneth Casson Leighton [Fri, 19 Jun 2020 12:50:13 +0000 (13:50 +0100)]
whoops detected page name wrong, for special case fixedshift

3 years agobit of a mess. getting carry recognised and output for shiftrot
Luke Kenneth Casson Leighton [Fri, 19 Jun 2020 12:45:01 +0000 (13:45 +0100)]
bit of a mess.  getting carry recognised and output for shiftrot
was interfering with fixedarith carry "implicit" computation.
had to special-case this in pywriter.py and parser.py

3 years agoadd auto-assign mode detecting uninitialised variable slices
Luke Kenneth Casson Leighton [Fri, 19 Jun 2020 12:08:18 +0000 (13:08 +0100)]
add auto-assign mode detecting uninitialised variable slices

3 years agodiv needs to be floordiv
Luke Kenneth Casson Leighton [Fri, 19 Jun 2020 10:36:12 +0000 (11:36 +0100)]
div needs to be floordiv

3 years agoadd true and floor div to SelectableInt
Luke Kenneth Casson Leighton [Fri, 19 Jun 2020 09:54:14 +0000 (10:54 +0100)]
add true and floor div to SelectableInt

3 years agoadd simulator test for divw
Luke Kenneth Casson Leighton [Fri, 19 Jun 2020 09:49:20 +0000 (10:49 +0100)]
add simulator test for divw

3 years agodo mix-in for test_sim.py so that jacob can write some div tests without
Luke Kenneth Casson Leighton [Fri, 19 Jun 2020 02:06:41 +0000 (03:06 +0100)]
do mix-in for test_sim.py so that jacob can write some div tests without
having to run all the other ones

3 years agoadd TODO comments to upgrade L0CacheBuffer to a new TestMemoryLoadStoreUnit
Luke Kenneth Casson Leighton [Fri, 19 Jun 2020 02:00:58 +0000 (03:00 +0100)]
add TODO comments to upgrade L0CacheBuffer to a new TestMemoryLoadStoreUnit

3 years agoparameterise LoadStoreUnitInterface to be expandable
Luke Kenneth Casson Leighton [Fri, 19 Jun 2020 01:44:24 +0000 (02:44 +0100)]
parameterise LoadStoreUnitInterface to be expandable

3 years agodiv pipe completed except for tests
Jacob Lifshay [Thu, 18 Jun 2020 23:11:10 +0000 (16:11 -0700)]
div pipe completed except for tests

3 years agofinish code to calculate the 64-bit output of the div pipeline
Jacob Lifshay [Thu, 18 Jun 2020 22:47:12 +0000 (15:47 -0700)]
finish code to calculate the 64-bit output of the div pipeline

3 years agoactually remove todo comment for manually checking against instruction models
Jacob Lifshay [Thu, 18 Jun 2020 22:32:50 +0000 (15:32 -0700)]
actually remove todo comment for manually checking against instruction models

3 years agoMerge branch 'master' of ssh://git.libre-riscv.org:922/soc
Jacob Lifshay [Thu, 18 Jun 2020 22:31:14 +0000 (15:31 -0700)]
Merge branch 'master' of ssh://git.libre-riscv.org:922/soc

3 years agofix bug and manually check div overflow code against instruction models
Jacob Lifshay [Thu, 18 Jun 2020 22:27:39 +0000 (15:27 -0700)]
fix bug and manually check div overflow code against instruction models

3 years agoenable general test cases in test_issuer
Luke Kenneth Casson Leighton [Thu, 18 Jun 2020 17:05:59 +0000 (18:05 +0100)]
enable general test cases in test_issuer

3 years agogot loop example operational by noting when PC fastreg changed
Luke Kenneth Casson Leighton [Thu, 18 Jun 2020 17:05:40 +0000 (18:05 +0100)]
got loop example operational by noting when PC fastreg changed

3 years agouse different way to pass instructions to test_issuer ISACaller
Luke Kenneth Casson Leighton [Thu, 18 Jun 2020 10:29:29 +0000 (11:29 +0100)]
use different way to pass instructions to test_issuer ISACaller

3 years agodebugging test_issuer.py general test cases
Luke Kenneth Casson Leighton [Thu, 18 Jun 2020 10:26:35 +0000 (11:26 +0100)]
debugging test_issuer.py general test cases

3 years agoget instructions immediately from assembly code
Luke Kenneth Casson Leighton [Thu, 18 Jun 2020 10:26:10 +0000 (11:26 +0100)]
get instructions immediately from assembly code

3 years agomove test_sim.py unit tests to different class (split)
Luke Kenneth Casson Leighton [Thu, 18 Jun 2020 10:06:16 +0000 (11:06 +0100)]
move test_sim.py unit tests to different class (split)

3 years agoslightly hacky way to keep an eye on the PC
Luke Kenneth Casson Leighton [Thu, 18 Jun 2020 09:58:18 +0000 (10:58 +0100)]
slightly hacky way to keep an eye on the PC

3 years agowhoops generate core ilang not TestIssuer
Luke Kenneth Casson Leighton [Thu, 18 Jun 2020 09:52:06 +0000 (10:52 +0100)]
whoops generate core ilang not TestIssuer

3 years agouse while / exception in test_compunit loop
Luke Kenneth Casson Leighton [Thu, 18 Jun 2020 09:50:47 +0000 (10:50 +0100)]
use while / exception in test_compunit loop

3 years agoinvestigating mtocrf/mtcrf issue
Luke Kenneth Casson Leighton [Thu, 18 Jun 2020 09:45:04 +0000 (10:45 +0100)]
investigating mtocrf/mtcrf issue

3 years agoworking on adding rest of stage classes for div pipeline
Jacob Lifshay [Thu, 18 Jun 2020 02:56:07 +0000 (19:56 -0700)]
working on adding rest of stage classes for div pipeline

3 years agoadd bug reference to mtocrf/mtcrf name decoding
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 19:43:08 +0000 (20:43 +0100)]
add bug reference to mtocrf/mtcrf name decoding

3 years agodecoding assembly instruction name, move to separate function
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 19:39:21 +0000 (20:39 +0100)]
decoding assembly instruction name, move to separate function

3 years agogetting sim instruction decoder to reproduce asm instruction disassembly
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 19:20:35 +0000 (20:20 +0100)]
getting sim instruction decoder to reproduce asm instruction disassembly

3 years agoupdate submodule
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 17:32:12 +0000 (18:32 +0100)]
update submodule

3 years agoadd comment/assembly decode in power enums
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 17:31:40 +0000 (18:31 +0100)]
add comment/assembly decode in power enums

3 years agoupdate test_sim.py to do a simple execution loop: decode-execute-decode-execute
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 16:46:33 +0000 (17:46 +0100)]
update test_sim.py to do a simple execution loop: decode-execute-decode-execute

3 years agoadd loop example, required a bit of munging.
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 16:10:21 +0000 (17:10 +0100)]
add loop example, required a bit of munging.

3 years agoget fu compunit test to use ISACaller instruction-memory
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 14:55:04 +0000 (15:55 +0100)]
get fu compunit test to use ISACaller instruction-memory

3 years agogot fed up of adding arguments to ISACaller / ISA, use *args and **kwargs
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 14:46:04 +0000 (15:46 +0100)]
got fed up of adding arguments to ISACaller / ISA, use *args and **kwargs

3 years agosplit execute and setup of ISACaller instruction execution
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 14:40:46 +0000 (15:40 +0100)]
split execute and setup of ISACaller instruction execution
into two phases

3 years agocomment ISACaller setup
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 14:24:27 +0000 (15:24 +0100)]
comment ISACaller setup

3 years agostart to add in independent execution into ISACaller
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 14:20:35 +0000 (15:20 +0100)]
start to add in independent execution into ISACaller

3 years agoadd a fake program counter to ISACaller
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 13:42:47 +0000 (14:42 +0100)]
add a fake program counter to ISACaller

3 years agouse an independent power decoder in ISACaller
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 13:42:33 +0000 (14:42 +0100)]
use an independent power decoder in ISACaller

3 years agoadd "respect_pc" boolean to ISACaller
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 13:20:06 +0000 (14:20 +0100)]
add "respect_pc" boolean to ISACaller

3 years agoadd optional instruction memory
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 13:07:59 +0000 (14:07 +0100)]
add optional instruction memory

3 years agosplit out TestIssuer into separate module
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 11:17:31 +0000 (12:17 +0100)]
split out TestIssuer into separate module

3 years agoremove unneeded yield
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 11:08:08 +0000 (12:08 +0100)]
remove unneeded yield

3 years agoenable all tests again in test_core.py and test_issuer.py
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 05:41:09 +0000 (06:41 +0100)]
enable all tests again in test_core.py and test_issuer.py

3 years agogot test_issuer FSM operating. bit of a hack
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 05:39:53 +0000 (06:39 +0100)]
got test_issuer FSM operating.  bit of a hack

3 years agodebugging test_issuer, getting FSM working
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 04:42:10 +0000 (05:42 +0100)]
debugging test_issuer, getting FSM working

3 years agooutput to issuer_simulator.vcd
Luke Kenneth Casson Leighton [Wed, 17 Jun 2020 04:14:40 +0000 (05:14 +0100)]
output to issuer_simulator.vcd

3 years agoadd first version unit test for TestIssuer
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 18:33:05 +0000 (19:33 +0100)]
add first version unit test for TestIssuer

3 years agoreduce instruction depth to 6 bits in TestIssuer
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 18:32:46 +0000 (19:32 +0100)]
reduce instruction depth to 6 bits in TestIssuer

3 years agomove debug statements to check function
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 18:21:20 +0000 (19:21 +0100)]
move debug statements to check function

3 years agohack LD/ST ad/st together, allow PC to be set externally
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 18:12:01 +0000 (19:12 +0100)]
hack LD/ST ad/st together, allow PC to be set externally

3 years agomove check regs in simple core to separate function
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 17:29:37 +0000 (18:29 +0100)]
move check regs in simple core to separate function

3 years agomove test core reg set up into separate function
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 17:24:43 +0000 (18:24 +0100)]
move test core reg set up into separate function

3 years agoset up a TestIssuer class with a FSM for doing instruction issue to simple core
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 17:18:20 +0000 (18:18 +0100)]
set up a TestIssuer class with a FSM for doing instruction issue to simple core

3 years agoadd ports to TestMemory
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 17:16:53 +0000 (18:16 +0100)]
add ports to TestMemory

3 years agoadd beginnings of TestIssuer class, to issue instructions to simple core
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 14:39:03 +0000 (15:39 +0100)]
add beginnings of TestIssuer class, to issue instructions to simple core

3 years agoweird: adding TestMemory with no port causes nmigen recursion-exceeded
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 13:00:12 +0000 (14:00 +0100)]
weird: adding TestMemory with no port causes nmigen recursion-exceeded

3 years agorefer to signals directly in Test Core
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 12:57:41 +0000 (13:57 +0100)]
refer to signals directly in Test Core

3 years agoadd test instruction memory SRAM
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 12:41:17 +0000 (13:41 +0100)]
add test instruction memory SRAM

3 years agoupdate popcount docstring
Luke Kenneth Casson Leighton [Tue, 16 Jun 2020 11:15:42 +0000 (12:15 +0100)]
update popcount docstring

3 years agostart trying to fill in some comments in Minerva L1 cache code
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 23:52:30 +0000 (00:52 +0100)]
start trying to fill in some comments in Minerva L1 cache code

3 years agowhitespace cleanup
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 20:56:24 +0000 (21:56 +0100)]
whitespace cleanup

3 years agoimports and syntax errors fixed (found test_cache.py)
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 20:55:39 +0000 (21:55 +0100)]
imports and syntax errors fixed (found test_cache.py)

3 years agomore whitespace
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 19:53:43 +0000 (20:53 +0100)]
more whitespace

3 years agomore whitespace on minerva (no unit tests, so cannot check it)
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 19:51:56 +0000 (20:51 +0100)]
more whitespace on minerva (no unit tests, so cannot check it)

3 years agowhitespace cleanup, remove minerva DataSelector class
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 19:46:25 +0000 (20:46 +0100)]
whitespace cleanup, remove minerva DataSelector class

3 years agohave to set up addr/st rel-go link before setting up nmigen Simulator
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 19:05:32 +0000 (20:05 +0100)]
have to set up addr/st rel-go link before setting up nmigen Simulator
LD/ST now works in test_core.py

3 years agoadd in memory setup/check but disable LDST Unit Tests in core.py
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 14:54:49 +0000 (15:54 +0100)]
add in memory setup/check but disable LDST Unit Tests in core.py
LDST is still busy after 2nd instruction, bug needs tracking down

3 years agomove setup/check memory into helper functions for use in test_core.py
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 14:40:36 +0000 (15:40 +0100)]
move setup/check memory into helper functions for use in test_core.py

3 years agowhoops LDSTCompUnit was identified as a Function.ALU not a Function.LDST
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 14:33:35 +0000 (15:33 +0100)]
whoops LDSTCompUnit was identified as a Function.ALU not a Function.LDST

3 years agoadd in TstL0CacheBuffer but disable temporarily
Luke Kenneth Casson Leighton [Mon, 15 Jun 2020 14:26:05 +0000 (15:26 +0100)]
add in TstL0CacheBuffer but disable temporarily

3 years agoadd optional LDSTFunctionUnit to compunits
Luke Kenneth Casson Leighton [Sun, 14 Jun 2020 20:22:04 +0000 (21:22 +0100)]
add optional LDSTFunctionUnit to compunits

3 years agounit tests showing byte-reverse works
Luke Kenneth Casson Leighton [Sun, 14 Jun 2020 17:08:23 +0000 (18:08 +0100)]
unit tests showing byte-reverse works

3 years agoadd sim-qemu test for byte-reversed LD/ST
Luke Kenneth Casson Leighton [Sun, 14 Jun 2020 16:51:17 +0000 (17:51 +0100)]
add sim-qemu test for byte-reversed LD/ST

3 years agoadd in byte-reverse from op PowerDecode2 field
Luke Kenneth Casson Leighton [Sun, 14 Jun 2020 16:40:20 +0000 (17:40 +0100)]
add in byte-reverse from op PowerDecode2 field

3 years agoerror in address width (truncated) in setting up L0CacheBuffer
Luke Kenneth Casson Leighton [Sun, 14 Jun 2020 14:50:35 +0000 (15:50 +0100)]
error in address width (truncated) in setting up L0CacheBuffer

3 years agoerror in naming that ended up in gtkwave from a proxy
Luke Kenneth Casson Leighton [Sun, 14 Jun 2020 14:49:27 +0000 (15:49 +0100)]
error in naming that ended up in gtkwave from a proxy

3 years agoadd another LD/ST example to qemu-sim test,
Luke Kenneth Casson Leighton [Sun, 14 Jun 2020 14:37:30 +0000 (15:37 +0100)]
add another LD/ST example to qemu-sim test,
mirroring the one in ldst compunit test

3 years agoadd byte-reversal on LD and ST in L0CacheBuffer
Luke Kenneth Casson Leighton [Sun, 14 Jun 2020 14:36:57 +0000 (15:36 +0100)]
add byte-reversal on LD and ST in L0CacheBuffer

3 years agoreasonably certain that the careful and slow use of little-endian data read/write
Luke Kenneth Casson Leighton [Sun, 14 Jun 2020 14:00:12 +0000 (15:00 +0100)]
reasonably certain that the careful and slow use of little-endian data read/write
and explicit endian-ness swapping is correct, when comparing the
simulator against qemu

3 years agoWait for all active rel signals to be high, and only then pulse go.
Cesar Strauss [Sat, 13 Jun 2020 23:51:14 +0000 (20:51 -0300)]
Wait for all active rel signals to be high, and only then pulse go.

It's the best we can do without parallel processes.

3 years agofirst cut at qemu memory dump and compare
Luke Kenneth Casson Leighton [Fri, 12 Jun 2020 18:44:09 +0000 (19:44 +0100)]
first cut at qemu memory dump and compare

3 years agonote possible BE/LE mode needed for memory reads/writes
Luke Kenneth Casson Leighton [Fri, 12 Jun 2020 15:28:32 +0000 (16:28 +0100)]
note possible BE/LE mode needed for memory reads/writes

3 years agoupdate ld/st test to see what is going on
Luke Kenneth Casson Leighton [Fri, 12 Jun 2020 14:58:21 +0000 (15:58 +0100)]
update ld/st test to see what is going on

3 years agotracking down what looks like an error in the Simulator Mem ld/st
Luke Kenneth Casson Leighton [Fri, 12 Jun 2020 14:41:16 +0000 (15:41 +0100)]
tracking down what looks like an error in the Simulator Mem ld/st

3 years agodebug printout of sim and hardware memory, shows mismatch of depths
Luke Kenneth Casson Leighton [Fri, 12 Jun 2020 14:03:10 +0000 (15:03 +0100)]
debug printout of sim and hardware memory, shows mismatch of depths

3 years agouse ALUHelpers in LDSTCompUnit test
Luke Kenneth Casson Leighton [Fri, 12 Jun 2020 13:46:25 +0000 (14:46 +0100)]
use ALUHelpers in LDSTCompUnit test

3 years agosome ugly hacks that get LD/ST immediate working
Luke Kenneth Casson Leighton [Thu, 11 Jun 2020 19:03:30 +0000 (20:03 +0100)]
some ugly hacks that get LD/ST immediate working

3 years agoeven more complexity in CompALUMulti, to deal with an edge case where
Luke Kenneth Casson Leighton [Thu, 11 Jun 2020 14:29:41 +0000 (15:29 +0100)]
even more complexity in CompALUMulti, to deal with an edge case where
go-write is requested immediately (same cycle as go-req).
the set and reset on "req_l" happen to come in on the same cycle.
the result: the latch *remains* set high.
solution: record the go signals for one extra cycle (sync) and push
them into the req-reset and wr_any signals

3 years agomust distinguish between rd/write xer_ca sim helpers
Luke Kenneth Casson Leighton [Thu, 11 Jun 2020 10:54:27 +0000 (11:54 +0100)]
must distinguish between rd/write xer_ca sim helpers

3 years agofixing get_rd_sim_xer_ca, has to only read carry if available
Luke Kenneth Casson Leighton [Thu, 11 Jun 2020 10:53:21 +0000 (11:53 +0100)]
fixing get_rd_sim_xer_ca, has to only read carry if available

3 years agoyield needed for unit tests to work (has to go)
Luke Kenneth Casson Leighton [Thu, 11 Jun 2020 10:53:00 +0000 (11:53 +0100)]
yield needed for unit tests to work (has to go)

3 years agoread and write version of get_sim_xer_ca are different
Luke Kenneth Casson Leighton [Thu, 11 Jun 2020 10:31:05 +0000 (11:31 +0100)]
read and write version of get_sim_xer_ca are different

3 years agouse ALUHelpers in shift_rot
Luke Kenneth Casson Leighton [Thu, 11 Jun 2020 10:23:10 +0000 (11:23 +0100)]
use ALUHelpers in shift_rot

3 years agoadd fast spr1/2 sim ALUHelpers
Luke Kenneth Casson Leighton [Thu, 11 Jun 2020 06:14:49 +0000 (07:14 +0100)]
add fast spr1/2 sim ALUHelpers

3 years agorename get_sim_cr_a to get_wr_sim_cr_a for now
Luke Kenneth Casson Leighton [Thu, 11 Jun 2020 06:10:27 +0000 (07:10 +0100)]
rename get_sim_cr_a to get_wr_sim_cr_a for now
add read-version of get_sim_cr_a

3 years agomove Decode2ToExecute1Type to separate module
Luke Kenneth Casson Leighton [Wed, 10 Jun 2020 23:56:58 +0000 (00:56 +0100)]
move Decode2ToExecute1Type to separate module

3 years agowhitespace
Luke Kenneth Casson Leighton [Wed, 10 Jun 2020 23:48:01 +0000 (00:48 +0100)]
whitespace

3 years agomodify qemu.py to set qemu's cr to 0
Michael Nolan [Wed, 10 Jun 2020 19:28:30 +0000 (15:28 -0400)]
modify qemu.py to set qemu's cr to 0

3 years agolink ST.go directly to ST.rel
Luke Kenneth Casson Leighton [Wed, 10 Jun 2020 16:41:35 +0000 (17:41 +0100)]
link ST.go directly to ST.rel