soc.git
4 years agowhoops, overflow-decode (handle_overflow) needed to check e.oe.ok
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 17:51:23 +0000 (18:51 +0100)]
whoops, overflow-decode (handle_overflow) needed to check e.oe.ok
*and* e.oe.oe to decide whether to set SO/OV/OV32

4 years agoAdd register assertions, fix broken tests
Michael Nolan [Mon, 8 Jun 2020 17:45:59 +0000 (13:45 -0400)]
Add register assertions, fix broken tests

4 years agoUpdate to latest wiki version
Michael Nolan [Mon, 8 Jun 2020 17:45:50 +0000 (13:45 -0400)]
Update to latest wiki version

4 years agoRestore test_sim.py, begin modifying it for testing against qemu
Michael Nolan [Mon, 8 Jun 2020 17:36:57 +0000 (13:36 -0400)]
Restore test_sim.py, begin modifying it for testing against qemu

4 years agoadd CA/CA32 to write regs fields in parser
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 14:59:31 +0000 (15:59 +0100)]
add CA/CA32 to write regs fields in parser

4 years agocheck that carry has already been done or not by the actual instruction
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 14:58:53 +0000 (15:58 +0100)]
check that carry has already been done or not by the actual instruction

4 years agocode-morph test_core for XER bit clarity
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 14:44:58 +0000 (15:44 +0100)]
code-morph test_core for XER bit clarity

4 years agoset only the SO bit as sticky, not the OV flags as sticky
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 14:44:33 +0000 (15:44 +0100)]
set only the SO bit as sticky, not the OV flags as sticky

4 years agocopy 64-bit OV, try creating 32-bit OV32 in
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 14:28:02 +0000 (15:28 +0100)]
copy 64-bit OV, try creating 32-bit OV32 in
simulator caller.py

4 years agoclarify using microwatt calc_ov function.
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 14:08:58 +0000 (15:08 +0100)]
clarify using microwatt calc_ov function.
found bug where part of the comparison was not using carry

4 years agoadded check which shows that OV32 in "adde." is not correct
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 13:50:35 +0000 (14:50 +0100)]
added check which shows that OV32 in "adde." is not correct

4 years agofound section in 3.0B PDF that refers to "Program Interrupts"
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 12:55:34 +0000 (13:55 +0100)]
found section in 3.0B PDF that refers to "Program Interrupts"

4 years agomove datamerger proof into standard directory location (formal/),
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 12:33:31 +0000 (13:33 +0100)]
move datamerger proof into standard directory location (formal/),
update comments

4 years agocopy MSR into SRR1 in trap function
Luke Kenneth Casson Leighton [Mon, 8 Jun 2020 02:08:03 +0000 (03:08 +0100)]
copy MSR into SRR1 in trap function

4 years agoFix spelling
colepoirier [Mon, 8 Jun 2020 01:17:43 +0000 (18:17 -0700)]
Fix spelling

4 years agoupdate trap with comments
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 21:18:16 +0000 (22:18 +0100)]
update trap with comments

4 years agoupdate comments
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 21:11:48 +0000 (22:11 +0100)]
update comments

4 years agoAdd TrapMainStage.trap() convenience function to set trap address and PC
colepoirier [Sun, 7 Jun 2020 21:09:17 +0000 (14:09 -0700)]
Add TrapMainStage.trap() convenience function to set trap address and PC
to begin from on return

4 years agoAssign the one-clock delay operation from ADD to SHR
Cesar Strauss [Sun, 7 Jun 2020 20:47:10 +0000 (17:47 -0300)]
Assign the one-clock delay operation from ADD to SHR

This keeps the ADD delay as it was, originally.

4 years agoassert XER SO/OV/CA registers, check these are ok (fail at the moment)
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 20:48:20 +0000 (21:48 +0100)]
assert XER SO/OV/CA registers, check these are ok (fail at the moment)

4 years agoadd debug print statements, re-enable all tests in simple core
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 20:20:37 +0000 (21:20 +0100)]
add debug print statements, re-enable all tests in simple core

4 years agoresolved CR mfcr lookup bug (was in power_decoder. ??)
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 20:15:58 +0000 (21:15 +0100)]
resolved CR mfcr lookup bug (was in power_decoder. ??)
https://bugs.libre-soc.org/show_bug.cgi?id=363

4 years agoTry responding with ready_i on the same cycle as valid_o
Cesar Strauss [Sun, 7 Jun 2020 19:40:44 +0000 (16:40 -0300)]
Try responding with ready_i on the same cycle as valid_o

