From 331efcedc481542c6974478d031f96a9789bcbc4 Mon Sep 17 00:00:00 2001 From: Kip Macsai-Goren Date: Sun, 17 Apr 2022 21:00:36 +0000 Subject: [PATCH] added new tests to makefrag and tests.vh --- pipelined/testbench/tests.vh | 10 ++++++++-- .../riscv-test-suite/rv64i_m/privilege/Makefrag | 9 ++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/pipelined/testbench/tests.vh b/pipelined/testbench/tests.vh index 90d41f55..621b5f86 100644 --- a/pipelined/testbench/tests.vh +++ b/pipelined/testbench/tests.vh @@ -1467,11 +1467,17 @@ string imperas32f[] = '{ "rv64i_m/privilege/WALLY-MTVEC", "002090", "rv64i_m/privilege/WALLY-MVENDORID", "004090", */ "rv64i_m/privilege/WALLY-PMA", "0050a0", - "rv64i_m/privilege/WALLY-PMP", "0050a0" + "rv64i_m/privilege/WALLY-PMP", "0050a0", // "rv64i_m/privilege/WALLY-SCAUSE", "002090", // "rv64i_m/privilege/WALLY-scratch-01", "0040a0", // "rv64i_m/privilege/WALLY-sscratch-s-01", "0040a0", -// "rv64i_m/privilege/WALLY-trap-01", "0050a0" +// "rv64i_m/privilege/WALLY-trap-01", "0050a0", + "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-trap-sret-01", "0050a0" // "rv64i_m/privilege/WALLY-STVEC", "002090", // "rv64i_m/privilege/WALLY-UCAUSE", "002090", 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 a7006338..bf794fa7 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 @@ -35,9 +35,10 @@ rv64i_sc_tests = \ WALLY-CSR-permission-s-01 \ WALLY-CSR-permission-u-01 \ WALLY-misa-01 \ - WALLY-sscratch-s-01 \ WALLY-AMO \ WALLY-LRSC \ +# WALLY-scratch-01 \ +# WALLY-sscratch-s-01 \ # WALLY-scratch-01 \ @@ -59,6 +60,12 @@ target_tests_nosim = \ WALLY-CSR-PERMISSIONS-M \ WALLY-CSR-PERMISSIONS-S \ WALLY-trap-01 \ + WALLY-mtvec-01 \ + WALLY-stvec-01 \ + WALLY-MIE-01 \ + WALLY-PIE-stack-01 \ + WALLY-PIE-stack-s-01 \ + WALLY-trap-sret-01 \ # Have all 0's in references! #WALLY-MEPC \ #WALLY-SEPC \