soc.git
3 years agouse yield from on StateRunners
Luke Kenneth Casson Leighton [Sat, 25 Sep 2021 17:51:53 +0000 (18:51 +0100)]
use yield from on StateRunners

3 years agoadd comments, remove unneeded code
Luke Kenneth Casson Leighton [Sat, 25 Sep 2021 15:34:03 +0000 (16:34 +0100)]
add comments, remove unneeded code
https://bugs.libre-soc.org/show_bug.cgi?id=686#c73

3 years agomove pc_i and svstate_i to HDLRunner
Luke Kenneth Casson Leighton [Sat, 25 Sep 2021 15:23:59 +0000 (16:23 +0100)]
move pc_i and svstate_i to HDLRunner

3 years agoadd end_test, minor cleanup, added hdlrun.cleanup() call
klehman [Sat, 25 Sep 2021 14:46:53 +0000 (10:46 -0400)]
add end_test, minor cleanup, added hdlrun.cleanup() call

3 years agomoved pc_i and sv_state to constructor, remove hdl_state_run
klehman [Sat, 25 Sep 2021 14:32:33 +0000 (10:32 -0400)]
moved pc_i and sv_state to constructor, remove hdl_state_run

3 years agochange over run_hdl_state to TestRunner class
klehman [Sat, 25 Sep 2021 14:07:52 +0000 (10:07 -0400)]
change over run_hdl_state to TestRunner class

3 years agoadd dummy call to simrun and end_test()
Luke Kenneth Casson Leighton [Sat, 25 Sep 2021 13:02:15 +0000 (14:02 +0100)]
add dummy call to simrun and end_test()

3 years agocode-comments and dummy functions
Luke Kenneth Casson Leighton [Sat, 25 Sep 2021 12:49:52 +0000 (13:49 +0100)]
code-comments and dummy functions

3 years agomove contents of run_sim_state into SimRunner run_test function
Luke Kenneth Casson Leighton [Sat, 25 Sep 2021 12:43:10 +0000 (13:43 +0100)]
move contents of run_sim_state into SimRunner run_test function

3 years agoadd a SimRunner prepare_for_test and run_test function
Luke Kenneth Casson Leighton [Sat, 25 Sep 2021 12:35:36 +0000 (13:35 +0100)]
add a SimRunner prepare_for_test and run_test function

3 years agostart of HDLRunner
klehman [Sat, 25 Sep 2021 12:16:18 +0000 (08:16 -0400)]
start of HDLRunner

3 years agocreate initial SimRunner
Luke Kenneth Casson Leighton [Fri, 24 Sep 2021 19:51:10 +0000 (20:51 +0100)]
create initial SimRunner

3 years agoadd shiftrot2 tests to test_issuer.py
Luke Kenneth Casson Leighton [Fri, 24 Sep 2021 17:13:01 +0000 (18:13 +0100)]
add shiftrot2 tests to test_issuer.py

3 years agomove pc_i and svstate_i inside if self.run_hdl
Luke Kenneth Casson Leighton [Thu, 23 Sep 2021 22:55:35 +0000 (23:55 +0100)]
move pc_i and svstate_i inside if self.run_hdl

3 years agomore comments
Luke Kenneth Casson Leighton [Thu, 23 Sep 2021 22:49:57 +0000 (23:49 +0100)]
more comments

3 years agoadd in a stack of comments for identifying match-points with StateRunner
Luke Kenneth Casson Leighton [Thu, 23 Sep 2021 22:47:32 +0000 (23:47 +0100)]
add in a stack of comments for identifying match-points with StateRunner

3 years agoadd option to run ISACaller Sim (or not)
Luke Kenneth Casson Leighton [Thu, 23 Sep 2021 22:40:04 +0000 (23:40 +0100)]
add option to run ISACaller Sim (or not)

3 years agoadd a new run_hdl parameter to TestRunner
Luke Kenneth Casson Leighton [Thu, 23 Sep 2021 22:31:41 +0000 (23:31 +0100)]
add a new run_hdl parameter to TestRunner

3 years agocompletely borked python segfault, workaround to copy last sim state
Luke Kenneth Casson Leighton [Wed, 22 Sep 2021 20:52:26 +0000 (21:52 +0100)]
completely borked python segfault, workaround to copy last sim state

3 years agoadd test of expected results against last sim state
Luke Kenneth Casson Leighton [Wed, 22 Sep 2021 20:35:14 +0000 (21:35 +0100)]
add test of expected results against last sim state

3 years agowhoops broken run_sim_state function
Luke Kenneth Casson Leighton [Wed, 22 Sep 2021 20:34:52 +0000 (21:34 +0100)]
whoops broken run_sim_state function