4 years agoAssert valid_o one clock early, as alu_done is asserted
Cesar Strauss [Sun, 7 Jun 2020 19:37:32 +0000 (16:37 -0300)]
Assert valid_o one clock early, as alu_done is asserted

4 years agoMake the test ALU conform to the valid/ready protocol
Cesar Strauss [Sun, 7 Jun 2020 19:32:11 +0000 (16:32 -0300)]
Make the test ALU conform to the valid/ready protocol

Adjust the test case accordingly.

4 years agoAdd back test cases to cookie-cut from for fu/trap/test/test_pipe_caller
colepoirier [Sun, 7 Jun 2020 01:50:42 +0000 (18:50 -0700)]
Add back test cases to cookie-cut from for fu/trap/test/test_pipe_caller

4 years agoadd extra tests for mcrf: shows bug is not directly related to core.py
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 19:43:56 +0000 (20:43 +0100)]
add extra tests for mcrf: shows bug is not directly related to core.py

4 years agohow odd. just adding CA32 to self.namespace seems to work
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 18:58:45 +0000 (19:58 +0100)]
how odd.  just adding CA32 to self.namespace seems to work

4 years agoadd extra args to ISA in branch test_pipe_caller
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 18:31:05 +0000 (19:31 +0100)]
add extra args to ISA in branch test_pipe_caller

4 years agoadd msr to ISA in test_core.py
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 15:03:12 +0000 (16:03 +0100)]
add msr to ISA in test_core.py

4 years agowark-wark, do not & rs[0] into carry-out from rotator
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 14:30:02 +0000 (15:30 +0100)]
wark-wark, do not & rs[0] into carry-out from rotator

4 years agoha! set XER CA/CA32 in simulator from output.value, not using eq
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 14:27:38 +0000 (15:27 +0100)]
ha! set XER CA/CA32 in simulator from output.value, not using eq

4 years agoupdate rotator.py to match microwatt rotator.vhdl
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 14:23:20 +0000 (15:23 +0100)]
update rotator.py to match microwatt rotator.vhdl

4 years agoadd carry test to shift_rot test_pipe_caller: it fails just as with the compunit...
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 13:46:56 +0000 (14:46 +0100)]
add carry test to shift_rot test_pipe_caller: it fails just as with the compunit test

4 years agoadd extra args to ISA in test_pipe_caller.py
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 13:42:26 +0000 (14:42 +0100)]
add extra args to ISA in test_pipe_caller.py

4 years agoadd make clean target to qemu_test Makefile
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 13:22:50 +0000 (14:22 +0100)]
add make clean target to qemu_test Makefile

4 years agooptionally writing out CA/CA32 to XER
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 13:04:09 +0000 (14:04 +0100)]
optionally writing out CA/CA32 to XER

4 years agoadd handling of CA/CA32 in simulator, generated from sraw/srad
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 12:58:08 +0000 (13:58 +0100)]
add handling of CA/CA32 in simulator, generated from sraw/srad

4 years agoadd CA/CA32 to list of special regs
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 12:37:17 +0000 (13:37 +0100)]
add CA/CA32 to list of special regs

4 years agoadd missing arg to ISA in test_compunit
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 12:26:58 +0000 (13:26 +0100)]
add missing arg to ISA in test_compunit

4 years agoRevert "if referred to through GPR (GPR[RA]), add to read_regs in parser"
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 12:24:29 +0000 (13:24 +0100)]
Revert "if referred to through GPR (GPR[RA]), add to read_regs in parser"

This reverts commit 18db92ba0f33dfcd036eeddbc42c54eb3cf06ce3.

4 years agoRevert "remove fixedlogical.patch - added gprs to PowerParser p_atom_name"
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 12:22:46 +0000 (13:22 +0100)]
Revert "remove fixedlogical.patch - added gprs to PowerParser p_atom_name"

This reverts commit f61f93dcd82ef64a82fae8e2ee94987ba9794ce8.

4 years agoRevert "add gprs to PowerParser write_regs in p_atom_name"
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 12:22:23 +0000 (13:22 +0100)]
Revert "add gprs to PowerParser write_regs in p_atom_name"

This reverts commit 11134dd94c4a1d1c1cff15e75d12b50c19c80b36.

4 years agoadd extra missing args to ISA setup in alu test_pipe_caller
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 12:16:23 +0000 (13:16 +0100)]
add extra missing args to ISA setup in alu test_pipe_caller

