soc.git
3 years agoadd new get_pinspec_resources function which creates nmigen
Luke Kenneth Casson Leighton [Sat, 13 Nov 2021 15:07:23 +0000 (15:07 +0000)]
add new get_pinspec_resources function which creates nmigen
Resource/Subsignal/Pins suite from the JSON files generated by pinmux

3 years agocode-comment for get_pinspecs()
Luke Kenneth Casson Leighton [Sat, 13 Nov 2021 14:42:05 +0000 (14:42 +0000)]
code-comment for get_pinspecs()

3 years agostart adding hazard vector setting in core (unfinished)
Luke Kenneth Casson Leighton [Sat, 13 Nov 2021 14:41:51 +0000 (14:41 +0000)]
start adding hazard vector setting in core (unfinished)

3 years agodebug prints
Luke Kenneth Casson Leighton [Thu, 11 Nov 2021 16:14:58 +0000 (16:14 +0000)]
debug prints

3 years agofix regfile port names for "fast" port access (regreduce=False)
Luke Kenneth Casson Leighton [Thu, 11 Nov 2021 16:11:48 +0000 (16:11 +0000)]
fix regfile port names for "fast" port access (regreduce=False)

3 years agoTODO, implement is_dcbz
Luke Kenneth Casson Leighton [Thu, 11 Nov 2021 16:10:07 +0000 (16:10 +0000)]
TODO, implement is_dcbz

3 years agocode-comments
Luke Kenneth Casson Leighton [Thu, 11 Nov 2021 16:00:22 +0000 (16:00 +0000)]
code-comments

3 years agosplit out core input/output into separate file core_data.py
Luke Kenneth Casson Leighton [Thu, 11 Nov 2021 15:56:05 +0000 (15:56 +0000)]
split out core input/output into separate file core_data.py

3 years agoenable hazard vecs in core
Luke Kenneth Casson Leighton [Thu, 11 Nov 2021 15:51:39 +0000 (15:51 +0000)]
enable hazard vecs in core

3 years agoadd exact same number - and name - bitvector ports to regfiles
Luke Kenneth Casson Leighton [Thu, 11 Nov 2021 14:56:09 +0000 (14:56 +0000)]
add exact same number - and name - bitvector ports to regfiles
for hazard purposes, easier to just have the exact same names
g

3 years agocode-morph regfile port specs to a dictionary format rather than hardcoded
Luke Kenneth Casson Leighton [Thu, 11 Nov 2021 14:21:49 +0000 (14:21 +0000)]
code-morph regfile port specs to a dictionary format rather than hardcoded
this allows for Hazard Bit-vector regfiles to be created with exactly
the same regfile port names

3 years agoinvert numbering on CR HDLState.get_crregs
Luke Kenneth Casson Leighton [Thu, 11 Nov 2021 10:29:19 +0000 (10:29 +0000)]
invert numbering on CR HDLState.get_crregs

3 years agoupdate store data reg 10 to 0xfe in virtmode mmu test
Luke Kenneth Casson Leighton [Wed, 10 Nov 2021 19:42:53 +0000 (19:42 +0000)]
update store data reg 10 to 0xfe in virtmode mmu test

3 years agoremove read of MSR, it is done by passing through PowerDecoder2
Luke Kenneth Casson Leighton [Wed, 10 Nov 2021 19:09:14 +0000 (19:09 +0000)]
remove read of MSR, it is done by passing through PowerDecoder2

3 years agoallow MSR to be set in StateRegs in test_core.py
Luke Kenneth Casson Leighton [Wed, 10 Nov 2021 19:01:40 +0000 (19:01 +0000)]
allow MSR to be set in StateRegs in test_core.py

3 years agoadd $Display of oper_r.msr in LDSTCompUnit
Luke Kenneth Casson Leighton [Wed, 10 Nov 2021 18:38:08 +0000 (18:38 +0000)]
add $Display of oper_r.msr in LDSTCompUnit

3 years agowhitespace
Luke Kenneth Casson Leighton [Wed, 10 Nov 2021 18:26:15 +0000 (18:26 +0000)]
whitespace

