github-mirrors/cvw
1
0
Fork 0
mirror of https://github.com/openhwgroup/cvw.git synced 2025-04-19 03:24:50 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1342 from jordancarlin/riscv-arch-test-pmp64
Some checks failed
Lint / Python 312 lint (push) Has been cancelled
Details
Lint / Python 39 lint (push) Has been cancelled
Details

Browse source 
Update riscvarch-test rv64 pmp tests
This commit is contained in:
David Harris 2025-04-06 17:47:48 -07:00 • committed by GitHub
commit 6272e57a51
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 14 additions and 47 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
addins/riscv-arch-test

@ -1 +1 @@
Subproject commit 4812bdf0690c5ca0d9e2aba7e406cfa1f82b6a30
Subproject commit 3aa9b50e68c064b2e893c3dda283aa99505ae622

8
bin/regression-wally
View file

@ -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)

51
testbench/tests.vh
View file

@ -197,47 +197,16 @@ string arch32pmp[] = '{
// Tests commented out pending riscv-arch-test issue #588
string arch64pmp[] = '{
`RISCVARCHTEST,
"rv64i_m/pmp64/src/pmp64-CFG-reg.S",
"rv64i_m/pmp64/src/pmp64-CSR-access.S",
"rv64i_m/pmp64/src/pmp64-NA4-R-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-NA4-R-priority.S",
"rv64i_m/pmp64/src/pmp64-NA4-R.S",
"rv64i_m/pmp64/src/pmp64-NA4-RW-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-NA4-RW-priority.S",
"rv64i_m/pmp64/src/pmp64-NA4-RW.S",
"rv64i_m/pmp64/src/pmp64-NA4-RWX.S",
"rv64i_m/pmp64/src/pmp64-NA4-RX-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-NA4-RX-priority.S",
"rv64i_m/pmp64/src/pmp64-NA4-RX.S",
"rv64i_m/pmp64/src/pmp64-NA4-X-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-NA4-X-priority.S",
"rv64i_m/pmp64/src/pmp64-NA4-X.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-R-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-R-priority.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-R.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-RW-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-RW-priority.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-RW.S",
// "rv64i_m/pmp64/src/pmp64-NAPOT-RWX.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-RX-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-RX-priority.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-RX.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-X-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-X-priority.S",
"rv64i_m/pmp64/src/pmp64-NAPOT-X.S",
"rv64i_m/pmp64/src/pmp64-TOR-R-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-TOR-R-priority.S",
"rv64i_m/pmp64/src/pmp64-TOR-R.S",
"rv64i_m/pmp64/src/pmp64-TOR-RW-priority-level-2..S",
"rv64i_m/pmp64/src/pmp64-TOR-RW-priority.S",
"rv64i_m/pmp64/src/pmp64-TOR-RW.S",
// "rv64i_m/pmp64/src/pmp64-TOR-RWX.S",
"rv64i_m/pmp64/src/pmp64-TOR-RX-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-TOR-RX-priority.S",
"rv64i_m/pmp64/src/pmp64-TOR-RX.S",
"rv64i_m/pmp64/src/pmp64-TOR-X-priority-level-2.S",
"rv64i_m/pmp64/src/pmp64-TOR-X-priority.S",
"rv64i_m/pmp64/src/pmp64-TOR-X.S"
"rv64i_m/pmp/src/pmp64-CSR-ALL-MODES.S",
"rv64i_m/pmp/src/pmp64-NA4-M.S",
"rv64i_m/pmp/src/pmp64-NA4-S.S",
"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", 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[] = '{