4 years agoif referred to through GPR (GPR[RA]), add to read_regs in parser
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 12:12:19 +0000 (13:12 +0100)]
if referred to through GPR (GPR[RA]), add to read_regs in parser

4 years agoadd gprs to PowerParser write_regs in p_atom_name
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 11:55:41 +0000 (12:55 +0100)]
add gprs to PowerParser write_regs in p_atom_name

4 years agoadd missing args to ISA
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 11:55:13 +0000 (12:55 +0100)]
add missing args to ISA

4 years agoremove fixedlogical.patch - added gprs to PowerParser p_atom_name
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 11:52:24 +0000 (12:52 +0100)]
remove fixedlogical.patch - added gprs to PowerParser p_atom_name

4 years agodocstring on caller.py inject() decorator
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 06:34:09 +0000 (07:34 +0100)]
docstring on caller.py inject() decorator

4 years agoadd TRAP function, stub
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 06:33:47 +0000 (07:33 +0100)]
add TRAP function, stub

4 years agoupdate submodule for sprset.mdwn
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 06:05:09 +0000 (07:05 +0100)]
update submodule for sprset.mdwn

4 years agoadd MSR to simulator context
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 06:03:58 +0000 (07:03 +0100)]
add MSR to simulator context

4 years agomove MSR_PR checking to separate functiong
Luke Kenneth Casson Leighton [Sun, 7 Jun 2020 00:36:20 +0000 (01:36 +0100)]
move MSR_PR checking to separate functiong

4 years agoFix missing 'comb +='
colepoirier [Sun, 7 Jun 2020 00:30:46 +0000 (17:30 -0700)]
Fix missing 'comb +='

4 years agoadd python3 env-var if not set in Makefile
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 23:04:30 +0000 (00:04 +0100)]
add python3 env-var if not set in Makefile

4 years agoexperimenting with setting up and testing memory
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 19:36:07 +0000 (20:36 +0100)]
experimenting with setting up and testing memory

4 years agoexpand regwid to 64 in l0_cache test
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 18:59:30 +0000 (19:59 +0100)]
expand regwid to 64 in l0_cache test

4 years agowork out how to initialise memory directly
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 18:46:41 +0000 (19:46 +0100)]
work out how to initialise memory directly

4 years agoinitialise L0 Memory from simulator memory
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 18:34:16 +0000 (19:34 +0100)]
initialise L0 Memory from simulator memory

4 years agowait a little for wr.rel to activate if wrmask is active
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 18:11:54 +0000 (19:11 +0100)]
wait a little for wr.rel to activate if wrmask is active

4 years agomissing test.mem arg for ISA in test_core
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 17:31:02 +0000 (18:31 +0100)]
missing test.mem arg for ISA in test_core

4 years agoallow Mem initialisation in ISACaller
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 17:28:36 +0000 (18:28 +0100)]
allow Mem initialisation in ISACaller

4 years agoshift-mask in Simulator Mem class not quite right
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 17:28:00 +0000 (18:28 +0100)]
shift-mask in Simulator Mem class not quite right

4 years agowrite-mask made from LD and Update mode (for data_o and addr_o output)
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 17:09:17 +0000 (18:09 +0100)]
write-mask made from LD and Update mode (for data_o and addr_o output)

4 years agoallow Mem in Simulator to be initialised
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 16:13:50 +0000 (17:13 +0100)]
allow Mem in Simulator to be initialised

4 years agouse name of unit to write simulator/vcd file
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 15:36:58 +0000 (16:36 +0100)]
use name of unit to write simulator/vcd file

4 years agoLDSTCompUnit test data structures linked up, starting debugging
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 15:33:53 +0000 (16:33 +0100)]
LDSTCompUnit test data structures linked up, starting debugging

4 years agoallow CompLDSTOpSubset to be passed through to LDSTCompUnit
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 14:45:14 +0000 (15:45 +0100)]
allow CompLDSTOpSubset to be passed through to LDSTCompUnit

4 years agoset up LDSTCompUnit using regspec
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 14:19:19 +0000 (15:19 +0100)]
set up LDSTCompUnit using regspec

4 years agoadd extra bugreport link
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 14:07:39 +0000 (15:07 +0100)]
add extra bugreport link

4 years agowhitespace
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 14:05:42 +0000 (15:05 +0100)]
whitespace

4 years agowhitespace indentation
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 14:04:11 +0000 (15:04 +0100)]
whitespace indentation

4 years agoadd special-case LDSTFunctionUnit
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 12:40:28 +0000 (13:40 +0100)]
add special-case LDSTFunctionUnit