3 years agomorph regfiles to add hazard vector make_vecs function
Luke Kenneth Casson Leighton [Wed, 10 Nov 2021 18:22:09 +0000 (18:22 +0000)]
morph regfiles to add hazard vector make_vecs function

3 years agoadd fetch of MSR in LD/ST pipe_data
Luke Kenneth Casson Leighton [Wed, 10 Nov 2021 18:20:07 +0000 (18:20 +0000)]
add fetch of MSR in LD/ST pipe_data

3 years agoadd debug output for msr_pr
Tobias Platen [Wed, 10 Nov 2021 18:20:06 +0000 (19:20 +0100)]
add debug output for msr_pr

3 years agoMerge branch 'master' of ssh://git.libre-riscv.org:922/soc
Tobias Platen [Wed, 10 Nov 2021 17:58:18 +0000 (18:58 +0100)]
Merge branch 'master' of ssh://git.libre-riscv.org:922/soc

3 years agotest testcase for exception
Tobias Platen [Wed, 10 Nov 2021 17:57:57 +0000 (18:57 +0100)]
test testcase for exception

3 years agomake core busy_o part of the CoreOutput data structure
Luke Kenneth Casson Leighton [Wed, 10 Nov 2021 13:41:49 +0000 (13:41 +0000)]
make core busy_o part of the CoreOutput data structure
the FSM TestIssuer can use this to detect not to send anything to it
and the InOrderIssuer can safely ignore it as long as it takes care
of RaW hazards

3 years agoadd a "fu_found" signal to core, which allows for an indicator that
Luke Kenneth Casson Leighton [Wed, 10 Nov 2021 13:23:44 +0000 (13:23 +0000)]
add a "fu_found" signal to core, which allows for an indicator that
no Function Unit (no Reservation Station) is currently available for this
instruction

3 years agoMerge branch 'master' of ssh://git.libre-riscv.org:922/soc
Tobias Platen [Tue, 9 Nov 2021 19:43:00 +0000 (20:43 +0100)]
Merge branch 'master' of ssh://git.libre-riscv.org:922/soc

3 years agotest_issuer_mmu.py: add case_5_allsprs
Tobias Platen [Tue, 9 Nov 2021 19:42:29 +0000 (20:42 +0100)]
test_issuer_mmu.py: add case_5_allsprs

3 years agoadd core instruction-issue PriorityPickers
Luke Kenneth Casson Leighton [Tue, 9 Nov 2021 17:49:30 +0000 (17:49 +0000)]
add core instruction-issue PriorityPickers

this got more complicated than expected.  it should have been dead easy:
* identify each type of ALU (Logical, Shift, Mul)
* create a list per type of ALU of all Function Units providing that Function
* create a PriorityPicker for each type of ALU
* pick one
* shove that into the "issue" of the picked Function Unit.

where that went wrong was nothing to do with issue, it was to do with the
selection of the register files.

a return result from connect_instruction is a dictionary of "enabled"
bits, one per FU, giving permission for that FU to perform read/write
access to regfile ports.

however with the fu_bitdict changing from "continuously-enabled" over
to "single-pulse indicating issue", the read/write ports were no longer
requested.

to fix this, an *additional* dictionary was created: fu_selected, which
has the OR of the FU issue *and* the FU "busy" signal, which will be
HI for the whole time that the FU is active (even including the first
issue cycle: normally busy_o only goes active one cycle *after* issue
is blipped)

thus in theory, although in practice it will not happen, the read/write
ports could be requested immediately the instruction is issued.

3 years agocomments
Luke Kenneth Casson Leighton [Tue, 9 Nov 2021 12:50:32 +0000 (12:50 +0000)]
comments

3 years agocore.py: create a dictionary of lists of Function Units capable of
Luke Kenneth Casson Leighton [Tue, 9 Nov 2021 12:49:54 +0000 (12:49 +0000)]
core.py: create a dictionary of lists of Function Units capable of
dealing with a particular instruction (by power_enums Function: ALU, MMU, DIV
LOGICAL etc.)

