diff --git a/pipelined/testbench/tests.vh b/pipelined/testbench/tests.vh index 20980eebf..8e50d5a64 100644 --- a/pipelined/testbench/tests.vh +++ b/pipelined/testbench/tests.vh @@ -1467,8 +1467,8 @@ string imperas32f[] = '{ "rv64i_m/privilege/WALLY-MIE-01", "0050a0", "rv64i_m/privilege/WALLY-mtvec-01", "0050a0", "rv64i_m/privilege/WALLY-stvec-01", "0050a0", - "rv64i_m/privilege/WALLY-PIE-stack-01", "0050a0", - "rv64i_m/privilege/WALLY-PIE-stack-s-01", "0050a0", + "rv64i_m/privilege/WALLY-status-mie-01", "0050a0", + "rv64i_m/privilege/WALLY-status-mie-s-01", "0050a0", "rv64i_m/privilege/WALLY-trap-sret-01", "0050a0", // "rv64i_m/privilege/WALLY-status-tw-01", "0050a0", "rv64i_m/privilege/WALLY-WFI-01", "0050a0", @@ -1546,10 +1546,10 @@ string wally32i[] = '{ "rv32i_m/privilege/WALLY-MIE-01", "5080", "rv32i_m/privilege/WALLY-mtvec-01", "5080", "rv32i_m/privilege/WALLY-stvec-01", "5080", - "rv32i_m/privilege/WALLY-PIE-stack-01", "5080", - "rv32i_m/privilege/WALLY-PIE-stack-s-01", "5080", + "rv32i_m/privilege/WALLY-status-mie-01", "5080", + "rv32i_m/privilege/WALLY-status-mie-s-01", "5080", "rv32i_m/privilege/WALLY-trap-sret-01", "5080", -// "rv32i_m/privilege/WALLY-status-tw-01", "5080", +// "rv32i_m/privilege/WALLY-status-tw-01", "5080", *** this test doesn't pass yet because PC counts up while wfi is spinning "rv32i_m/privilege/WALLY-WFI-01", "5080", "rv32i_m/privilege/WALLY-status-fp-disabled-01", "5080" diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag index 429ff576f..15ea4b0c4 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/Makefrag @@ -44,8 +44,8 @@ target_tests_nosim = \ WALLY-mtvec-01 \ WALLY-stvec-01 \ WALLY-MIE-01 \ - WALLY-PIE-stack-01 \ - WALLY-PIE-stack-s-01 \ + WALLY-status-mie-01 \ + WALLY-status-mie-s-01 \ WALLY-trap-sret-01 \ WALLY-trap-01 \ WALLY-trap-s-01 \ diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/references/WALLY-PIE-stack-01.reference_output b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/references/WALLY-status-mie-01.reference_output similarity index 100% rename from tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/references/WALLY-PIE-stack-01.reference_output rename to tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/references/WALLY-status-mie-01.reference_output diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/references/WALLY-PIE-stack-s-01.reference_output b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/references/WALLY-status-mie-s-01.reference_output similarity index 100% rename from tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/references/WALLY-PIE-stack-s-01.reference_output rename to tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/references/WALLY-status-mie-s-01.reference_output diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-scratch-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-scratch-01.S deleted file mode 100644 index 686bbacc3..000000000 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-scratch-01.S +++ /dev/null @@ -1,35 +0,0 @@ -/////////////////////////////////////////// -// -// WALLY-scratch -// -// Author: Kip Macsai-Goren -// -// Created 2022-02-20 -// -// 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 "WALLY-TEST-LIB-32.h" - -INIT_TESTS - -TRAP_HANDLER m -// Test 5.3.2.3: Scratch registers test - -WRITE_READ_CSR mscratch, 0x111 // check that mscratch is readable and writeable in machine mode - -END_TESTS - -TEST_STACK_AND_DATA \ No newline at end of file diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-sscratch-s-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-sscratch-s-01.S deleted file mode 100644 index 761c639a8..000000000 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-sscratch-s-01.S +++ /dev/null @@ -1,39 +0,0 @@ -/////////////////////////////////////////// -// -// WALLY-sscratch -// -// Author: Kip Macsai-Goren -// -// Created 2022-02-20 -// -// 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 "WALLY-TEST-LIB-32.h" - -INIT_TESTS - -TRAP_HANDLER m - -// Test 5.3.2.3: Scratch registers test -WRITE_READ_CSR sscratch, 0x111 // check that sscratch is readable and writeable in machine mode - -GOTO_S_MODE 0x0, 0x0 - -WRITE_READ_CSR sscratch, 0xAAA // check that sscratch is readable and writeable in supervisor mode - -END_TESTS - -TEST_STACK_AND_DATA \ No newline at end of file diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-PIE-stack-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-mie-01.S similarity index 100% rename from tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-PIE-stack-01.S rename to tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-mie-01.S diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-PIE-stack-s-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-mie-s-01.S similarity index 100% rename from tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-PIE-stack-s-01.S rename to tests/wally-riscv-arch-test/riscv-test-suite/rv32i_m/privilege/src/WALLY-status-mie-s-01.S diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag index 041af89d4..0575008b2 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/Makefrag @@ -46,8 +46,8 @@ target_tests_nosim = \ WALLY-mtvec-01 \ WALLY-stvec-01 \ WALLY-MIE-01 \ - WALLY-PIE-stack-01 \ - WALLY-PIE-stack-s-01 \ + WALLY-status-mie-01 \ + WALLY-status-mie-s-01 \ WALLY-trap-01 \ WALLY-trap-s-01 \ WALLY-trap-u-01 \ diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/references/WALLY-PIE-stack-01.reference_output b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/references/WALLY-status-mie-01.reference_output similarity index 100% rename from tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/references/WALLY-PIE-stack-01.reference_output rename to tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/references/WALLY-status-mie-01.reference_output diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/references/WALLY-PIE-stack-s-01.reference_output b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/references/WALLY-status-mie-s-01.reference_output similarity index 100% rename from tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/references/WALLY-PIE-stack-s-01.reference_output rename to tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/references/WALLY-status-mie-s-01.reference_output diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-PIE-stack-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-mie-01.S similarity index 94% rename from tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-PIE-stack-01.S rename to tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-mie-01.S index ff16a18b2..9bf590680 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-PIE-stack-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-mie-01.S @@ -35,7 +35,6 @@ WRITE_READ_CSR mie, 0xFFF // test 5.3.1.6 Interrupt enabling and priority tests -// Cause interrupt, ensuring that status.mie = 0 , status.mpie = 1, and status.mpp = 11 during trap handling jal cause_m_soft_interrupt /// only cause one interrupt because we just want to test the status stack li x28, 0x8 diff --git a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-PIE-stack-s-01.S b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-mie-s-01.S similarity index 95% rename from tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-PIE-stack-s-01.S rename to tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-mie-s-01.S index e5b9bf00c..15a30d014 100644 --- a/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-PIE-stack-s-01.S +++ b/tests/wally-riscv-arch-test/riscv-test-suite/rv64i_m/privilege/src/WALLY-status-mie-s-01.S @@ -39,7 +39,6 @@ WRITE_READ_CSR mideleg 0xFFFF // delegate all interrupts to S mode. GOTO_S_MODE -// Cause interrupt, ensuring that status.sie = 0 , status.spie = 1, and status.spp = 1 during trap handling jal cause_s_soft_interrupt // only cause one interrupt because we just want to test the status stack li x28, 0x2