soc.git
2 years agomore use of TLBHit Record in D-Cache
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 21:41:41 +0000 (21:41 +0000)]
more use of TLBHit Record in D-Cache

2 years agocorrect tlb_hit_way and index sizes, use TLBHit Record in D-Cache
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 21:33:20 +0000 (21:33 +0000)]
correct tlb_hit_way and index sizes, use TLBHit Record in D-Cache

2 years agouse TLBRecord in D-Cache for which TLB is selected
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 21:11:27 +0000 (21:11 +0000)]
use TLBRecord in D-Cache for which TLB is selected

2 years agosplit out TLBRecord, correct number of valid bits
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 20:48:35 +0000 (20:48 +0000)]
split out TLBRecord, correct number of valid bits

2 years agouse Record in DCache for TLB
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 20:39:15 +0000 (20:39 +0000)]
use Record in DCache for TLB

2 years agouse Record in D-Cache Cache Tags
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 20:31:26 +0000 (20:31 +0000)]
use Record in D-Cache Cache Tags

2 years agowhitespace
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 20:20:27 +0000 (20:20 +0000)]
whitespace

2 years agouse Record for I-Cache Cache Tag/Valid
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 20:18:46 +0000 (20:18 +0000)]
use Record for I-Cache Cache Tag/Valid

2 years agowhitespace
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 20:05:47 +0000 (20:05 +0000)]
whitespace

2 years agouse Record for ICache TLB
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 20:02:18 +0000 (20:02 +0000)]
use Record for ICache TLB

2 years agosorting out test_mmu_dcache.py to use wb_get
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 14:24:48 +0000 (14:24 +0000)]
sorting out test_mmu_dcache.py to use wb_get

2 years agoconvert icache.py to standard wishbone Interface
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 14:19:27 +0000 (14:19 +0000)]
convert icache.py to standard wishbone Interface

2 years agofake up wishbone stall signal in icache.
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 13:38:37 +0000 (13:38 +0000)]
fake up wishbone stall signal in icache.
same thing is done in dcache

2 years agofix icache row store issue
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 13:38:19 +0000 (13:38 +0000)]
fix icache row store issue

2 years agousing same tag/row functions as in dcache.py
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 12:41:56 +0000 (12:41 +0000)]
using same tag/row functions as in dcache.py

2 years agomore signal sizes in icache.py
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 12:35:20 +0000 (12:35 +0000)]
more signal sizes in icache.py

2 years agoincorrect Signal sizes in icache.py,
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 12:26:43 +0000 (12:26 +0000)]
incorrect Signal sizes in icache.py,
e.g. using NUM_WAYS instead of WAY_BITS

2 years agosorting out icache.py, used to work
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 12:11:39 +0000 (12:11 +0000)]
sorting out icache.py, used to work

2 years agoremove redundant code
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 11:47:52 +0000 (11:47 +0000)]
remove redundant code

2 years agoadd I-Cache standard bus (not used yet)
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 11:46:53 +0000 (11:46 +0000)]
add I-Cache standard bus (not used yet)

2 years agoremove yet another duplicate copy of wb_get, possible (again) due to
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 11:25:10 +0000 (11:25 +0000)]
remove yet another duplicate copy of wb_get, possible (again) due to
adding wishbone standard interface to D-Cache

2 years agoreplace yet another duplicate copy of wb_get, possible after renaming
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 11:23:07 +0000 (11:23 +0000)]
replace yet another duplicate copy of wb_get, possible after renaming
the D-Cache wishbone bus

2 years agowishbone bus convert on dcache
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 01:29:58 +0000 (01:29 +0000)]
wishbone bus convert on dcache

2 years agocorrect import of wg_get function
Luke Kenneth Casson Leighton [Sun, 5 Dec 2021 00:26:50 +0000 (00:26 +0000)]
correct import of wg_get function

2 years agoremove yet another duplicated copy of wb_get and add some better
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 18:37:58 +0000 (18:37 +0000)]
remove yet another duplicated copy of wb_get and add some better
testing in misaligned mmu test