3 years agocreate function core conect_satellite_decoders
Luke Kenneth Casson Leighton [Tue, 9 Nov 2021 12:38:25 +0000 (12:38 +0000)]
create function core conect_satellite_decoders
just moving code from elaborate to make it clearer

3 years agoadd cancel in to alu_ok / alu_valid in LDSTCompUnit
Luke Kenneth Casson Leighton [Tue, 9 Nov 2021 00:39:04 +0000 (00:39 +0000)]
add cancel in to alu_ok / alu_valid in LDSTCompUnit

3 years agorename LDSTCompUnit cancel to canceln (because it is active low)
Luke Kenneth Casson Leighton [Tue, 9 Nov 2021 00:34:42 +0000 (00:34 +0000)]
rename LDSTCompUnit cancel to canceln (because it is active low)

3 years agowhoops must remember to do rdmaskn on LDSTCompUnit as well
Luke Kenneth Casson Leighton [Tue, 9 Nov 2021 00:27:05 +0000 (00:27 +0000)]
whoops must remember to do rdmaskn on LDSTCompUnit as well

3 years agoremove unit test that is unfinished
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 23:54:02 +0000 (23:54 +0000)]
remove unit test that is unfinished

3 years agoshorter way of getting FU busy signals
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 23:48:05 +0000 (23:48 +0000)]
shorter way of getting FU busy signals

3 years agoMultiCompUnit fixed to not need rdmask to be sustained indefinitely
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 23:42:21 +0000 (23:42 +0000)]
MultiCompUnit fixed to not need rdmask to be sustained indefinitely
only needs to be set on input (when issue is raised)

3 years agoin MultiCompUnit, put rdmaskn into src latch rather than OR in src release
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 23:38:58 +0000 (23:38 +0000)]
in MultiCompUnit, put rdmaskn into src latch rather than OR in src release
this allows rdmaskn to be set just once rather than left permanently
on.  but, it does mean that the internal src register latches end up
having the wrong (previous) output, which then bleed through into
ALUs.

to stop that, the src data latches are all set to zero if the CompUnit
is not busy

3 years agommu unit test working again
Tobias Platen [Mon, 8 Nov 2021 20:02:07 +0000 (21:02 +0100)]
mmu unit test working again

3 years agoremove unused variable
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 16:37:51 +0000 (16:37 +0000)]
remove unused variable

3 years agocode comments
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 16:34:57 +0000 (16:34 +0000)]
code comments

3 years agocomments
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 16:17:26 +0000 (16:17 +0000)]
comments

3 years agoremove issue_i from core, use i_valid instead to decide when to issue
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 14:36:09 +0000 (14:36 +0000)]
remove issue_i from core, use i_valid instead to decide when to issue
converting core to Pipeline API

3 years agomove "exception happened" detection from TestIssuer to Core
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 14:19:14 +0000 (14:19 +0000)]
move "exception happened" detection from TestIssuer to Core

3 years agouse p.i_valid in core instead of explicit signal ivalid_i
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 14:14:43 +0000 (14:14 +0000)]
use p.i_valid in core instead of explicit signal ivalid_i
converting core to Pipeline API

3 years agouse Pipeline API o_ready instead of explicit core busy_o signal
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 14:08:05 +0000 (14:08 +0000)]
use Pipeline API o_ready instead of explicit core busy_o signal
converting core.py to Pipeline API

3 years agoconvert core.py to Pipeline API, deriving from ControlBase
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 13:59:16 +0000 (13:59 +0000)]
convert core.py to Pipeline API, deriving from ControlBase

3 years agoremove unneeded imports
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 13:45:10 +0000 (13:45 +0000)]
remove unneeded imports

3 years agomove simple core input and output data to in/out data structures
Luke Kenneth Casson Leighton [Mon, 8 Nov 2021 11:12:40 +0000 (11:12 +0000)]
move simple core input and output data to in/out data structures

3 years agomake FSMDivCoreStage properly conform to Stage API
Luke Kenneth Casson Leighton [Sun, 7 Nov 2021 22:39:24 +0000 (22:39 +0000)]
make FSMDivCoreStage properly conform to Stage API
added ispec and ospec functions, no need to explicitly set
self.p_i_data and self.n.o_data because that is the job of the Stage API