3 years agosplit out HDL from Simulator into separate functions
Luke Kenneth Casson Leighton [Wed, 22 Sep 2021 19:18:53 +0000 (20:18 +0100)]
split out HDL from Simulator into separate functions

3 years agosplit out HDL test from Simulator test,
Luke Kenneth Casson Leighton [Wed, 22 Sep 2021 18:40:30 +0000 (19:40 +0100)]
split out HDL test from Simulator test,
save two separate lists of TestStates
compare them *after* the two simulations have been run
should be possible to completely separate out, now

3 years agoMerge branch 'master' of ssh://git.libre-riscv.org:922/soc
Tobias Platen [Wed, 22 Sep 2021 18:02:05 +0000 (20:02 +0200)]
Merge branch 'master' of ssh://git.libre-riscv.org:922/soc

3 years agocompldst_multi: add op_is_dcbz signal
Tobias Platen [Wed, 22 Sep 2021 18:00:58 +0000 (20:00 +0200)]
compldst_multi: add op_is_dcbz signal

3 years agofix mul fu test helper.py not passing immediate to pia for mulli
Jacob Lifshay [Wed, 22 Sep 2021 17:58:58 +0000 (10:58 -0700)]
fix mul fu test helper.py not passing immediate to pia for mulli

3 years agowhitespace cleanup
Tobias Platen [Wed, 22 Sep 2021 16:45:59 +0000 (18:45 +0200)]
whitespace cleanup

3 years agoalter setup_tst_memory to take a test.mem rather than take a Sim object
Luke Kenneth Casson Leighton [Wed, 22 Sep 2021 15:56:09 +0000 (16:56 +0100)]
alter setup_tst_memory to take a test.mem rather than take a Sim object
*containing* a Mem

3 years agowhoops forgot to do with self.subTest()
Luke Kenneth Casson Leighton [Wed, 22 Sep 2021 15:38:40 +0000 (16:38 +0100)]
whoops forgot to do with self.subTest()

3 years agoMerge branch 'master' of ssh://git.libre-riscv.org:922/soc
Tobias Platen [Tue, 21 Sep 2021 18:48:27 +0000 (20:48 +0200)]
Merge branch 'master' of ssh://git.libre-riscv.org:922/soc

3 years agotestcase: add mmu, link mmu and dcache together
Tobias Platen [Tue, 21 Sep 2021 18:47:33 +0000 (20:47 +0200)]
testcase: add mmu, link mmu and dcache together

3 years agochanged test_runner to use state mem compare
klehman [Tue, 21 Sep 2021 18:20:31 +0000 (14:20 -0400)]
changed test_runner to use state mem compare

3 years agochanged over to use state mem compare
klehman [Tue, 21 Sep 2021 18:19:10 +0000 (14:19 -0400)]
changed over to use state mem compare

3 years agoMerge branch 'master' of ssh://git.libre-riscv.org:922/soc
Tobias Platen [Tue, 21 Sep 2021 17:49:19 +0000 (19:49 +0200)]
Merge branch 'master' of ssh://git.libre-riscv.org:922/soc

3 years agocomment out lines that cause test_compldst_multi_mmu.py to hang
Tobias Platen [Tue, 21 Sep 2021 17:49:01 +0000 (19:49 +0200)]
comment out lines that cause test_compldst_multi_mmu.py to hang

3 years agoconvert HDLState.get_mem() to a dictionary of memory state results
Luke Kenneth Casson Leighton [Tue, 21 Sep 2021 14:46:16 +0000 (15:46 +0100)]
convert HDLState.get_mem() to a dictionary of memory state results

3 years agoupdate test_compldst_multi_mmu.py
Tobias Platen [Mon, 20 Sep 2021 18:34:31 +0000 (20:34 +0200)]
update test_compldst_multi_mmu.py

3 years agouse get_l0_mem in HDLState to get memory data
Luke Kenneth Casson Leighton [Mon, 20 Sep 2021 17:33:38 +0000 (18:33 +0100)]
use get_l0_mem in HDLState to get memory data

3 years agoFix rel_o/go_i signal names
Cesar Strauss [Sun, 19 Sep 2021 20:13:18 +0000 (17:13 -0300)]
Fix rel_o/go_i signal names

3 years agoReplace "Display" with "print" on simulation process
Cesar Strauss [Sun, 19 Sep 2021 20:03:48 +0000 (17:03 -0300)]
Replace "Display" with "print" on simulation process

The fallback on nmutil doesn't work with "yield Display".

3 years agoFix import
Cesar Strauss [Sun, 19 Sep 2021 13:38:46 +0000 (10:38 -0300)]
Fix import

