From ff6157d1efb5b9fdcc101c6b965f17ecac83967c Mon Sep 17 00:00:00 2001 From: Jordan Carlin Date: Sun, 6 Apr 2025 17:43:33 -0700 Subject: [PATCH] Disable pmp TOR tests because of Wally top of pmp region bug --- bin/regression-wally | 8 +++----- testbench/tests.vh | 8 ++++---- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/bin/regression-wally b/bin/regression-wally index eec6a3676..1bc3f1954 100755 --- a/bin/regression-wally +++ b/bin/regression-wally @@ -440,11 +440,9 @@ def selectTests(args, sims, coverStr): addTestsByDir(f"{archVerifDir}/tests/lockstep/priv/rv64/", "rv64gc", coveragesim, coverStr, configs) addTestsByDir(WALLY+"/tests/coverage/", "rv64gc", coveragesim, coverStr, configs) # Extra tests from riscv-arch-test that should be run as part of the functional coverage suite - #addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv32i_m/vm_sv32", "rv32gc", coveragesim, coverStr, configs) - #addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv32i_m/pmp32", "rv32gc", coveragesim, coverStr, configs) - addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv64i_m/pmp64", "rv64gc", coveragesim, coverStr, configs) + addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv64i_m/pmp", "rv64gc", coveragesim, coverStr, configs) addTestsByDir(f"{WALLY}/tests/riscof/work/wally-riscv-arch-test/rv64i_m/privilege", "rv64gc", coveragesim, coverStr, configs) - # addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv64i_m/F", "rv64gc", coveragesim, coverStr, configs) # doesn't help fdivsqrt coverage 4/3/2025 + # addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv64i_m/F", "rv64gc", coveragesim, coverStr, configs) # doesn't help fdivsqrt coverage 4/3/2025 elif args.fcov: # run tests in lockstep in functional coverage mode addTestsByDir(f"{archVerifDir}/tests/lockstep/rv32/", "rv32gc", coveragesim, coverStr, configs, lockstepMode=1) addTestsByDir(f"{archVerifDir}/tests/lockstep/rv64/", "rv64gc", coveragesim, coverStr, configs, lockstepMode=1) @@ -453,7 +451,7 @@ def selectTests(args, sims, coverStr): # Extra tests from riscv-arch-test that should be run as part of the functional coverage suite addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv32i_m/vm_sv32", "rv32gc", coveragesim, coverStr, configs, lockstepMode=1) # addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv32i_m/pmp32", "rv32gc", coveragesim, coverStr, configs, lockstepMode=1) TODO: Add when working in lockstep - # addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv64i_m/pmp64", "rv64gc", coveragesim, coverStr, configs, lockstepMode=1) TODO: Add when working in lockstep + # addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv64i_m/pmp", "rv64gc", coveragesim, coverStr, configs, lockstepMode=1) TODO: Add when working in lockstep elif args.fcov_act: addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv32i_m", "rv32gc", coveragesim, coverStr, configs, lockstepMode=1) addTestsByDir(f"{WALLY}/tests/riscof/work/riscv-arch-test/rv64i_m", "rv64gc", coveragesim, coverStr, configs, lockstepMode=1) diff --git a/testbench/tests.vh b/testbench/tests.vh index 21f88ad6d..26dd7c2fb 100644 --- a/testbench/tests.vh +++ b/testbench/tests.vh @@ -203,10 +203,10 @@ string arch64pmp[] = '{ "rv64i_m/pmp/src/pmp64-NA4-U.S", "rv64i_m/pmp/src/pmp64-NAPOT-M.S", "rv64i_m/pmp/src/pmp64-NAPOT-S.S", - "rv64i_m/pmp/src/pmp64-NAPOT-U.S", - "rv64i_m/pmp/src/pmp64-TOR-M.S", - "rv64i_m/pmp/src/pmp64-TOR-S.S", - "rv64i_m/pmp/src/pmp64-TOR-U.S" + "rv64i_m/pmp/src/pmp64-NAPOT-U.S" + // "rv64i_m/pmp/src/pmp64-TOR-M.S", TODO: Reenable when Wally top of PMP region bug is fixed + // "rv64i_m/pmp/src/pmp64-TOR-S.S", + // "rv64i_m/pmp/src/pmp64-TOR-U.S" }; string arch32vm_sv32[] = '{