2 years agorename function which needs replacing
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 18:27:46 +0000 (18:27 +0000)]
rename function which needs replacing

2 years agoshould have been using common version of wb_get, not 8 duplicates
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 18:22:06 +0000 (18:22 +0000)]
should have been using common version of wb_get, not 8 duplicates

2 years agoshould not have been duplicating wb_get function in 5 places
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 18:17:13 +0000 (18:17 +0000)]
should not have been duplicating wb_get function in 5 places

2 years agoget test_mmu_dcache.py working again
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 18:15:11 +0000 (18:15 +0000)]
get test_mmu_dcache.py working again

2 years agoremove wb_get, should not have been duplicated
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 18:02:02 +0000 (18:02 +0000)]
remove wb_get, should not have been duplicated

2 years agoremove wb_get, should not have been massively duplicated. moved to openpower-isa
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 18:00:01 +0000 (18:00 +0000)]
remove wb_get, should not have been massively duplicated. moved to openpower-isa

2 years agofix return results from pi_ld
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 17:55:15 +0000 (17:55 +0000)]
fix return results from pi_ld

2 years agowark-wark, broke mmu with removing rin. reverted
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 15:27:42 +0000 (15:27 +0000)]
wark-wark, broke mmu with removing rin.  reverted

2 years agofixed wait_addr to exit immediately on exception
Tobias Platen [Sat, 4 Dec 2021 15:19:52 +0000 (16:19 +0100)]
fixed wait_addr to exit immediately on exception

2 years agotidyup, comments
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 15:11:07 +0000 (15:11 +0000)]
tidyup, comments

2 years agotidyup mmu
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 15:05:18 +0000 (15:05 +0000)]
tidyup mmu

2 years agosigh in MMU FSM use direct access to ldst.dar/dsisr for OP_MFSPR
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 14:59:52 +0000 (14:59 +0000)]
sigh in MMU FSM use direct access to ldst.dar/dsisr for OP_MFSPR
and likewise to mmu.

2 years agoremove DAR from PortInterface (where is the data going? there is no place
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 13:09:17 +0000 (13:09 +0000)]
remove DAR from PortInterface (where is the data going? there is no place
to put DAR if transmitted over PortInterface? what receives it? nothing

2 years agostop using dar_o from PortInterface, get DAR directly from LoadStore1
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 13:05:35 +0000 (13:05 +0000)]
stop using dar_o from PortInterface, get DAR directly from LoadStore1

2 years agoput DSISR and DAR publicly accessible in LoadStore1
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 13:05:05 +0000 (13:05 +0000)]
put DSISR and DAR publicly accessible in LoadStore1
these should ONLY be READ, NOT written to

2 years agowhoops fix up exception happened if alignment triggers from LoadStore1
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 13:01:26 +0000 (13:01 +0000)]
whoops fix up exception happened if alignment triggers from LoadStore1
set_wr_addr or set_rd_addr

2 years agofix pi_st which should not be trying to wait for the address
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 12:54:22 +0000 (12:54 +0000)]
fix pi_st which should not be trying to wait for the address
when an exception occurs.
TODO: fix wait_addr so that it exits if an exception occurs

2 years agofixing DAR updating from exceptions
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 12:03:07 +0000 (12:03 +0000)]
fixing DAR updating from exceptions

2 years agowhoops
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 11:46:57 +0000 (11:46 +0000)]
whoops

2 years agoMMU lookup DSISR load bit inverted in LoadStore1
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 11:46:34 +0000 (11:46 +0000)]
MMU lookup DSISR load bit inverted in LoadStore1

2 years agostore DAR in LoadStore1
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 11:45:59 +0000 (11:45 +0000)]
store DAR in LoadStore1

2 years agonot busy if excrption occurs on MMU_LOOKUP in loadstore.py
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 04:06:53 +0000 (04:06 +0000)]
not busy if excrption occurs on MMU_LOOKUP in loadstore.py

2 years agoadd means to update dsisr from MMU FSM. TODO: add a back-communication
Luke Kenneth Casson Leighton [Sat, 4 Dec 2021 01:25:05 +0000 (01:25 +0000)]
add means to update dsisr from MMU FSM. TODO: add a back-communication
to allow LoadStore1 to update a copy of dsisr in the MMU FSM