3 years agoadd hazard vectors to Regfiles
Luke Kenneth Casson Leighton [Sun, 7 Nov 2021 15:40:17 +0000 (15:40 +0000)]
add hazard vectors to Regfiles
the reason for adding it to Regfiles is because both In-Order and OoO
need global hazard vectors.

in the case of In-Order the hazard vector bits are set directly by the
Issue Engine.

in the case of Out-of-Order the vector bits are set by way of an
amalgamation (Great Big Or Gate) of the columns from the DMs

in either case the vectors are needed, so might as well be added to Regfiles

3 years agoadd quick test of regfiles to output rtlil
Luke Kenneth Casson Leighton [Sun, 7 Nov 2021 15:17:32 +0000 (15:17 +0000)]
add quick test of regfiles to output rtlil

3 years agoswitch over to single-entry (num_rows=1) ReservationStation2 based
Luke Kenneth Casson Leighton [Sun, 7 Nov 2021 13:45:41 +0000 (13:45 +0000)]
switch over to single-entry (num_rows=1) ReservationStation2 based
MultiCompUnit

this is effectively identical to FunctionUnitBaseSingle behaviour except
that now there is the possibility of increasing the number of rows
(number of "fronts" to the ALU) to 2 or greater

DIV FSM, Trap and SPR as well as LDST have been left alone

3 years agofor some reason mul test cases had not been added to test_issuer
Luke Kenneth Casson Leighton [Sun, 7 Nov 2021 13:40:33 +0000 (13:40 +0000)]
for some reason mul test cases had not been added to test_issuer

3 years agoadding an FSM-based MultiCompUnit test (does not work yet)
Luke Kenneth Casson Leighton [Sun, 7 Nov 2021 12:57:12 +0000 (12:57 +0000)]
adding an FSM-based MultiCompUnit test (does not work yet)

3 years agoremove some of the uses of wrmask (redundant)
Luke Kenneth Casson Leighton [Sun, 7 Nov 2021 12:29:53 +0000 (12:29 +0000)]
remove some of the uses of wrmask (redundant)
https://bugs.libre-soc.org/show_bug.cgi?id=742

in MultiCompUnit, wrmask is the amalgamation of the incoming "data ok"
signals from an ALU.  ALUs are given the *option* to write to registers:
they are not told, "you absolutely have to write to this register"
but of course for Hazard purposes, the MultiCompUnit has to be told
to "hold" off the write until such time as the ALU can determine whether
it has anything to write

it _should_ now be possible for the ReservationStation version of
FunctionUnit to use combinatorial-setting of write data+ok

3 years agoupdate test_issuer_mmu.py testcase, add needed debug outputs
Tobias Platen [Sat, 6 Nov 2021 14:14:47 +0000 (15:14 +0100)]
update test_issuer_mmu.py testcase, add needed debug outputs

3 years agotlbie, mtspr and mfspr test cases
Tobias Platen [Fri, 5 Nov 2021 20:18:53 +0000 (21:18 +0100)]
tlbie, mtspr and mfspr test cases

3 years agoadd mmu/dcache unit test
Tobias Platen [Fri, 5 Nov 2021 19:15:16 +0000 (20:15 +0100)]
add mmu/dcache unit test

3 years agouse ReservationStations2 (disabled for now)
Luke Kenneth Casson Leighton [Thu, 4 Nov 2021 19:11:28 +0000 (19:11 +0000)]
use ReservationStations2 (disabled for now)

3 years agowrite-ok is expected to stay valid *after* being set,
Luke Kenneth Casson Leighton [Thu, 4 Nov 2021 19:07:37 +0000 (19:07 +0000)]
write-ok is expected to stay valid *after* being set,
working out what is going on here

3 years agoadd name to write pick on core
Luke Kenneth Casson Leighton [Thu, 4 Nov 2021 18:47:36 +0000 (18:47 +0000)]
add name to write pick on core

3 years agofix missing naming ready_i -> i_ready
Luke Kenneth Casson Leighton [Thu, 4 Nov 2021 18:05:33 +0000 (18:05 +0000)]
fix missing naming ready_i -> i_ready

