From 67a089104ca6960d0479a4d7dc9629901a336d37 Mon Sep 17 00:00:00 2001 From: David Harris Date: Sun, 14 May 2023 03:36:28 -0700 Subject: [PATCH 1/4] Defined empty RVMODEL interrupt macros to make riscof warnings go away --- tests/riscof/sail_cSim/env/model_test.h | 12 ++++++++++++ tests/riscof/spike/env/model_test.h | 12 ++++++++++++ 2 files changed, 24 insertions(+) diff --git a/tests/riscof/sail_cSim/env/model_test.h b/tests/riscof/sail_cSim/env/model_test.h index be07d625d..62611529b 100644 --- a/tests/riscof/sail_cSim/env/model_test.h +++ b/tests/riscof/sail_cSim/env/model_test.h @@ -51,5 +51,17 @@ #define RVMODEL_CLEAR_MEXT_INT +#define RVMODEL_CLR_MSW_INT +#define RVMODEL_CLR_MTIMER_INT +#define RVMODEL_CLR_MEXT_INT +#define RVMODEL_SET_SSW_INT +#define RVMODEL_CLR_SSW_INT +#define RVMODEL_CLR_STIMER_INT +#define RVMODEL_CLR_SEXT_INT +#define RVMODEL_SET_VSW_INT +#define RVMODEL_CLR_VSW_INT +#define RVMODEL_CLR_VTIMER_INT +#define RVMODEL_CLR_VEXT_INT + #endif // _COMPLIANCE_MODEL_H diff --git a/tests/riscof/spike/env/model_test.h b/tests/riscof/spike/env/model_test.h index 3890c4985..0757f6c49 100644 --- a/tests/riscof/spike/env/model_test.h +++ b/tests/riscof/spike/env/model_test.h @@ -56,5 +56,17 @@ #define RVMODEL_CLEAR_MEXT_INT +#define RVMODEL_CLR_MSW_INT +#define RVMODEL_CLR_MTIMER_INT +#define RVMODEL_CLR_MEXT_INT +#define RVMODEL_SET_SSW_INT +#define RVMODEL_CLR_SSW_INT +#define RVMODEL_CLR_STIMER_INT +#define RVMODEL_CLR_SEXT_INT +#define RVMODEL_SET_VSW_INT +#define RVMODEL_CLR_VSW_INT +#define RVMODEL_CLR_VTIMER_INT +#define RVMODEL_CLR_VEXT_INT + #endif // _COMPLIANCE_MODEL_H From cd7816ff3236003c0d5e57cc3f44ccacb84ea1ae Mon Sep 17 00:00:00 2001 From: David Harris Date: Sun, 14 May 2023 03:58:08 -0700 Subject: [PATCH 2/4] Commented out unnecessary text segment in test.ld that causes RWX in LOAD segment warning --- examples/C/common/test.ld | 4 ++-- examples/C/inline/inline | Bin 38864 -> 0 bytes examples/C/sum_mixed/sum_mixed | Bin 39928 -> 0 bytes examples/asm/trap/trap | Bin 7240 -> 0 bytes 4 files changed, 2 insertions(+), 2 deletions(-) delete mode 100755 examples/C/inline/inline delete mode 100755 examples/C/sum_mixed/sum_mixed delete mode 100755 examples/asm/trap/trap diff --git a/examples/C/common/test.ld b/examples/C/common/test.ld index a50b017e8..5eccb434c 100644 --- a/examples/C/common/test.ld +++ b/examples/C/common/test.ld @@ -28,8 +28,8 @@ SECTIONS . = ALIGN(0x1000); .tohost : { *(.tohost) } - . = ALIGN(0x1000); - .text : { *(.text) } +/* . = ALIGN(0x1000); + .text : { *(.text) } */ /* data segment */ .data : { *(.data) } diff --git a/examples/C/inline/inline b/examples/C/inline/inline deleted file mode 100755 index 29b5b8bff87695406890aa1fabf03d9429050f46..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 38864 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 diff --git a/examples/C/sum_mixed/sum_mixed b/examples/C/sum_mixed/sum_mixed deleted file mode 100755 index 62ac4022a25e04d05437627bd61debfc853639f0..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 39928 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 Date: Sun, 14 May 2023 04:19:08 -0700 Subject: [PATCH 3/4] Fixed riscof scripts that were removing zicsr from compiler misa --- tests/riscof/sail_cSim/riscof_sail_cSim.py | 3 ++- tests/riscof/spike/riscof_spike.py | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/riscof/sail_cSim/riscof_sail_cSim.py b/tests/riscof/sail_cSim/riscof_sail_cSim.py index aa32757ca..b34425f72 100644 --- a/tests/riscof/sail_cSim/riscof_sail_cSim.py +++ b/tests/riscof/sail_cSim/riscof_sail_cSim.py @@ -94,7 +94,8 @@ class sail_cSim(pluginTemplate): execute = "@cd "+testentry['work_dir']+";" - cmd = self.compile_cmd.format(testentry['isa'].lower().replace('zicsr', ' ', 1), self.xlen) + ' ' + test + ' -o ' + elf +# cmd = self.compile_cmd.format(testentry['isa'].lower().replace('zicsr', ' ', 1), self.xlen) + ' ' + test + ' -o ' + elf + cmd = self.compile_cmd.format(testentry['isa'].lower(), self.xlen) + ' ' + test + ' -o ' + elf compile_cmd = cmd + ' -D' + " -D".join(testentry['macros']) execute+=compile_cmd+";" diff --git a/tests/riscof/spike/riscof_spike.py b/tests/riscof/spike/riscof_spike.py index 308d55f28..67c88b6ab 100644 --- a/tests/riscof/spike/riscof_spike.py +++ b/tests/riscof/spike/riscof_spike.py @@ -159,7 +159,8 @@ class spike(pluginTemplate): # substitute all variables in the compile command that we created in the initialize # function - cmd = self.compile_cmd.format(testentry['isa'].lower().replace('zicsr', ' ', 2), self.xlen, test, elf, compile_macros) +# cmd = self.compile_cmd.format(testentry['isa'].lower().replace('zicsr', ' ', 2), self.xlen, test, elf, compile_macros) + cmd = self.compile_cmd.format(testentry['isa'].lower(), self.xlen, test, elf, compile_macros) # if the user wants to disable running the tests and only compile the tests, then # the "else" clause is executed below assigning the sim command to simple no action From 0a7a159d69ad7ec35ea28478dd38e24cade59f93 Mon Sep 17 00:00:00 2001 From: David Harris Date: Sun, 14 May 2023 06:58:29 -0700 Subject: [PATCH 4/4] Added Zicsr and zifencei to RVTEST_ISA in custom tests where necessary to make them compile --- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-clint-01.S | 2 +- .../rv32i_m/privilege/src/WALLY-csr-permission-s-01.S | 2 +- .../rv32i_m/privilege/src/WALLY-csr-permission-u-01.S | 2 +- .../rv32i_m/privilege/src/WALLY-endianness-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-gpio-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-mie-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-minfo-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-misa-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-mmu-sv32-01.S | 2 +- .../rv32i_m/privilege/src/WALLY-mmu-sv32-svadu-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-mtvec-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-periph-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-plic-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-plic-s-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-pma-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-pmp-01.S | 2 +- .../rv32i_m/privilege/src/WALLY-satp-invalid-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-sie-01.S | 2 +- .../rv32i_m/privilege/src/WALLY-status-fp-enabled-01.S | 2 +- .../rv32i_m/privilege/src/WALLY-status-mie-01.S | 2 +- .../rv32i_m/privilege/src/WALLY-status-sie-01.S | 2 +- .../rv32i_m/privilege/src/WALLY-status-tvm-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-status-tw-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-stvec-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-s-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-sret-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-u-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-uart-01.S | 2 +- .../rv32i_m/privilege/src/WALLY-uart-timeout-01.S | 2 +- .../riscv-test-suite/rv32i_m/privilege/src/WALLY-wfi-01.S | 2 +- .../riscv-test-suite/rv64i_m/Zifencei/src/Fencei.S | 2 +- .../rv64i_m/privilege/src/WALLY-csr-permission-s-01.S | 2 +- .../rv64i_m/privilege/src/WALLY-csr-permission-u-01.S | 2 +- .../rv64i_m/privilege/src/WALLY-endianness-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-gpio-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-mie-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-minfo-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-misa-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv39-01.S | 2 +- .../rv64i_m/privilege/src/WALLY-mmu-sv39-svadu-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv48-01.S | 2 +- .../rv64i_m/privilege/src/WALLY-mmu-sv48-svadu-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-mtvec-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-periph-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-plic-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-plic-s-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-pma-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-pmp-01.S | 2 +- .../rv64i_m/privilege/src/WALLY-satp-invalid-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-sie-01.S | 2 +- .../rv64i_m/privilege/src/WALLY-status-fp-enabled-01.S | 2 +- .../rv64i_m/privilege/src/WALLY-status-mie-01.S | 2 +- .../rv64i_m/privilege/src/WALLY-status-sie-01.S | 2 +- .../rv64i_m/privilege/src/WALLY-status-tvm-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-status-tw-01.S | 2 +- .../rv64i_m/privilege/src/WALLY-status-xlen-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-stvec-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-s-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-sret-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-u-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-uart-01.S | 2 +- .../riscv-test-suite/rv64i_m/privilege/src/WALLY-wfi-01.S | 2 +- 64 files changed, 64 insertions(+), 64 deletions(-) diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-clint-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-clint-01.S index 7aac05823..f04a51d50 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-clint-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-clint-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",clint) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-csr-permission-s-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-csr-permission-s-01.S index a43531cc7..8223b8bf6 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-csr-permission-s-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-csr-permission-s-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;",csr-permission-s) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-csr-permission-u-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-csr-permission-u-01.S index ace47a806..bbaf214c0 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-csr-permission-u-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-csr-permission-u-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;",csr-permission-u) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-endianness-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-endianness-01.S index c13dde253..01097e03f 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-endianness-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-endianness-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",endianness) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-gpio-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-gpio-01.S index 21ff79d10..0bcce74b5 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-gpio-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-gpio-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",gpio) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mie-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mie-01.S index 6c91f64fc..bbb9fca5c 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mie-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mie-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",mie) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-minfo-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-minfo-01.S index 3a4626b64..b1f801ba2 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-minfo-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-minfo-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;",minfo) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-misa-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-misa-01.S index 888011ba6..06e419eb2 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-misa-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-misa-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;",misa) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mmu-sv32-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mmu-sv32-01.S index 0faa5b2e9..4df3a9e0f 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mmu-sv32-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mmu-sv32-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr_Zifencei") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;",mmu) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mmu-sv32-svadu-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mmu-sv32-svadu-01.S index 409fae185..a71ab485c 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mmu-sv32-svadu-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mmu-sv32-svadu-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True; def NO_SAIL=True;",mmu) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mtvec-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mtvec-01.S index e2865be3e..4c2f3dcc8 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mtvec-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-mtvec-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",mtvec) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-periph-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-periph-01.S index febab70ef..4c06a2def 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-periph-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-periph-01.S @@ -23,7 +23,7 @@ #include "model_test.h" #include "arch_test.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") // this test is blocked, it won't build or run. To unblock it remove the check ISA:=regex(BLOCKED); RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True",periph) diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-plic-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-plic-01.S index 414fb44b3..c728f5721 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-plic-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-plic-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",plic) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-plic-s-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-plic-s-01.S index a6ed546a8..80204cf1c 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-plic-s-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-plic-s-01.S @@ -24,7 +24,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",plic-s) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-pma-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-pma-01.S index 3000ddcde..ceba7374c 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-pma-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-pma-01.S @@ -36,7 +36,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",pma) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-pmp-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-pmp-01.S index 0f93d4086..a37e95365 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-pmp-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-pmp-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",pmp) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-satp-invalid-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-satp-invalid-01.S index dd412abe7..1c7d0edb0 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-satp-invalid-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-satp-invalid-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True; def TEST_CASE_1=True;",satp-invalid) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-sie-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-sie-01.S index 64c0567cb..d4d6c4f35 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-sie-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-sie-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",sie) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-fp-enabled-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-fp-enabled-01.S index 1b091238d..75afdb0b8 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-fp-enabled-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-fp-enabled-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32IAF") +RVTEST_ISA("RV32IAF_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*A.*F.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;",status-fp-enabled) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-mie-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-mie-01.S index 1fc792a98..bb3c1d738 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-mie-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-mie-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;",status-mie) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-sie-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-sie-01.S index 81e230273..60e9c5c8b 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-sie-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-sie-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",status-sie) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-tvm-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-tvm-01.S index 48df172f4..8f323c1c2 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-tvm-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-tvm-01.S @@ -24,7 +24,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;", status-tvm) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-tw-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-tw-01.S index 15155fb76..faa2598f3 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-tw-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-tw-01.S @@ -24,7 +24,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;", status-tw) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-stvec-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-stvec-01.S index e42ffb6dc..f666c421e 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-stvec-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-stvec-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",stvec) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-01.S index 9385e3547..d90dff9eb 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",trap) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-s-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-s-01.S index 85758b101..d779f74fa 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-s-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-s-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def NO_SAIL=True;",trap-s) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-sret-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-sret-01.S index e0f81a2c0..c4041c972 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-sret-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-sret-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",trap-sret) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-u-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-u-01.S index df812db64..98da8180e 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-u-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-trap-u-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",trap-u) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-uart-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-uart-01.S index deba11c29..c18ed2629 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-uart-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-uart-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",uart) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-uart-timeout-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-uart-timeout-01.S index 9e19ff202..106580b88 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-uart-timeout-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-uart-timeout-01.S @@ -24,7 +24,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",uart-timeout) .equ UART, 0x10000000 diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-wfi-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-wfi-01.S index 720d83956..61d73a4f7 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-wfi-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-wfi-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-32.h" -RVTEST_ISA("RV32I") +RVTEST_ISA("RV32I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",wfi) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/Zifencei/src/Fencei.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/Zifencei/src/Fencei.S index 701b28235..330ea5c63 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/Zifencei/src/Fencei.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/Zifencei/src/Fencei.S @@ -9,7 +9,7 @@ #include "arch_test.h" # Test Virtual Machine (TVM) used by program. -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zifencei") # Test code region .section .text.init diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-csr-permission-s-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-csr-permission-s-01.S index 2ff2e99f2..4512bd9cb 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-csr-permission-s-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-csr-permission-s-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",csr-permission-s) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-csr-permission-u-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-csr-permission-u-01.S index 848186a98..5bd6c458b 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-csr-permission-u-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-csr-permission-u-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",csr-permission-u) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-endianness-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-endianness-01.S index 38bc6fd18..b5505e1b1 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-endianness-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-endianness-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True; def NO_SAIL=True;",endianness) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-gpio-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-gpio-01.S index 6e3ebcbcb..3782ea561 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-gpio-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-gpio-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",gpio) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mie-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mie-01.S index 664e8ce08..df688afbd 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mie-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mie-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",mie) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-minfo-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-minfo-01.S index 5f4ae446a..f7e183ba7 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-minfo-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-minfo-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",minfo) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-misa-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-misa-01.S index 9dc0b5c43..543df7cbf 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-misa-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-misa-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",misa) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv39-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv39-01.S index ed11d0bda..76ce91bfb 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv39-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv39-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr_Zifencei") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",mmu-sv39) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv39-svadu-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv39-svadu-01.S index cd35b9a2c..68c77a1aa 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv39-svadu-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv39-svadu-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True",mmu-sv39) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv48-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv48-01.S index 4948abe20..ce2685428 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv48-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv48-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr_Zifencei") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",sv48) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv48-svadu-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv48-svadu-01.S index 702645b63..bcb93d670 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv48-svadu-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mmu-sv48-svadu-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True",sv48) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mtvec-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mtvec-01.S index b192d229c..3cb9b2421 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mtvec-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-mtvec-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True; def NO_SAIL=True;",mtvec) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-periph-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-periph-01.S index 69562c59d..6c985c98b 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-periph-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-periph-01.S @@ -23,7 +23,7 @@ #include "model_test.h" #include "arch_test.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") // this test is blocked, it won't build or run. To unblock it remove the check ISA:=regex(BLOCKED); RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True",periph) diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-plic-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-plic-01.S index b50b20f96..0056c9c72 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-plic-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-plic-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",plic) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-plic-s-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-plic-s-01.S index 5a6dc34e2..68161276c 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-plic-s-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-plic-s-01.S @@ -24,7 +24,7 @@ #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",plic-s) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-pma-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-pma-01.S index 3048c1ebc..e340302e5 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-pma-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-pma-01.S @@ -35,7 +35,7 @@ #define PLIC_RANGE 0x03FFFFFF #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",pma) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-pmp-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-pmp-01.S index fc3864d38..e8da53c3a 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-pmp-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-pmp-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",pmp) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-satp-invalid-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-satp-invalid-01.S index 7a565c71d..a711e4729 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-satp-invalid-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-satp-invalid-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True; def TEST_CASE_1=True;",satp-invalid) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-sie-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-sie-01.S index 28df4374c..fa2bd599c 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-sie-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-sie-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",sie) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-fp-enabled-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-fp-enabled-01.S index 8479dbde5..7ce55f79a 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-fp-enabled-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-fp-enabled-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64IAF") +RVTEST_ISA("RV64IAF_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*A.*F.*);def TEST_CASE_1=True;",status-fp-enabled) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-mie-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-mie-01.S index 6fc868984..2d24f92b4 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-mie-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-mie-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",status-mie) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-sie-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-sie-01.S index e9a9e443b..c52f23c3d 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-sie-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-sie-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",status-sie) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-tvm-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-tvm-01.S index 72d3a8600..efef21093 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-tvm-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-tvm-01.S @@ -24,7 +24,7 @@ #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;", status-tvm) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-tw-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-tw-01.S index 184b022ed..43ddf8cc9 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-tw-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-tw-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",status-tw) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-xlen-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-xlen-01.S index ad3a3e6f7..1fba96a74 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-xlen-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-xlen-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",xlen) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-stvec-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-stvec-01.S index 05ecf515a..92e3709c5 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-stvec-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-stvec-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True; def NO_SAIL=True;",stvec) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-01.S index b44b6440d..26c06e053 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",trap) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-s-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-s-01.S index 525e79276..4ed0941ae 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-s-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-s-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",trap-s) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-sret-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-sret-01.S index 78692fd1c..041d548ad 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-sret-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-sret-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",trap-sret) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-u-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-u-01.S index e10e5d988..af0d9f32d 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-u-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-trap-u-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",trap-u) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-uart-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-uart-01.S index 3cbf3591b..32423d247 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-uart-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-uart-01.S @@ -23,7 +23,7 @@ #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*); def Drvtest_mtrap_routine=True;def TEST_CASE_1=True;def NO_SAIL=True;",uart) INIT_TESTS diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-wfi-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-wfi-01.S index c67d3c24a..6430f2078 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-wfi-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-wfi-01.S @@ -22,7 +22,7 @@ /////////////////////////////////////////// #include "WALLY-TEST-LIB-64.h" -RVTEST_ISA("RV64I") +RVTEST_ISA("RV64I_Zicsr") RVTEST_CASE(0,"//check ISA:=regex(.*64.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;def NO_SAIL=True;",wfi) INIT_TESTS