2 years agopriv_mode/virt_mode are set in the request, which is passed through
Luke Kenneth Casson Leighton [Fri, 3 Dec 2021 19:35:41 +0000 (19:35 +0000)]
priv_mode/virt_mode are set in the request, which is passed through
to the MMU, via the PortInterface "pr" parameter.

MMU should not itself be attempting to set d_in.priv_mode/virt_mode

this fixes case_5_ldst_exception

2 years agoin loadstore.py set align_intr from request which comes from PortInterface
Luke Kenneth Casson Leighton [Fri, 3 Dec 2021 19:19:36 +0000 (19:19 +0000)]
in loadstore.py set align_intr from request which comes from PortInterface
misalign, set it globally rather than from latched copy ldst_r

2 years agodriver conflict on priv_mode and virt_mode, do not understand right now,
Luke Kenneth Casson Leighton [Fri, 3 Dec 2021 19:17:11 +0000 (19:17 +0000)]
driver conflict on priv_mode and virt_mode, do not understand right now,
commenting them out in loadstore.py

2 years agofix up test_loadstore1.py
Luke Kenneth Casson Leighton [Fri, 3 Dec 2021 17:41:33 +0000 (17:41 +0000)]
fix up test_loadstore1.py

numerous things:
1) pi_ld and pi_st now return the exception information (full status)
   because pi_ld and pi_st both reset the PortInterface: once that
   happens the exception information is DESTROYED... therefore the
   exception information MUST be obtained INSIDE pi_ld and pi_st

2) cleanup of whitespace

3) added some (probably unnecessary) yields in between LD/ST in the
   exceptions test, to make the gtkwave output clearer

4) fixed the exceptions test and enabled it by default, now

2 years agoin loadstore.py, when an exception is done or if the FSM
Luke Kenneth Casson Leighton [Fri, 3 Dec 2021 17:38:26 +0000 (17:38 +0000)]
in loadstore.py, when an exception is done or if the FSM
is done, reset back to idle and indicate "not busy"

2 years agofix PortInterfaceBase
Luke Kenneth Casson Leighton [Fri, 3 Dec 2021 17:37:26 +0000 (17:37 +0000)]
fix PortInterfaceBase

* setting busy latch LOW on exception is not ok: this creates a
  combinatorial loop
* setting st_done permanently was a bug, it left st_done permanently HI
* setting st_done when an exception is raised was also a bug

2 years agofix up LDST test functions pi_ld and pi_st to respect timing
Luke Kenneth Casson Leighton [Fri, 3 Dec 2021 17:35:16 +0000 (17:35 +0000)]
fix up LDST test functions pi_ld and pi_st to respect timing
(combinatorial setting followed by test followed by immediate unsetting
is *not* ok.  it has to be set WAIT (yield one clock) and *then* clear)

added a simulation function get_exception_info() which returns a
LDSTExceptionTuple containing the yield()ed exception information
reason: at the time that the exception was raised, THAT is when
the exception information must be obtained.  by the time that
the LDST port is_ld_i/is_st_i is lowered, that is far too late

2 years agowhitespace
Luke Kenneth Casson Leighton [Fri, 3 Dec 2021 15:51:04 +0000 (15:51 +0000)]
whitespace

2 years agoadd misaligned ld/st to trigger an exception
Luke Kenneth Casson Leighton [Fri, 3 Dec 2021 15:22:10 +0000 (15:22 +0000)]
add misaligned ld/st to trigger an exception

2 years agocomment out dsisr and dar in mmu FSM for now
Luke Kenneth Casson Leighton [Fri, 3 Dec 2021 15:09:22 +0000 (15:09 +0000)]
comment out dsisr and dar in mmu FSM for now

2 years agoMerge branch 'master' of ssh://git.libre-riscv.org:922/soc
Tobias Platen [Thu, 2 Dec 2021 19:01:56 +0000 (20:01 +0100)]
Merge branch 'master' of ssh://git.libre-riscv.org:922/soc