3 years agocleanup fsm
Tobias Platen [Wed, 3 Nov 2021 17:37:35 +0000 (18:37 +0100)]
cleanup fsm

3 years agoloadstore.py: add Display statement on SPR change
Tobias Platen [Wed, 3 Nov 2021 17:34:57 +0000 (18:34 +0100)]
loadstore.py: add Display statement on SPR change

3 years agoadd first tlbie test case
Tobias Platen [Wed, 3 Nov 2021 16:54:12 +0000 (17:54 +0100)]
add first tlbie test case

3 years agoWIP testcase for TLBIE
Tobias Platen [Tue, 2 Nov 2021 19:44:16 +0000 (20:44 +0100)]
WIP testcase for TLBIE

3 years agommu fsm: symbols have been renamed
Tobias Platen [Tue, 2 Nov 2021 19:27:59 +0000 (20:27 +0100)]
mmu fsm: symbols have been renamed

3 years agohack to fix UnusedElaboratables in src/soc/fu/mmu/test/test_pipe_caller.py
Tobias Platen [Tue, 2 Nov 2021 19:18:52 +0000 (20:18 +0100)]
hack to fix UnusedElaboratables in src/soc/fu/mmu/test/test_pipe_caller.py

3 years agoadd test_compldst_multi_mmu_fsm.py
Tobias Platen [Tue, 2 Nov 2021 17:27:45 +0000 (18:27 +0100)]
add test_compldst_multi_mmu_fsm.py

3 years agoadd beginnings of FunctionUnitBaseMulti
Luke Kenneth Casson Leighton [Mon, 1 Nov 2021 23:09:35 +0000 (23:09 +0000)]
add beginnings of FunctionUnitBaseMulti
uses ReservationStations, which is where we find that Fan-In and Fan-Out
in ReservationStations is completely broken.  deep joy.

3 years agohack: resolve DriverConflict in src/soc/fu/mmu/fsm.py
Tobias Platen [Mon, 1 Nov 2021 19:14:20 +0000 (20:14 +0100)]
hack: resolve DriverConflict in src/soc/fu/mmu/fsm.py

3 years agotest_issuer_dcache.py: cleanup
Tobias Platen [Mon, 1 Nov 2021 17:50:57 +0000 (18:50 +0100)]
test_issuer_dcache.py: cleanup

3 years agocode comments for core
Luke Kenneth Casson Leighton [Mon, 1 Nov 2021 09:53:13 +0000 (09:53 +0000)]
code comments for core

3 years agoupdate unittest for dcbz
Tobias Platen [Sat, 30 Oct 2021 11:16:18 +0000 (13:16 +0200)]
update unittest for dcbz

3 years agocompldst_multi.py: fix reset on dcbz
Tobias Platen [Sat, 30 Oct 2021 11:12:54 +0000 (13:12 +0200)]
compldst_multi.py: fix reset on dcbz

3 years agowrite_vcd - add missing file extension
Tobias Platen [Sat, 30 Oct 2021 09:43:31 +0000 (11:43 +0200)]
write_vcd - add missing file extension

3 years agoloadstore.py: add debug output for dcbz
Tobias Platen [Sat, 30 Oct 2021 09:15:17 +0000 (11:15 +0200)]
loadstore.py: add debug output for dcbz

3 years agoupdate unit test
Tobias Platen [Sat, 30 Oct 2021 09:14:30 +0000 (11:14 +0200)]
update unit test

3 years agocompldst_multi.py: handle dcbz
Tobias Platen [Sat, 30 Oct 2021 09:11:33 +0000 (11:11 +0200)]
compldst_multi.py: handle dcbz

3 years agotest_compldst_multi_mmu.py: verify dcbz result, add debug outputs
Tobias Platen [Fri, 29 Oct 2021 17:25:43 +0000 (19:25 +0200)]
test_compldst_multi_mmu.py: verify dcbz result, add debug outputs

3 years agofix unittest test_compldst_multi_mmu.py (load now returned byte previously stored)
Tobias Platen [Fri, 29 Oct 2021 16:45:47 +0000 (18:45 +0200)]
fix unittest test_compldst_multi_mmu.py (load now returned byte previously stored)

