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

Merge branch 'main' of https://github.com/openhwgroup/cvw into fcov_lockstep

Browse source
This commit is contained in:
Jordan Carlin 2025-02-09 15:52:21 -08:00
commit 7901b50680
No known key found for this signature in database
2 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Makefile
View file

@ -8,7 +8,7 @@ SIM = ${WALLY}/sim
.PHONY: all riscof testfloat combined_IF_vectors zsbl benchmarks coremark embench coverage cvw-arch-verif clean .PHONY: all riscof testfloat combined_IF_vectors zsbl benchmarks coremark embench coverage cvw-arch-verif clean
all: riscof testfloat combined_IF_vectors zsbl coverage cvw-arch-verif # benchmarks all: riscof testfloat combined_IF_vectors zsbl coverage # cvw-arch-verif benchmarks
# riscof builds the riscv-arch-test and wally-riscv-arch-test suites # riscof builds the riscv-arch-test and wally-riscv-arch-test suites
riscof: riscof:

11
bin/regression-wally
View file

@ -318,16 +318,19 @@ def addTestsByDir(testDir, config, sim, coverStr, configs, lockstepMode=0, breke
sim_logdir = f"{regressionDir}/{sim}/logs/" sim_logdir = f"{regressionDir}/{sim}/logs/"
cmdPrefix = f"wsim --sim {sim} {coverStr} {'--lockstep' if lockstepMode else ''} {config}" cmdPrefix = f"wsim --sim {sim} {coverStr} {'--lockstep' if lockstepMode else ''} {config}"
# fcov/ccov only runs on WALLY-COV-ALL.elf files; other lockstep runs on all files # fcov/ccov only runs on WALLY-COV-ALL.elf files; other lockstep runs on all files
fileEnd = "ALL.elf" if "cvw-arch-verif/tests" in testDir and "priv" not in testDir and (coverStr == "--fcov" or coverStr == "--ccov") else ".elf" fileStart = "WALLY-COV-ALL" if "cvw-arch-verif/tests" in testDir and "priv" not in testDir else ""
if lockstepMode or coverStr == "--fcov": fileEnd = ".elf"
gs = "** Note: $finish" if lockstepMode:
gs = "Mismatches : 0"
elif brekerMode: elif brekerMode:
gs="# trek: info: summary: Test PASSED" gs="# trek: info: summary: Test PASSED"
elif coverStr == "--fcov":
gs = "Functional coverage test complete."
else: else:
gs = "Single Elf file tests are not signatured verified." gs = "Single Elf file tests are not signatured verified."
for dirpath, _, filenames in os.walk(os.path.abspath(testDir)): for dirpath, _, filenames in os.walk(os.path.abspath(testDir)):
for file in filenames: for file in filenames:
if file.endswith(fileEnd): if file.endswith(fileEnd) and file.startswith(fileStart):
fullfile = os.path.join(dirpath, file) fullfile = os.path.join(dirpath, file)
fields = fullfile.rsplit('/', 3) fields = fullfile.rsplit('/', 3)
if fields[2] == "ref": if fields[2] == "ref":