4 years agowhoops dest%d_o not dest%d_i
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 12:40:11 +0000 (13:40 +0100)]
whoops dest%d_o not dest%d_i

4 years agoadd beginnings of LDST compunit test
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 12:28:02 +0000 (13:28 +0100)]
add beginnings of LDST compunit test

4 years agowhitespace
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 05:02:26 +0000 (06:02 +0100)]
whitespace

4 years agowhitespace / code-munge
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 05:00:38 +0000 (06:00 +0100)]
whitespace / code-munge

4 years agocomments / whitespace
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 04:56:15 +0000 (05:56 +0100)]
comments / whitespace

4 years agoupdate stage docstring
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 04:52:17 +0000 (05:52 +0100)]
update stage docstring

4 years agocode-munge
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 04:49:20 +0000 (05:49 +0100)]
code-munge

4 years agoremove unneeded imports
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 04:43:06 +0000 (05:43 +0100)]
remove unneeded imports

4 years agonoticed the regular pattern in all pipe_data.py (regspecs).
Luke Kenneth Casson Leighton [Sat, 6 Jun 2020 04:38:09 +0000 (05:38 +0100)]
noticed the regular pattern in all pipe_data.py (regspecs).
removed manual Input/Output Data, use regspecs to create it, in IntegerData

4 years agocomment out CR assertion for now
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 19:43:38 +0000 (20:43 +0100)]
comment out CR assertion for now

4 years agoAdded skeleton fu/trap/test/test_pipe_caller using
colepoirier [Fri, 5 Jun 2020 20:07:27 +0000 (13:07 -0700)]
Added skeleton fu/trap/test/test_pipe_caller using
fu/cr/test/test_pipe_caller as template

4 years agoAdd trap_input_data.py for fu/trap, cookie-cut from
colepoirier [Fri, 5 Jun 2020 19:55:33 +0000 (12:55 -0700)]
Add trap_input_data.py for fu/trap, cookie-cut from
fu/cr/cr_input_record with all 'CR' references changed to 'Trap'

4 years agofix proof_datamerger (see 216#c56)
Tobias Platen [Fri, 5 Jun 2020 19:18:46 +0000 (21:18 +0200)]
fix proof_datamerger (see 216#c56)

4 years agoupdate comments
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 15:45:27 +0000 (16:45 +0100)]
update comments

4 years agoadd comments and start of elaborate
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 15:33:05 +0000 (16:33 +0100)]
add comments and start of elaborate

4 years agomore comments
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 15:21:05 +0000 (16:21 +0100)]
more comments

4 years agomore comments
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 15:19:50 +0000 (16:19 +0100)]
more comments

4 years agoa_i not b_in
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 15:16:03 +0000 (16:16 +0100)]
a_i not b_in

4 years agoadd comments
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 15:14:21 +0000 (16:14 +0100)]
add comments

4 years agoexperimenting with CR, not quite right
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 12:51:52 +0000 (13:51 +0100)]
experimenting with CR, not quite right

4 years agoMade small changes to fu/trap/main_stage to bring nmigen into line with
colepoirier [Fri, 5 Jun 2020 14:12:26 +0000 (07:12 -0700)]
Made small changes to fu/trap/main_stage to bring nmigen into line with
microwatt VHDL

4 years agoimplement init function of DualPortSplitter
Tobias Platen [Fri, 5 Jun 2020 14:01:41 +0000 (16:01 +0200)]
implement init function of DualPortSplitter

4 years agouncomment rtlil.convert in test_l0_cache that causes runtime error
Tobias Platen [Fri, 5 Jun 2020 13:13:26 +0000 (15:13 +0200)]
uncomment rtlil.convert in test_l0_cache that causes runtime error

4 years agowhoops returning cr2 for cr3 regspec map
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 12:40:19 +0000 (13:40 +0100)]
whoops returning cr2 for cr3 regspec map

4 years agoname regfile ports by name not numerical position
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 11:36:56 +0000 (12:36 +0100)]
name regfile ports by name not numerical position

4 years agowhoops connecting up CR in wrong order. fixing with list sort
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 11:13:10 +0000 (12:13 +0100)]
whoops connecting up CR in wrong order.  fixing with list sort

4 years agofix syntax errors and use correct FastRegs (SRR0/1 not SRR1/2)
Luke Kenneth Casson Leighton [Fri, 5 Jun 2020 10:45:34 +0000 (11:45 +0100)]
fix syntax errors and use correct FastRegs (SRR0/1 not SRR1/2)