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

Use mix of single and double quotes to avoid escaping the quotes in strings

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

18
bin/wsim
View File

@ -83,7 +83,7 @@ def prepSim(args, ElfFile):
if args.rvvi: if args.rvvi:
args.params += " RVVI_SYNTH_SUPPORTED=1 " args.params += " RVVI_SYNTH_SUPPORTED=1 "
if args.tb == "testbench_fp": if args.tb == "testbench_fp":
args.params += f" TEST=\" {args.testsuite} \" " args.params += f' TEST="{args.testsuite}" '
if ElfFile != "": if ElfFile != "":
args.args += f" {ElfFile}" args.args += f" {ElfFile}"
if args.ccov: if args.ccov:
@ -108,7 +108,7 @@ def lockstepSetup(args):
if not os.path.isfile(imperasicPath): if not os.path.isfile(imperasicPath):
print("Error: imperas.ic not found") print("Error: imperas.ic not found")
exit(1) exit(1)
prefix += f"IMPERAS_TOOLS= {imperasicPath}" prefix += f"IMPERAS_TOOLS={imperasicPath}"
if (args.lockstep or args.lockstepverbose): if (args.lockstep or args.lockstepverbose):
if(args.locksteplog != 0): ImperasPlusArgs = f" +IDV_TRACE2LOG={EnableLog} +IDV_TRACE2LOG_AFTER={args.locksteplog}" if(args.locksteplog != 0): ImperasPlusArgs = f" +IDV_TRACE2LOG={EnableLog} +IDV_TRACE2LOG_AFTER={args.locksteplog}"
@ -142,30 +142,30 @@ def runQuesta(args, flags, prefix):
if (args.gui) and (args.tb == "testbench"): if (args.gui) and (args.tb == "testbench"):
args.params += "DEBUG=1" args.params += "DEBUG=1"
if (args.args != ""): if (args.args != ""):
args.args = f" --args \\\"{args.args}\\\"" args.args = f' --args \\"{args.args}\\"'
if (args.params != ""): if (args.params != ""):
args.params = f" --params \\\"{args.params}\\\"" args.params = f' --params \\"{args.params}\\"'
# Questa cannot accept more than 9 arguments. fcov implies lockstep # Questa cannot accept more than 9 arguments. fcov implies lockstep
cmd = f"do wally.do {args.config} {args.testsuite} {args.tb} {args.args} {args.params} {flags}" cmd = f"do wally.do {args.config} {args.testsuite} {args.tb} {args.args} {args.params} {flags}"
if (args.gui): # launch Questa with GUI; add +acc to keep variables accessible if (args.gui): # launch Questa with GUI; add +acc to keep variables accessible
cmd = f"cd $WALLY/sim/questa; {prefix} vsim -do \" {cmd} +acc\"" cmd = f'cd $WALLY/sim/questa; {prefix} vsim -do "{cmd} +acc"'
else: # launch Questa in batch mode else: # launch Questa in batch mode
cmd = f"cd $WALLY/sim/questa; {prefix} vsim -c -do \" {cmd} \"" cmd = f'cd $WALLY/sim/questa; {prefix} vsim -c -do "{cmd}"'
print(f"Running Questa with command: {cmd}") print(f"Running Questa with command: {cmd}")
os.system(cmd) os.system(cmd)
def runVerilator(args, flags, prefix): def runVerilator(args, flags, prefix):
print(f"Running Verilator on {args.config} {args.testsuite}") print(f"Running Verilator on {args.config} {args.testsuite}")
os.system(f"/usr/bin/make -C {WALLY}/sim/verilator WALLYCONF={args.config} TEST={args.testsuite} TESTBENCH={args.tb} PLUS_ARGS=\"{args.args}\" PARAM_ARGS=\"{args.params}\"") os.system(f'/usr/bin/make -C {WALLY}/sim/verilator WALLYCONF={args.config} TEST={args.testsuite} TESTBENCH={args.tb} PLUS_ARGS="{args.args}" PARAM_ARGS="{args.params}"')
def runVCS(args, flags, prefix): def runVCS(args, flags, prefix):
print(f"Running VCS on {args.config} {args.testsuite}") print(f"Running VCS on {args.config} {args.testsuite}")
# if (args.gui): # if (args.gui):
# flags += " --gui" # flags += " --gui"
if (args.args != ""): if (args.args != ""):
args.args = f" --args \"{args.args}\" " args.args = f' --args "{args.args}" '
if (args.params != ""): if (args.params != ""):
args.params = f" --params \"{args.params}\" " args.params = f' --params "{args.params}" '
cmd = f"cd $WALLY/sim/vcs; {prefix} ./run_vcs {args.config} {args.testsuite} --tb {args.tb} {args.args} {args.params} {flags}" cmd = f"cd $WALLY/sim/vcs; {prefix} ./run_vcs {args.config} {args.testsuite} --tb {args.tb} {args.args} {args.params} {flags}"
print(cmd) print(cmd)
os.system(cmd) os.system(cmd)