3 years agoUse a pre-compiled version of maturin
Cesar Strauss [Sat, 18 Sep 2021 20:56:41 +0000 (17:56 -0300)]
Use a pre-compiled version of maturin

Should save compile time on the Gitlab CI runner.

3 years agoallow individual unit tests to be named in test_issuer.py
Luke Kenneth Casson Leighton [Sat, 18 Sep 2021 15:35:59 +0000 (16:35 +0100)]
allow individual unit tests to be named in test_issuer.py

3 years agoalways store full memory state (including zeros)
Luke Kenneth Casson Leighton [Sat, 18 Sep 2021 15:05:09 +0000 (16:05 +0100)]
always store full memory state (including zeros)

3 years agoadded get_mem
klehman [Sat, 18 Sep 2021 11:44:01 +0000 (07:44 -0400)]
added get_mem

3 years agoupdate comments
Luke Kenneth Casson Leighton [Fri, 17 Sep 2021 15:13:15 +0000 (16:13 +0100)]
update comments
https://bugs.libre-soc.org/show_bug.cgi?id=686#c51

3 years agomoving teststate_check_regs written by klehman into openpower-isa
Luke Kenneth Casson Leighton [Thu, 16 Sep 2021 16:06:18 +0000 (17:06 +0100)]
moving teststate_check_regs written by klehman into openpower-isa

3 years agoMerge branch 'master' of ssh://git.libre-riscv.org:922/soc
isengaara [Wed, 15 Sep 2021 17:56:35 +0000 (19:56 +0200)]
Merge branch 'master' of ssh://git.libre-riscv.org:922/soc

3 years agoadd new testcase for ompldst_multi using mmu
isengaara [Wed, 15 Sep 2021 17:55:52 +0000 (19:55 +0200)]
add new testcase for ompldst_multi using mmu

3 years agoconvert to using TestState and State after moving to openpower-isa
Luke Kenneth Casson Leighton [Tue, 14 Sep 2021 17:38:58 +0000 (18:38 +0100)]
convert to using TestState and State after moving to openpower-isa

3 years agofactory add and intro doc string
klehman [Tue, 14 Sep 2021 15:43:10 +0000 (11:43 -0400)]
factory add and intro doc string

3 years agoSave Gitlab runner cache, even on a failed test
Cesar Strauss [Mon, 13 Sep 2021 09:22:43 +0000 (06:22 -0300)]
Save Gitlab runner cache, even on a failed test

Since our tests currently fail, the cache was never saved, not even once.

3 years agouse log instead of print
Luke Kenneth Casson Leighton [Sun, 12 Sep 2021 13:36:41 +0000 (14:36 +0100)]
use log instead of print

3 years agocode comments
Luke Kenneth Casson Leighton [Sun, 12 Sep 2021 13:24:00 +0000 (14:24 +0100)]
code comments

3 years agocreate new function teststate_check_regs which is called by check_regs
Luke Kenneth Casson Leighton [Sun, 12 Sep 2021 13:21:23 +0000 (14:21 +0100)]
create new function teststate_check_regs which is called by check_regs
teststate_checkregs does not care how many pieces of state it is asked
to compare. could be 2, could be 3, could be 30

3 years agochanges to utilize full teststate class
klehman [Sun, 12 Sep 2021 12:59:09 +0000 (08:59 -0400)]
changes to utilize full teststate class

3 years agoadded compare function
klehman [Sun, 12 Sep 2021 03:56:11 +0000 (23:56 -0400)]
added compare function

3 years agoadded factory function for test class creation
klehman [Sun, 12 Sep 2021 00:53:31 +0000 (20:53 -0400)]
added factory function for test class creation

3 years agoimplement base class in state class
klehman [Fri, 10 Sep 2021 20:58:15 +0000 (16:58 -0400)]
implement base class in state class

3 years agochanges made to utilize teststate class
klehman [Fri, 10 Sep 2021 15:08:12 +0000 (11:08 -0400)]
changes made to utilize teststate class

3 years agoupdate explanatory comments on LD/ST exception handling
Luke Kenneth Casson Leighton [Fri, 10 Sep 2021 10:19:47 +0000 (11:19 +0100)]
update explanatory comments on LD/ST exception handling

3 years agomade sim into generators and some uniformity changes
klehman [Thu, 9 Sep 2021 21:31:31 +0000 (17:31 -0400)]
made sim into generators and some uniformity changes

3 years agofinished remaining hdl items
klehman [Thu, 9 Sep 2021 16:33:01 +0000 (12:33 -0400)]
finished remaining hdl items

3 years agoHDL int reg added
klehman [Thu, 9 Sep 2021 13:01:50 +0000 (09:01 -0400)]
HDL int reg added

3 years agomore sim class registers add
klehman [Thu, 9 Sep 2021 12:04:23 +0000 (08:04 -0400)]
more sim class registers add

3 years agoMonitor exceptions, re-decoding the instruction in this case
Cesar Strauss [Wed, 8 Sep 2021 16:42:50 +0000 (13:42 -0300)]
Monitor exceptions, re-decoding the instruction in this case

The misaligned load test-case now passes.

Whenever an exception is reported during Execution, it is forwarded to
PowerDecode2. After Execution finishes, Issue notices this, and returns
directly to Decode, without updating PC, SVSTATE, etc. The exception
condition is always cleared after a Decode, to prepare the stage for
a new Execution.

3 years agoinitial commit of sim state class
klehman [Wed, 8 Sep 2021 13:03:13 +0000 (09:03 -0400)]
initial commit of sim state class

3 years agoMonitor the exception input to PowerDecoder2
Cesar Strauss [Wed, 8 Sep 2021 09:26:15 +0000 (06:26 -0300)]
Monitor the exception input to PowerDecoder2

3 years agoRemove default argument for dict.get()
Cesar Strauss [Wed, 8 Sep 2021 09:25:18 +0000 (06:25 -0300)]
Remove default argument for dict.get()

1) The default is already None.
2) It really doesn't accept keyword arguments

3 years agofun fixing of get_core_hdl_regs, "yield from"
Luke Kenneth Casson Leighton [Tue, 7 Sep 2021 21:37:06 +0000 (22:37 +0100)]
fun fixing of get_core_hdl_regs, "yield from"

3 years agomove functions to above where they are called
Luke Kenneth Casson Leighton [Tue, 7 Sep 2021 21:31:28 +0000 (22:31 +0100)]
move functions to above where they are called

3 years agobreakout of register collection and compare
klehman [Tue, 7 Sep 2021 21:15:42 +0000 (17:15 -0400)]
breakout of register collection and compare

3 years agoFix typo.
Cesar Strauss [Tue, 7 Sep 2021 19:11:15 +0000 (16:11 -0300)]
Fix typo.

3 years agoadd TODO code-comments
Luke Kenneth Casson Leighton [Tue, 7 Sep 2021 13:44:05 +0000 (14:44 +0100)]
add TODO code-comments
related to https://bugs.libre-soc.org/show_bug.cgi?id=686

3 years agowhitespace, add bug ref number to test API
Luke Kenneth Casson Leighton [Tue, 7 Sep 2021 13:40:39 +0000 (14:40 +0100)]
whitespace, add bug ref number to test API

3 years agoanother batch of ready/valid i/o prefix-suffix swaps
Luke Kenneth Casson Leighton [Fri, 3 Sep 2021 07:13:14 +0000 (08:13 +0100)]
another batch of ready/valid i/o prefix-suffix swaps

3 years agoanooother valid_o to convert to o_valid
Luke Kenneth Casson Leighton [Tue, 31 Aug 2021 20:27:08 +0000 (21:27 +0100)]
anooother valid_o to convert to o_valid

3 years agoupdate ready/valid in shift_rot test_pipe_caller
Luke Kenneth Casson Leighton [Tue, 31 Aug 2021 20:20:02 +0000 (21:20 +0100)]
update ready/valid in shift_rot test_pipe_caller

3 years agofix test_all_values_covered, missed import when moving test cases to openpower.git
Jacob Lifshay [Tue, 31 Aug 2021 04:54:04 +0000 (21:54 -0700)]
fix test_all_values_covered, missed import when moving test cases to openpower.git

3 years agoupdate ready/valid i/o_ prefix in div test helper.py
Luke Kenneth Casson Leighton [Mon, 30 Aug 2021 16:38:31 +0000 (17:38 +0100)]
update ready/valid i/o_ prefix in div test helper.py

3 years agofix ready/valid i/o prefix in ALU test
Luke Kenneth Casson Leighton [Mon, 30 Aug 2021 14:33:41 +0000 (15:33 +0100)]
fix ready/valid i/o prefix in ALU test

3 years agofix CR tests valid/ready naming
Luke Kenneth Casson Leighton [Mon, 30 Aug 2021 12:26:49 +0000 (13:26 +0100)]
fix CR tests valid/ready naming

3 years agomissed valid/ready_i/o to o/i_ conversion
Luke Kenneth Casson Leighton [Mon, 30 Aug 2021 11:39:26 +0000 (12:39 +0100)]
missed valid/ready_i/o to o/i_ conversion

3 years agomissed valid/ready_i/o to o/i_ conversion
Luke Kenneth Casson Leighton [Mon, 30 Aug 2021 11:36:54 +0000 (12:36 +0100)]
missed valid/ready_i/o to o/i_ conversion

3 years agounnecessary signal rename ivalid_i to ii_valid (reverting)
Luke Kenneth Casson Leighton [Sun, 29 Aug 2021 21:00:59 +0000 (22:00 +0100)]
unnecessary signal rename ivalid_i to ii_valid (reverting)

3 years agoreplace data_o with o_data and data_i with i_data as well
Luke Kenneth Casson Leighton [Tue, 24 Aug 2021 11:53:06 +0000 (12:53 +0100)]
replace data_o with o_data and data_i with i_data as well
a little more care involved here due to names such as st_data_o
and others

3 years agobig rename, global/search/replace of ready_o with o_ready and the other
Luke Kenneth Casson Leighton [Tue, 24 Aug 2021 10:22:14 +0000 (11:22 +0100)]
big rename, global/search/replace of ready_o with o_ready and the other
> 4 signals as well, valid_i -> i_valid
> https://libera.irclog.whitequark.org/nmigen/2021-08-24#30728292;
> to be consistent with nmigen standards

3 years agoremove svanalysis from Makefile, it is now part of openpower-isa
Luke Kenneth Casson Leighton [Sun, 22 Aug 2021 09:43:26 +0000 (10:43 +0100)]
remove svanalysis from Makefile, it is now part of openpower-isa

3 years agofix "link addr-go direct to rel"
Tobias Platen [Tue, 17 Aug 2021 18:06:10 +0000 (20:06 +0200)]
fix "link addr-go direct to rel"

3 years agoEnable LD/ST exception test case
Cesar Strauss [Tue, 17 Aug 2021 11:37:47 +0000 (08:37 -0300)]
Enable LD/ST exception test case

It helps for implementing exception handling in TestIssuer

3 years agoClear operand latch on a terminating condition
Cesar Strauss [Tue, 17 Aug 2021 11:11:19 +0000 (08:11 -0300)]
Clear operand latch on a terminating condition

3 years agoAdd exc_o.happened to the conditions for terminating the CompUnit FSM
Cesar Strauss [Tue, 17 Aug 2021 10:18:00 +0000 (07:18 -0300)]
Add exc_o.happened to the conditions for terminating the CompUnit FSM

Otherwise, a failed load will hang indefinitely, waiting for data that
never comes.

3 years agoFix activation of cancel signal
Cesar Strauss [Tue, 17 Aug 2021 10:13:04 +0000 (07:13 -0300)]
Fix activation of cancel signal

As an active low signal, the conditions to cancel must be ANDed together.
Being active high, exc_o.happened must be inverted.

3 years agoAdjust PortInterface traces according to MMU option
Cesar Strauss [Mon, 16 Aug 2021 21:39:39 +0000 (18:39 -0300)]
Adjust PortInterface traces according to MMU option

The hierarchy of PortInterface changes when the MMU is present. Set the
correct module path, so the traces don't vanish in the GTKWave document.

3 years agofix renamed symbols
Tobias Platen [Mon, 16 Aug 2021 18:25:14 +0000 (20:25 +0200)]
fix renamed symbols

3 years agoadd WIP DCBZTestCase
Tobias Platen [Mon, 16 Aug 2021 18:02:06 +0000 (20:02 +0200)]
add WIP DCBZTestCase

3 years agoGitLab-CI: Only run tests in src/
Jonathan Neuschäfer [Wed, 11 Aug 2021 07:46:11 +0000 (09:46 +0200)]
GitLab-CI: Only run tests in src/

Specifically, the tests in unused_please_ignore_completely/ should not
be run. Some of them would fail, but it doesn't matter.

3 years agomove unused directory out of src, to indicate "ignore completely"
Luke Kenneth Casson Leighton [Sun, 1 Aug 2021 17:46:55 +0000 (18:46 +0100)]
move unused directory out of src, to indicate "ignore completely"

3 years agoimport setup_i_memory from soc.simple.test.test_runner
Jonathan Neuschäfer [Sat, 31 Jul 2021 22:25:34 +0000 (00:25 +0200)]
import setup_i_memory from soc.simple.test.test_runner

This function was moved in commit 8482a3ed
("split out TestRunner into separate module").

3 years agosoc.simple.test: Rename setup_test_memory to avoid nosetest calling it
Jonathan Neuschäfer [Sun, 1 Aug 2021 17:08:50 +0000 (19:08 +0200)]
soc.simple.test: Rename setup_test_memory to avoid nosetest calling it