From 330eda243c708f0ae08c8732e4314927bf11708c Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Sun, 29 Sep 2024 10:26:08 -0700 Subject: [PATCH] Remove wally32i and wally64i tests since they are covered elsewhere now --- testbench/testbench.sv | 2 - testbench/tests.vh | 20 --- .../riscv-test-suite/rv32i_m/I/.gitignore | 0 .../rv32i_m/I/src/WALLY-ADD.S | 141 ----------------- .../rv32i_m/I/src/WALLY-SLT.S | 142 ------------------ .../rv32i_m/I/src/WALLY-SLTU.S | 142 ------------------ .../rv32i_m/I/src/WALLY-SUB.S | 142 ------------------ .../rv32i_m/I/src/WALLY-XOR.S | 142 ------------------ .../riscv-test-suite/rv64i_m/.gitgnore | 6 - .../riscv-test-suite/rv64i_m/I/.gitignore | 0 10 files changed, 737 deletions(-) delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/.gitignore delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-ADD.S delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLT.S delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLTU.S delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SUB.S delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-XOR.S delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/.gitgnore delete mode 100644 tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/.gitignore diff --git a/testbench/testbench.sv b/testbench/testbench.sv index de627e1f8..f772a6e2f 100644 --- a/testbench/testbench.sv +++ b/testbench/testbench.sv @@ -157,7 +157,6 @@ module testbench; "wally64q": if (P.Q_SUPPORTED) tests = wally64q; "wally64a_lrsc": if (P.ZALRSC_SUPPORTED) tests = wally64a_lrsc; "custom": tests = custom; - "wally64i": tests = wally64i; "wally64priv": tests = wally64priv; "wally64periph": tests = wally64periph; "coremark": tests = coremark; @@ -202,7 +201,6 @@ module testbench; "arch32zifencei": if (P.ZIFENCEI_SUPPORTED) tests = arch32zifencei; "arch32zicond": if (P.ZICOND_SUPPORTED) tests = arch32zicond; "wally32a_lrsc": if (P.ZALRSC_SUPPORTED) tests = wally32a_lrsc; - "wally32i": tests = wally32i; "wally32priv": tests = wally32priv; "wally32periph": tests = wally32periph; "ahb32" : tests = ahb32; diff --git a/testbench/tests.vh b/testbench/tests.vh index f8ef4a319..cab1d4a6d 100644 --- a/testbench/tests.vh +++ b/testbench/tests.vh @@ -3317,16 +3317,6 @@ string arch32e[] = '{ "rv32e_m/E/src/xori-01.S" }; -string wally64i[] = '{ - `WALLYTEST, - "rv64i_m/I/src/WALLY-ADD.S", - "rv64i_m/I/src/WALLY-SLT.S", - "rv64i_m/I/src/WALLY-SLTU.S", - "rv64i_m/I/src/WALLY-SUB.S", - "rv64i_m/I/src/WALLY-XOR.S" -}; - - string wally64priv[] = '{ `WALLYTEST, "rv64i_m/privilege/src/WALLY-minfo-01.S", @@ -3373,16 +3363,6 @@ string wally64periph[] = '{ "rv64i_m/privilege/src/WALLY-spi-01.S" }; -string wally32i[] = '{ - `WALLYTEST, - "rv32i_m/I/src/WALLY-ADD.S", - "rv32i_m/I/src/WALLY-SLT.S", - "rv32i_m/I/src/WALLY-SLTU.S", - "rv32i_m/I/src/WALLY-SUB.S", - "rv32i_m/I/src/WALLY-XOR.S" -}; - - string wally32priv[] = '{ `WALLYTEST, "rv32i_m/privilege/src/WALLY-csr-permission-s-01.S", diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/.gitignore b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/.gitignore deleted file mode 100644 index e69de29bb..000000000 diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-ADD.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-ADD.S deleted file mode 100644 index b07384e00..000000000 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-ADD.S +++ /dev/null @@ -1,141 +0,0 @@ -/////////////////////////////////////////// -// ../wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-ADD.S -// David_Harris@hmc.edu & Katherine Parry -// Created 2022-06-17 22:58:09.906970// -// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, -// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software -// is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT -// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -/////////////////////////////////////////// - -#include "model_test.h" -#include "arch_test.h" -RVTEST_ISA("RV32I") - -.section .text.init -.globl rvtest_entry_point -rvtest_entry_point: -RVMODEL_BOOT -RVTEST_CODE_BEGIN - -RVTEST_SIGBASE( x6, wally_signature) -RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",add) - -# Testcase 0: rs1:x28(0x00000000), rs2:x13(0x00000000), result rd:x25(0x00000000) -li x28, MASK_XLEN(0x00000000) -li x13, MASK_XLEN(0x00000000) -ADD x25, x28, x13 -sw x25, 0(x6) - -# Testcase 1: rs1:x29(0x00000000), rs2:x14(0x00000001), result rd:x2(0x00000001) -li x29, MASK_XLEN(0x00000000) -li x14, MASK_XLEN(0x00000001) -ADD x2, x29, x14 -sw x2, 4(x6) - -# Testcase 2: rs1:x9(0x00000000), rs2:x31(0xffffffff), result rd:x17(0xffffffff) -li x9, MASK_XLEN(0x00000000) -li x31, MASK_XLEN(0xffffffff) -ADD x17, x9, x31 -sw x17, 8(x6) - -# Testcase 3: rs1:x16(0x00000001), rs2:x13(0x00000000), result rd:x30(0x00000001) -li x16, MASK_XLEN(0x00000001) -li x13, MASK_XLEN(0x00000000) -ADD x30, x16, x13 -sw x30, 12(x6) - -# Testcase 4: rs1:x26(0x00000001), rs2:x27(0x00000001), result rd:x10(0x00000002) -li x26, MASK_XLEN(0x00000001) -li x27, MASK_XLEN(0x00000001) -ADD x10, x26, x27 -sw x10, 16(x6) - -# Testcase 5: rs1:x31(0x00000001), rs2:x16(0xffffffff), result rd:x12(0x00000000) -li x31, MASK_XLEN(0x00000001) -li x16, MASK_XLEN(0xffffffff) -ADD x12, x31, x16 -sw x12, 20(x6) - -# Testcase 6: rs1:x19(0xffffffff), rs2:x29(0x00000000), result rd:x30(0xffffffff) -li x19, MASK_XLEN(0xffffffff) -li x29, MASK_XLEN(0x00000000) -ADD x30, x19, x29 -sw x30, 24(x6) - -# Testcase 7: rs1:x7(0xffffffff), rs2:x17(0x00000001), result rd:x5(0x00000000) -li x7, MASK_XLEN(0xffffffff) -li x17, MASK_XLEN(0x00000001) -ADD x5, x7, x17 -sw x5, 28(x6) - -# Testcase 8: rs1:x10(0xffffffff), rs2:x5(0xffffffff), result rd:x25(0xfffffffe) -li x10, MASK_XLEN(0xffffffff) -li x5, MASK_XLEN(0xffffffff) -ADD x25, x10, x5 -sw x25, 32(x6) - -# Testcase 9: rs1:x26(0x1846d424), rs2:x9(0x9e4d6e3c), result rd:x30(0xb6944260) -li x26, MASK_XLEN(0x1846d424) -li x9, MASK_XLEN(0x9e4d6e3c) -ADD x30, x26, x9 -sw x30, 36(x6) - -# Testcase 10: rs1:x23(0x88561712), rs2:x26(0xfb97d435), result rd:x20(0x83edeb47) -li x23, MASK_XLEN(0x88561712) -li x26, MASK_XLEN(0xfb97d435) -ADD x20, x23, x26 -sw x20, 40(x6) - -# Testcase 11: rs1:x10(0xe6f4590b), rs2:x4(0x259f4329), result rd:x24(0x0c939c34) -li x10, MASK_XLEN(0xe6f4590b) -li x4, MASK_XLEN(0x259f4329) -ADD x24, x10, x4 -sw x24, 44(x6) - -.EQU NUMTESTS,12 - -RVTEST_CODE_END -RVMODEL_HALT - -RVTEST_DATA_BEGIN -.align 4 -rvtest_data: -.word 0x98765432 -RVTEST_DATA_END - -RVMODEL_DATA_BEGIN - - -wally_signature: - .fill NUMTESTS*(XLEN/32),4,0xdeadbeef - -#ifdef rvtest_mtrap_routine - -mtrap_sigptr: - .fill 64*(XLEN/32),4,0xdeadbeef - -#endif - -#ifdef rvtest_gpr_save - -gpr_save: - .fill 32*(XLEN/32),4,0xdeadbeef - -#endif -sig_end_canary: -.int 0x0 -rvtest_sig_end: - -RVMODEL_DATA_END -// ../wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-ADD.S -// David_Harris@hmc.edu & Katherine Parry diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLT.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLT.S deleted file mode 100644 index 8f7269e7f..000000000 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLT.S +++ /dev/null @@ -1,142 +0,0 @@ -/////////////////////////////////////////// -// ../wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLT.S -// David_Harris@hmc.edu & Katherine Parry -// Created 2022-06-17 22:58:09.909889// -// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, -// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software -// is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT -// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -/////////////////////////////////////////// - -#include "model_test.h" -#include "arch_test.h" -RVTEST_ISA("RV32I") - -.section .text.init -.globl rvtest_entry_point -rvtest_entry_point: -RVMODEL_BOOT -RVTEST_CODE_BEGIN - -RVTEST_SIGBASE( x6, wally_signature) - -RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",slt) - -# Testcase 0: rs1:x11(0x00000000), rs2:x8(0x00000000), result rd:x24(0x00000000) -li x11, MASK_XLEN(0x00000000) -li x8, MASK_XLEN(0x00000000) -SLT x24, x11, x8 -sw x24, 0(x6) - -# Testcase 1: rs1:x11(0x00000000), rs2:x23(0x00000001), result rd:x28(0x00000001) -li x11, MASK_XLEN(0x00000000) -li x23, MASK_XLEN(0x00000001) -SLT x28, x11, x23 -sw x28, 4(x6) - -# Testcase 2: rs1:x3(0x00000000), rs2:x7(0xffffffff), result rd:x30(0x00000000) -li x3, MASK_XLEN(0x00000000) -li x7, MASK_XLEN(0xffffffff) -SLT x30, x3, x7 -sw x30, 8(x6) - -# Testcase 3: rs1:x19(0x00000001), rs2:x8(0x00000000), result rd:x8(0x00000000) -li x19, MASK_XLEN(0x00000001) -li x8, MASK_XLEN(0x00000000) -SLT x8, x19, x8 -sw x8, 12(x6) - -# Testcase 4: rs1:x26(0x00000001), rs2:x31(0x00000001), result rd:x5(0x00000000) -li x26, MASK_XLEN(0x00000001) -li x31, MASK_XLEN(0x00000001) -SLT x5, x26, x31 -sw x5, 16(x6) - -# Testcase 5: rs1:x26(0x00000001), rs2:x18(0xffffffff), result rd:x15(0x00000000) -li x26, MASK_XLEN(0x00000001) -li x18, MASK_XLEN(0xffffffff) -SLT x15, x26, x18 -sw x15, 20(x6) - -# Testcase 6: rs1:x29(0xffffffff), rs2:x17(0x00000000), result rd:x30(0x00000001) -li x29, MASK_XLEN(0xffffffff) -li x17, MASK_XLEN(0x00000000) -SLT x30, x29, x17 -sw x30, 24(x6) - -# Testcase 7: rs1:x16(0xffffffff), rs2:x4(0x00000001), result rd:x10(0x00000001) -li x16, MASK_XLEN(0xffffffff) -li x4, MASK_XLEN(0x00000001) -SLT x10, x16, x4 -sw x10, 28(x6) - -# Testcase 8: rs1:x18(0xffffffff), rs2:x10(0xffffffff), result rd:x23(0x00000000) -li x18, MASK_XLEN(0xffffffff) -li x10, MASK_XLEN(0xffffffff) -SLT x23, x18, x10 -sw x23, 32(x6) - -# Testcase 9: rs1:x11(0x1ff39849), rs2:x27(0x8c25166a), result rd:x30(0x00000000) -li x11, MASK_XLEN(0x1ff39849) -li x27, MASK_XLEN(0x8c25166a) -SLT x30, x11, x27 -sw x30, 36(x6) - -# Testcase 10: rs1:x31(0x8a5006c1), rs2:x26(0x3405095c), result rd:x20(0x00000001) -li x31, MASK_XLEN(0x8a5006c1) -li x26, MASK_XLEN(0x3405095c) -SLT x20, x31, x26 -sw x20, 40(x6) - -# Testcase 11: rs1:x10(0x8c1745a7), rs2:x15(0x966e1277), result rd:x3(0x00000001) -li x10, MASK_XLEN(0x8c1745a7) -li x15, MASK_XLEN(0x966e1277) -SLT x3, x10, x15 -sw x3, 44(x6) - -.EQU NUMTESTS,12 - -RVTEST_CODE_END -RVMODEL_HALT - -RVTEST_DATA_BEGIN -.align 4 -rvtest_data: -.word 0x98765432 -RVTEST_DATA_END - -RVMODEL_DATA_BEGIN - - -wally_signature: - .fill NUMTESTS*(XLEN/32),4,0xdeadbeef - -#ifdef rvtest_mtrap_routine - -mtrap_sigptr: - .fill 64*(XLEN/32),4,0xdeadbeef - -#endif - -#ifdef rvtest_gpr_save - -gpr_save: - .fill 32*(XLEN/32),4,0xdeadbeef - -#endif -sig_end_canary: -.int 0x0 -rvtest_sig_end: - -RVMODEL_DATA_END -// ../wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLT.S -// David_Harris@hmc.edu & Katherine Parry diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLTU.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLTU.S deleted file mode 100644 index 2c8dab781..000000000 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLTU.S +++ /dev/null @@ -1,142 +0,0 @@ -/////////////////////////////////////////// -// ../wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLTU.S -// David_Harris@hmc.edu & Katherine Parry -// Created 2022-06-17 22:58:09.911056// -// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, -// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software -// is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT -// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -/////////////////////////////////////////// - -#include "model_test.h" -#include "arch_test.h" -RVTEST_ISA("RV32I") - -.section .text.init -.globl rvtest_entry_point -rvtest_entry_point: -RVMODEL_BOOT -RVTEST_CODE_BEGIN - -RVTEST_SIGBASE( x6, wally_signature) - -RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",sltu) - -# Testcase 0: rs1:x20(0x00000000), rs2:x26(0x00000000), result rd:x13(0x00000000) -li x20, MASK_XLEN(0x00000000) -li x26, MASK_XLEN(0x00000000) -SLTU x13, x20, x26 -sw x13, 0(x6) - -# Testcase 1: rs1:x11(0x00000000), rs2:x19(0x00000001), result rd:x8(0x00000001) -li x11, MASK_XLEN(0x00000000) -li x19, MASK_XLEN(0x00000001) -SLTU x8, x11, x19 -sw x8, 4(x6) - -# Testcase 2: rs1:x20(0x00000000), rs2:x22(0xffffffff), result rd:x9(0x00000001) -li x20, MASK_XLEN(0x00000000) -li x22, MASK_XLEN(0xffffffff) -SLTU x9, x20, x22 -sw x9, 8(x6) - -# Testcase 3: rs1:x16(0x00000001), rs2:x3(0x00000000), result rd:x3(0x00000000) -li x16, MASK_XLEN(0x00000001) -li x3, MASK_XLEN(0x00000000) -SLTU x3, x16, x3 -sw x3, 12(x6) - -# Testcase 4: rs1:x22(0x00000001), rs2:x25(0x00000001), result rd:x5(0x00000000) -li x22, MASK_XLEN(0x00000001) -li x25, MASK_XLEN(0x00000001) -SLTU x5, x22, x25 -sw x5, 16(x6) - -# Testcase 5: rs1:x29(0x00000001), rs2:x5(0xffffffff), result rd:x30(0x00000001) -li x29, MASK_XLEN(0x00000001) -li x5, MASK_XLEN(0xffffffff) -SLTU x30, x29, x5 -sw x30, 20(x6) - -# Testcase 6: rs1:x2(0xffffffff), rs2:x27(0x00000000), result rd:x3(0x00000000) -li x2, MASK_XLEN(0xffffffff) -li x27, MASK_XLEN(0x00000000) -SLTU x3, x2, x27 -sw x3, 24(x6) - -# Testcase 7: rs1:x29(0xffffffff), rs2:x23(0x00000001), result rd:x30(0x00000000) -li x29, MASK_XLEN(0xffffffff) -li x23, MASK_XLEN(0x00000001) -SLTU x30, x29, x23 -sw x30, 28(x6) - -# Testcase 8: rs1:x27(0xffffffff), rs2:x18(0xffffffff), result rd:x22(0x00000000) -li x27, MASK_XLEN(0xffffffff) -li x18, MASK_XLEN(0xffffffff) -SLTU x22, x27, x18 -sw x22, 32(x6) - -# Testcase 9: rs1:x23(0x642bfa42), rs2:x17(0xd67e55fd), result rd:x9(0x00000001) -li x23, MASK_XLEN(0x642bfa42) -li x17, MASK_XLEN(0xd67e55fd) -SLTU x9, x23, x17 -sw x9, 36(x6) - -# Testcase 10: rs1:x8(0x85940927), rs2:x28(0xcfc6e625), result rd:x7(0x00000001) -li x8, MASK_XLEN(0x85940927) -li x28, MASK_XLEN(0xcfc6e625) -SLTU x7, x8, x28 -sw x7, 40(x6) - -# Testcase 11: rs1:x19(0xe5214606), rs2:x27(0xadf20806), result rd:x31(0x00000000) -li x19, MASK_XLEN(0xe5214606) -li x27, MASK_XLEN(0xadf20806) -SLTU x31, x19, x27 -sw x31, 44(x6) - -.EQU NUMTESTS,12 - -RVTEST_CODE_END -RVMODEL_HALT - -RVTEST_DATA_BEGIN -.align 4 -rvtest_data: -.word 0x98765432 -RVTEST_DATA_END - -RVMODEL_DATA_BEGIN - - -wally_signature: - .fill NUMTESTS*(XLEN/32),4,0xdeadbeef - -#ifdef rvtest_mtrap_routine - -mtrap_sigptr: - .fill 64*(XLEN/32),4,0xdeadbeef - -#endif - -#ifdef rvtest_gpr_save - -gpr_save: - .fill 32*(XLEN/32),4,0xdeadbeef - -#endif -sig_end_canary: -.int 0x0 -rvtest_sig_end: - -RVMODEL_DATA_END -// ../wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SLTU.S -// David_Harris@hmc.edu & Katherine Parry diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SUB.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SUB.S deleted file mode 100644 index 70bb79ef8..000000000 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SUB.S +++ /dev/null @@ -1,142 +0,0 @@ -/////////////////////////////////////////// -// ../wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SUB.S -// David_Harris@hmc.edu & Katherine Parry -// Created 2022-06-17 22:58:09.908718// -// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, -// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software -// is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT -// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -/////////////////////////////////////////// - -#include "model_test.h" -#include "arch_test.h" -RVTEST_ISA("RV32I") - -.section .text.init -.globl rvtest_entry_point -rvtest_entry_point: -RVMODEL_BOOT -RVTEST_CODE_BEGIN - -RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",sub) - -RVTEST_SIGBASE( x6, wally_signature) - -# Testcase 0: rs1:x3(0x00000000), rs2:x29(0x00000000), result rd:x28(0x00000000) -li x3, MASK_XLEN(0x00000000) -li x29, MASK_XLEN(0x00000000) -SUB x28, x3, x29 -sw x28, 0(x6) - -# Testcase 1: rs1:x22(0x00000000), rs2:x11(0x00000001), result rd:x16(0xffffffff) -li x22, MASK_XLEN(0x00000000) -li x11, MASK_XLEN(0x00000001) -SUB x16, x22, x11 -sw x16, 4(x6) - -# Testcase 2: rs1:x18(0x00000000), rs2:x4(0xffffffff), result rd:x12(0x00000001) -li x18, MASK_XLEN(0x00000000) -li x4, MASK_XLEN(0xffffffff) -SUB x12, x18, x4 -sw x12, 8(x6) - -# Testcase 3: rs1:x14(0x00000001), rs2:x11(0x00000000), result rd:x20(0x00000001) -li x14, MASK_XLEN(0x00000001) -li x11, MASK_XLEN(0x00000000) -SUB x20, x14, x11 -sw x20, 12(x6) - -# Testcase 4: rs1:x21(0x00000001), rs2:x30(0x00000001), result rd:x7(0x00000000) -li x21, MASK_XLEN(0x00000001) -li x30, MASK_XLEN(0x00000001) -SUB x7, x21, x30 -sw x7, 16(x6) - -# Testcase 5: rs1:x31(0x00000001), rs2:x18(0xffffffff), result rd:x16(0x00000002) -li x31, MASK_XLEN(0x00000001) -li x18, MASK_XLEN(0xffffffff) -SUB x16, x31, x18 -sw x16, 20(x6) - -# Testcase 6: rs1:x15(0xffffffff), rs2:x28(0x00000000), result rd:x17(0xffffffff) -li x15, MASK_XLEN(0xffffffff) -li x28, MASK_XLEN(0x00000000) -SUB x17, x15, x28 -sw x17, 24(x6) - -# Testcase 7: rs1:x9(0xffffffff), rs2:x2(0x00000001), result rd:x26(0xfffffffe) -li x9, MASK_XLEN(0xffffffff) -li x2, MASK_XLEN(0x00000001) -SUB x26, x9, x2 -sw x26, 28(x6) - -# Testcase 8: rs1:x30(0xffffffff), rs2:x18(0xffffffff), result rd:x30(0x00000000) -li x30, MASK_XLEN(0xffffffff) -li x18, MASK_XLEN(0xffffffff) -SUB x30, x30, x18 -sw x30, 32(x6) - -# Testcase 9: rs1:x24(0x03983ca8), rs2:x27(0x17e0aa3c), result rd:x13(0xebb7926c) -li x24, MASK_XLEN(0x03983ca8) -li x27, MASK_XLEN(0x17e0aa3c) -SUB x13, x24, x27 -sw x13, 36(x6) - -# Testcase 10: rs1:x26(0xb5d32b16), rs2:x22(0xd3290a4c), result rd:x21(0xe2aa20ca) -li x26, MASK_XLEN(0xb5d32b16) -li x22, MASK_XLEN(0xd3290a4c) -SUB x21, x26, x22 -sw x21, 40(x6) - -# Testcase 11: rs1:x16(0x004ae545), rs2:x27(0x9ca5499d), result rd:x28(0x63a59ba8) -li x16, MASK_XLEN(0x004ae545) -li x27, MASK_XLEN(0x9ca5499d) -SUB x28, x16, x27 -sw x28, 44(x6) - -.EQU NUMTESTS,12 - -RVTEST_CODE_END -RVMODEL_HALT - -RVTEST_DATA_BEGIN -.align 4 -rvtest_data: -.word 0x98765432 -RVTEST_DATA_END - -RVMODEL_DATA_BEGIN - - -wally_signature: - .fill NUMTESTS*(XLEN/32),4,0xdeadbeef - -#ifdef rvtest_mtrap_routine - -mtrap_sigptr: - .fill 64*(XLEN/32),4,0xdeadbeef - -#endif - -#ifdef rvtest_gpr_save - -gpr_save: - .fill 32*(XLEN/32),4,0xdeadbeef - -#endif -sig_end_canary: -.int 0x0 -rvtest_sig_end: - -RVMODEL_DATA_END -// ../wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-SUB.S -// David_Harris@hmc.edu & Katherine Parry diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-XOR.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-XOR.S deleted file mode 100644 index 884d8c1a3..000000000 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-XOR.S +++ /dev/null @@ -1,142 +0,0 @@ -/////////////////////////////////////////// -// ../wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-XOR.S -// David_Harris@hmc.edu & Katherine Parry -// Created 2022-06-17 22:58:09.913218// -// Copyright (C) 2021 Harvey Mudd College & Oklahoma State University -// -// Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation -// files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, -// modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software -// is furnished to do so, subject to the following conditions: -// -// The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. -// -// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES -// OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS -// BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT -// OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. -/////////////////////////////////////////// - -#include "model_test.h" -#include "arch_test.h" -RVTEST_ISA("RV32I") - -.section .text.init -.globl rvtest_entry_point -rvtest_entry_point: -RVMODEL_BOOT -RVTEST_CODE_BEGIN - -RVTEST_SIGBASE( x6, wally_signature) - -RVTEST_CASE(0,"//check ISA:=regex(.*32.*);check ISA:=regex(.*I.*);def TEST_CASE_1=True;",xor) - -# Testcase 0: rs1:x14(0x00000000), rs2:x19(0x00000000), result rd:x9(0x00000000) -li x14, MASK_XLEN(0x00000000) -li x19, MASK_XLEN(0x00000000) -XOR x9, x14, x19 -sw x9, 0(x6) - -# Testcase 1: rs1:x15(0x00000000), rs2:x16(0x00000001), result rd:x22(0x00000001) -li x15, MASK_XLEN(0x00000000) -li x16, MASK_XLEN(0x00000001) -XOR x22, x15, x16 -sw x22, 4(x6) - -# Testcase 2: rs1:x21(0x00000000), rs2:x23(0xffffffff), result rd:x30(0xffffffff) -li x21, MASK_XLEN(0x00000000) -li x23, MASK_XLEN(0xffffffff) -XOR x30, x21, x23 -sw x30, 8(x6) - -# Testcase 3: rs1:x26(0x00000001), rs2:x12(0x00000000), result rd:x3(0x00000001) -li x26, MASK_XLEN(0x00000001) -li x12, MASK_XLEN(0x00000000) -XOR x3, x26, x12 -sw x3, 12(x6) - -# Testcase 4: rs1:x11(0x00000001), rs2:x20(0x00000001), result rd:x4(0x00000000) -li x11, MASK_XLEN(0x00000001) -li x20, MASK_XLEN(0x00000001) -XOR x4, x11, x20 -sw x4, 16(x6) - -# Testcase 5: rs1:x16(0x00000001), rs2:x19(0xffffffff), result rd:x21(0xfffffffe) -li x16, MASK_XLEN(0x00000001) -li x19, MASK_XLEN(0xffffffff) -XOR x21, x16, x19 -sw x21, 20(x6) - -# Testcase 6: rs1:x11(0xffffffff), rs2:x28(0x00000000), result rd:x7(0xffffffff) -li x11, MASK_XLEN(0xffffffff) -li x28, MASK_XLEN(0x00000000) -XOR x7, x11, x28 -sw x7, 24(x6) - -# Testcase 7: rs1:x8(0xffffffff), rs2:x1(0x00000001), result rd:x24(0xfffffffe) -li x8, MASK_XLEN(0xffffffff) -li x1, MASK_XLEN(0x00000001) -XOR x24, x8, x1 -sw x24, 28(x6) - -# Testcase 8: rs1:x9(0xffffffff), rs2:x4(0xffffffff), result rd:x23(0x00000000) -li x9, MASK_XLEN(0xffffffff) -li x4, MASK_XLEN(0xffffffff) -XOR x23, x9, x4 -sw x23, 32(x6) - -# Testcase 9: rs1:x14(0x38701a14), rs2:x27(0x5f3f5638), result rd:x2(0x674f4c2c) -li x14, MASK_XLEN(0x38701a14) -li x27, MASK_XLEN(0x5f3f5638) -XOR x2, x14, x27 -sw x2, 36(x6) - -# Testcase 10: rs1:x5(0x19c16a0d), rs2:x28(0xc87a7463), result rd:x23(0xd1bb1e6e) -li x5, MASK_XLEN(0x19c16a0d) -li x28, MASK_XLEN(0xc87a7463) -XOR x23, x5, x28 -sw x23, 40(x6) - -# Testcase 11: rs1:x27(0x38018b47), rs2:x19(0x0b9475b1), result rd:x21(0x3395fef6) -li x27, MASK_XLEN(0x38018b47) -li x19, MASK_XLEN(0x0b9475b1) -XOR x21, x27, x19 -sw x21, 44(x6) - -.EQU NUMTESTS,12 - -RVTEST_CODE_END -RVMODEL_HALT - -RVTEST_DATA_BEGIN -.align 4 -rvtest_data: -.word 0x98765432 -RVTEST_DATA_END - -RVMODEL_DATA_BEGIN - - -wally_signature: - .fill NUMTESTS*(XLEN/32),4,0xdeadbeef - -#ifdef rvtest_mtrap_routine - -mtrap_sigptr: - .fill 64*(XLEN/32),4,0xdeadbeef - -#endif - -#ifdef rvtest_gpr_save - -gpr_save: - .fill 32*(XLEN/32),4,0xdeadbeef - -#endif -sig_end_canary: -.int 0x0 -rvtest_sig_end: - -RVMODEL_DATA_END -// ../wally-riscv-arch-test/riscv-test-suite/rv32i_m/I/src/WALLY-XOR.S -// David_Harris@hmc.edu & Katherine Parry diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/.gitgnore b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/.gitgnore deleted file mode 100644 index 618bc413b..000000000 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/.gitgnore +++ /dev/null @@ -1,6 +0,0 @@ -I/src/env -M/src/env -C/src/env -privilege/src/env -Zicsr/src/env - diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/.gitignore b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/I/.gitignore deleted file mode 100644 index e69de29bb..000000000