2 years agocleanup test_compldst_multi_mmu.py
Tobias Platen [Thu, 2 Dec 2021 18:57:43 +0000 (19:57 +0100)]
cleanup test_compldst_multi_mmu.py

2 years agoadd a bitvector remap function, the plan is to use it to reduce the size of
Luke Kenneth Casson Leighton [Thu, 2 Dec 2021 16:56:58 +0000 (16:56 +0000)]
add a bitvector remap function, the plan is to use it to reduce the size of
regfile bitvector hazards

2 years agofix test_random in test_loadstore1
Tobias Platen [Thu, 2 Dec 2021 16:25:12 +0000 (17:25 +0100)]
fix test_random in test_loadstore1

2 years agouse new namedtuple in core when calling regspec_decode()
Luke Kenneth Casson Leighton [Thu, 2 Dec 2021 15:07:38 +0000 (15:07 +0000)]
use new namedtuple in core when calling regspec_decode()

2 years agoadd module parameter to regspec_decode and therefore to get_byregfiles
Luke Kenneth Casson Leighton [Thu, 2 Dec 2021 14:56:50 +0000 (14:56 +0000)]
add module parameter to regspec_decode and therefore to get_byregfiles
as well

2 years agoremove bitmanip fu cuz ternlogi (the only instruction implemented so far) is in shift...
Jacob Lifshay [Thu, 2 Dec 2021 03:03:26 +0000 (19:03 -0800)]
remove bitmanip fu cuz ternlogi (the only instruction implemented so far) is in shiftrot instead

2 years agoadd ternlogi to shiftrot
Jacob Lifshay [Thu, 2 Dec 2021 03:01:12 +0000 (19:01 -0800)]
add ternlogi to shiftrot

2 years agoformat code
Jacob Lifshay [Thu, 2 Dec 2021 02:12:42 +0000 (18:12 -0800)]
format code

2 years agostack of changes to MultiCompUnit to speed it up
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 19:47:27 +0000 (19:47 +0000)]
stack of changes to MultiCompUnit to speed it up
a lot of comb settings were changed to sync as a hack-experiment
when TestIssuer (ls180) was being developed, to try to speed up ECP5
timing.  those need reverting to reduce latency

2 years agoexperimenting with option to shorten MultiCompUnit delays
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 16:25:10 +0000 (16:25 +0000)]
experimenting with option to shorten MultiCompUnit delays

2 years agocreate single-stage ALU pipeline, shorten latency on in-order core
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 16:24:50 +0000 (16:24 +0000)]
create single-stage ALU pipeline, shorten latency on in-order core

2 years agoallow MultiCompUnit to set read and write latches to run on sync or comb
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 15:59:27 +0000 (15:59 +0000)]
allow MultiCompUnit to set read and write latches to run on sync or comb

2 years agoFunctionUnitBaseMulti which derives from ReservationStations2
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 13:41:21 +0000 (13:41 +0000)]
FunctionUnitBaseMulti which derives from ReservationStations2
*requires* the muxid to be set for each RS.  these can be set
combinatorially no problem, to indicate to ReservationStations2 where
to route the data after it pops out the end of the "real" ALU
without these muxids being set everything is royally screwed

2 years agobetter name for read latch in core.py
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 13:01:01 +0000 (13:01 +0000)]
better name for read latch in core.py

2 years agouse m.submodules[name] instead of getattr
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 13:00:41 +0000 (13:00 +0000)]
use m.submodules[name] instead of getattr

2 years agoremove redundant / mis-named variable in core
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 12:20:23 +0000 (12:20 +0000)]
remove redundant / mis-named variable in core

2 years agocode-comments
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 12:19:33 +0000 (12:19 +0000)]
code-comments

2 years agoremove unneeded data structure in core
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 12:16:18 +0000 (12:16 +0000)]
remove unneeded data structure in core

2 years agowhoops treereduce on write-vector set/clr error
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 12:12:27 +0000 (12:12 +0000)]
whoops treereduce on write-vector set/clr error

2 years agomore code-cleanup
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 12:10:48 +0000 (12:10 +0000)]
more code-cleanup

