Github_Repos/cvw
1
0
Fork 1
mirror of https://github.com/openhwgroup/cvw synced 2025-02-02 17:55:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make testsuite parameter to wsim optional if passing the --elf flag

Browse Source
This commit is contained in:
Jordan Carlin 2024-12-01 14:17:07 -08:00
parent fbe3254857
commit 775881f123
No known key found for this signature in database
1 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
bin/wsim
View File

@ -20,7 +20,7 @@ WALLY = os.environ.get('WALLY')
def parseArgs(): def parseArgs():
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("config", help="Configuration file") parser.add_argument("config", help="Configuration file")
parser.add_argument("testsuite", help="Test suite or path to .elf file") parser.add_argument("testsuite", nargs="?", help="Test suite or path to .elf file")
parser.add_argument("--elf", "-e", help="ELF File name; use if name does not end in .elf", default="") parser.add_argument("--elf", "-e", help="ELF File name; use if name does not end in .elf", default="")
parser.add_argument("--sim", "-s", help="Simulator", choices=["questa", "verilator", "vcs"], default="questa") parser.add_argument("--sim", "-s", help="Simulator", choices=["questa", "verilator", "vcs"], default="questa")
parser.add_argument("--tb", "-t", help="Testbench", choices=["testbench", "testbench_fp"], default="testbench") parser.add_argument("--tb", "-t", help="Testbench", choices=["testbench", "testbench_fp"], default="testbench")
@ -37,6 +37,20 @@ def parseArgs():
parser.add_argument("--rvvi", "-r", help="Simulate rvvi hardware interface and ethernet.", action="store_true") parser.add_argument("--rvvi", "-r", help="Simulate rvvi hardware interface and ethernet.", action="store_true")
return parser.parse_args() return parser.parse_args()
def validateArgs(args):
if not args.testsuite and not args.elf:
print("Error: Missing test suite or ELF file")
exit(1)
if(args.lockstep and not args.testsuite.endswith('.elf') and not args.testsuite == "buildroot"):
print(f"Invalid Options. Cannot run a testsuite, {args.testsuite} with lockstep. Must run a single elf.")
exit(1)
elif (args.gui or args.ccov or args.fcov or args.lockstep or args.lockstepverbose) and args.sim not in ["questa", "vcs"]:
print("Option only supported for Questa and VCS")
exit(1)
elif (args.tb == "testbench_fp" and args.sim != "questa"):
print("Error: testbench_fp presently only supported by Questa, not VCS or Verilator, because of a touchy testbench")
exit(1)
def elfFileCheck(args): def elfFileCheck(args):
ElfFile = "" ElfFile = ""
if os.path.isfile(args.elf): if os.path.isfile(args.elf):
@ -62,17 +76,6 @@ def elfFileCheck(args):
exit(1) exit(1)
return ElfFile return ElfFile
def validateArgs(args):
if(args.lockstep and not args.testsuite.endswith('.elf') and not args.testsuite == "buildroot"):
print(f"Invalid Options. Cannot run a testsuite, {args.testsuite} with lockstep. Must run a single elf.")
exit(1)
elif (args.gui or args.ccov or args.fcov or args.lockstep or args.lockstepverbose) and args.sim not in ["questa", "vcs"]:
print("Option only supported for Questa and VCS")
exit(1)
elif (args.tb == "testbench_fp" and args.sim != "questa"):
print("Error: testbench_fp presently only supported by Questa, not VCS or Verilator, because of a touchy testbench")
exit(1)
def prepSim(args, ElfFile): def prepSim(args, ElfFile):
flags = "" flags = ""
if args.vcd: if args.vcd:
@ -169,9 +172,9 @@ def runVCS(args, flags, prefix):
if __name__ == "__main__": if __name__ == "__main__":
args = parseArgs() args = parseArgs()
validateArgs(args)
print(f"Config={args.config} tests={args.testsuite} sim={args.sim} gui={args.gui} args='{args.args} params='{args.params}'") print(f"Config={args.config} tests={args.testsuite} sim={args.sim} gui={args.gui} args='{args.args} params='{args.params}'")
ElfFile = elfFileCheck(args) ElfFile = elfFileCheck(args)
validateArgs(args)
flags, prefix = prepSim(args, ElfFile) flags, prefix = prepSim(args, ElfFile)
createDirs(args) createDirs(args)
exit(runSim(args, flags, prefix)) exit(runSim(args, flags, prefix))