3 years agotest_compldst_multi_mmu.py: use nmigen.back.pysim
Tobias Platen [Thu, 28 Oct 2021 18:25:51 +0000 (20:25 +0200)]
test_compldst_multi_mmu.py: use nmigen.back.pysim

3 years agotest_compldst_multi_mmu.py: use nmigen.compat.sim
Tobias Platen [Thu, 28 Oct 2021 17:20:53 +0000 (19:20 +0200)]
test_compldst_multi_mmu.py: use nmigen.compat.sim

3 years agoreplace PartitionedSignal with SimdSignal
Luke Kenneth Casson Leighton [Sun, 10 Oct 2021 12:26:49 +0000 (13:26 +0100)]
replace PartitionedSignal with SimdSignal

3 years agonix: Remove outdated comment about license
Las Safin [Fri, 8 Oct 2021 17:15:55 +0000 (17:15 +0000)]
nix: Remove outdated comment about license

3 years agoMerge branch 'pr' from nix-soc
Luke Kenneth Casson Leighton [Fri, 8 Oct 2021 13:37:01 +0000 (14:37 +0100)]
Merge branch 'pr' from nix-soc

3 years agocomments for test_runner pr
klehman [Thu, 7 Oct 2021 23:21:35 +0000 (19:21 -0400)]
comments for test_runner

3 years agoadded comment to teststate
klehman [Thu, 7 Oct 2021 15:57:39 +0000 (11:57 -0400)]
added comment to teststate

3 years agocleanup test_compldst_multi_mmu.py
Tobias Platen [Tue, 5 Oct 2021 16:33:20 +0000 (18:33 +0200)]
cleanup test_compldst_multi_mmu.py

3 years agorefactoring test_compldst_multi_mmu.py
Tobias Platen [Mon, 4 Oct 2021 18:20:29 +0000 (20:20 +0200)]
refactoring test_compldst_multi_mmu.py

3 years agoupdate test_compldst_multi_mmu.py to use pagetables
Tobias Platen [Mon, 4 Oct 2021 18:04:42 +0000 (20:04 +0200)]
update test_compldst_multi_mmu.py to use pagetables

3 years agomove pagetable to external file
Tobias Platen [Mon, 4 Oct 2021 17:50:41 +0000 (19:50 +0200)]
move pagetable to external file

3 years agoadd wishbone driver for test_compldst_multi_mmu.py
Tobias Platen [Mon, 4 Oct 2021 17:22:36 +0000 (19:22 +0200)]
add wishbone driver for test_compldst_multi_mmu.py

3 years agoupdate test_compldst_multi_mmu.py
Tobias Platen [Sun, 3 Oct 2021 12:35:48 +0000 (14:35 +0200)]
update test_compldst_multi_mmu.py

3 years agosrc/soc/experiment/compldst_multi.py: update signal names in load()
Tobias Platen [Sun, 3 Oct 2021 12:10:51 +0000 (14:10 +0200)]
src/soc/experiment/compldst_multi.py: update signal names in load()

3 years agouse LoadStore1 and DCache in test_compldst_multi_mmu.py
Tobias Platen [Sun, 3 Oct 2021 11:37:58 +0000 (13:37 +0200)]
use LoadStore1 and DCache in test_compldst_multi_mmu.py

3 years agomore cleanup on pimem.py
Tobias Platen [Sun, 3 Oct 2021 08:58:00 +0000 (10:58 +0200)]
more cleanup on pimem.py

3 years agowhitespace
Tobias Platen [Sun, 3 Oct 2021 08:38:38 +0000 (10:38 +0200)]
whitespace

3 years agoremove redunant pi_dcbz
Tobias Platen [Sun, 3 Oct 2021 08:33:35 +0000 (10:33 +0200)]
remove redunant pi_dcbz

3 years agoan extra dcbz parameter in all six places
Tobias Platen [Sun, 3 Oct 2021 07:37:15 +0000 (09:37 +0200)]
an extra dcbz parameter in all six places