2 years agouse new regspec_decode and fu.get_iospec functions
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 12:07:45 +0000 (12:07 +0000)]
use new regspec_decode and fu.get_iospec functions

2 years agocore tidyup
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 12:04:03 +0000 (12:04 +0000)]
core tidyup

2 years agoadd Regspecs get_io_spec function
Luke Kenneth Casson Leighton [Wed, 1 Dec 2021 11:53:27 +0000 (11:53 +0000)]
add Regspecs get_io_spec function

2 years agostart allocating more FUs (more ReservationStations)
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 18:29:41 +0000 (18:29 +0000)]
start allocating more FUs (more ReservationStations)

2 years agorandom loadstore1 test: readback written data
Tobias Platen [Tue, 30 Nov 2021 17:52:10 +0000 (18:52 +0100)]
random loadstore1 test: readback written data

2 years agoreenable dcbz test case
Tobias Platen [Tue, 30 Nov 2021 17:29:58 +0000 (18:29 +0100)]
reenable dcbz test case

2 years agoreturn correct data from microwatt
Tobias Platen [Tue, 30 Nov 2021 17:29:27 +0000 (18:29 +0100)]
return correct data from microwatt

2 years agocleanup test_loadstore1.py
Tobias Platen [Tue, 30 Nov 2021 17:22:16 +0000 (18:22 +0100)]
cleanup test_loadstore1.py

2 years agoloadstore: add done_delay
Tobias Platen [Tue, 30 Nov 2021 16:56:45 +0000 (17:56 +0100)]
loadstore: add done_delay

2 years agoMerge branch 'master' of ssh://git.libre-riscv.org:922/soc
Tobias Platen [Tue, 30 Nov 2021 16:52:40 +0000 (17:52 +0100)]
Merge branch 'master' of ssh://git.libre-riscv.org:922/soc

2 years agoadd LogicalTestCases back in to test_core.py (pass)
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 16:25:45 +0000 (16:25 +0000)]
add LogicalTestCases back in to test_core.py (pass)

2 years agolet PowerDecode2 decide which operand class to use in test_core.py
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 16:23:43 +0000 (16:23 +0000)]
let PowerDecode2 decide which operand class to use in test_core.py
this gets it to pick *all* fields

2 years agouse latched readflag (recspec_decode_read "ok") instead of global one
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 16:12:31 +0000 (16:12 +0000)]
use latched readflag (recspec_decode_read "ok") instead of global one

2 years agotidyup on read-flag latches
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 16:11:58 +0000 (16:11 +0000)]
tidyup on read-flag latches

2 years agofix read-decode information by latching not just the read reg number
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 14:05:38 +0000 (14:05 +0000)]
fix read-decode information by latching not just the read reg number
but *whether it is valid or not*.
not only the register *number* from regspec_decode_read() needs to
be captured but its ok (valid) flag as well

this error only showed up when a mul (2-operand) was followed by addi
(1-operand).  the mul had its 2nd operand dropped on the floor because
the *addi* only has one operand.

2 years agofix write-after-write hazard checking
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 13:21:29 +0000 (13:21 +0000)]
fix write-after-write hazard checking

2 years agoallow busy to settle before checking state in test_core.py
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 12:11:45 +0000 (12:11 +0000)]
allow busy to settle before checking state in test_core.py

2 years agoonly check regs right at the end in test_core.py overlap mode
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 12:03:29 +0000 (12:03 +0000)]
only check regs right at the end in test_core.py overlap mode

2 years agomove sim call before core run in test_core.py
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 11:49:33 +0000 (11:49 +0000)]
move sim call before core run in test_core.py
to give PC a chance to settle in regfile

2 years agogetting formerly unused test_core.py operational
Luke Kenneth Casson Leighton [Tue, 30 Nov 2021 11:13:24 +0000 (11:13 +0000)]
getting formerly unused test_core.py operational

2 years agowhoops missed make_hazard_vec test
Luke Kenneth Casson Leighton [Mon, 29 Nov 2021 16:41:00 +0000 (16:41 +0000)]
whoops missed make_hazard_vec test