github-mirrors/cvw
1
0
Fork 0
mirror of https://github.com/openhwgroup/cvw.git synced 2025-06-28 01:32:49 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #1333 from jordancarlin/fcov_riscv_arch_test
Some checks failed
Lint / Python 312 lint (push) Has been cancelled
Details
Lint / Python 39 lint (push) Has been cancelled
Details

Browse source 
Add regression-wally --fcov-act option
This commit is contained in:
David Harris 2025-03-29 18:48:08 -07:00 • committed by GitHub
commit 8e7583d9b0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
bin/regression-wally
View file

@ -379,6 +379,7 @@ def parse_args():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("--ccov", help="Code Coverage", action="store_true") parser.add_argument("--ccov", help="Code Coverage", action="store_true")
parser.add_argument("--fcov", help="Functional Coverage", action="store_true") parser.add_argument("--fcov", help="Functional Coverage", action="store_true")
parser.add_argument("--fcov-act", help="Functional Coverage from riscv-arch-test tests", action="store_true")
parser.add_argument("--nightly", help="Run large nightly regression", action="store_true") parser.add_argument("--nightly", help="Run large nightly regression", action="store_true")
parser.add_argument("--buildroot", help="Include Buildroot Linux boot test (takes many hours, done along with --nightly)", action="store_true") parser.add_argument("--buildroot", help="Include Buildroot Linux boot test (takes many hours, done along with --nightly)", action="store_true")
parser.add_argument("--testfloat", help="Include Testfloat floating-point unit tests", action="store_true") parser.add_argument("--testfloat", help="Include Testfloat floating-point unit tests", action="store_true")
@ -399,7 +400,7 @@ def process_args(args):
for d in ["ucdb", "cov"]: for d in ["ucdb", "cov"]:
shutil.rmtree(f"{regressionDir}/questa/{d}", ignore_errors=True) shutil.rmtree(f"{regressionDir}/questa/{d}", ignore_errors=True)
os.makedirs(f"{regressionDir}/questa/{d}", exist_ok=True) os.makedirs(f"{regressionDir}/questa/{d}", exist_ok=True)
elif args.fcov or args.breker: elif args.fcov or args.fcov_act or args.breker:
sims = [coveragesim] sims = [coveragesim]
coverStr = "--fcov" coverStr = "--fcov"
TIMEOUT_DUR = 30*60 TIMEOUT_DUR = 30*60
@ -451,6 +452,9 @@ def selectTests(args, sims, coverStr):
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/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/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/pmp64", "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)
elif args.breker: elif args.breker:
addTestsByDir(WALLY+"/tests/breker/work", "breker", "questa", coverStr, configs, brekerMode=1) addTestsByDir(WALLY+"/tests/breker/work", "breker", "questa", coverStr, configs, brekerMode=1)
elif not args.testfloat: elif not args.testfloat:
@ -505,7 +509,7 @@ def main(args):
# Scale the number of concurrent processes to the number of test cases, but # Scale the number of concurrent processes to the number of test cases, but
# max out at a limited number of concurrent processes to not overwhelm the system # max out at a limited number of concurrent processes to not overwhelm the system
# right now fcov and nightly use Imperas # right now fcov and nightly use Imperas
ImperasDVLicenseCount = 16 if args.fcov or args.nightly else 10000 ImperasDVLicenseCount = 16 if args.fcov or args.fcov_act or args.nightly else 10000
with Pool(processes=min(len(configs),multiprocessing.cpu_count(), ImperasDVLicenseCount)) as pool: with Pool(processes=min(len(configs),multiprocessing.cpu_count(), ImperasDVLicenseCount)) as pool:
num_fail = 0 num_fail = 0
results = {} results = {}
@ -523,7 +527,7 @@ def main(args):
# Coverage report # Coverage report
if args.ccov: if args.ccov:
os.system(f"make -C {regressionDir} QuestaCodeCoverage") os.system(f"make -C {regressionDir} QuestaCodeCoverage")
if args.fcov or args.breker: if args.fcov or args.fcov_act or args.breker:
os.system(f"make -C {archVerifDir} merge") os.system(f"make -C {archVerifDir} merge")
# Count the number of failures # Count the number of failures
if num_fail: if num_fail: