Tidy up path name arguments in sim.py

Now the defaults for --testlist and --simulator_yaml should work, no
matter where it's called from.
This commit is contained in:
Rupert Swarbrick 2020-03-03 11:30:23 +00:00 committed by Rupert Swarbrick
parent 00bc7ca038
commit d934a4485b

View file

@ -290,13 +290,14 @@ def main():
# Parse input arguments # Parse input arguments
parser = argparse.ArgumentParser() parser = argparse.ArgumentParser()
parser.add_argument("--o", type=str, default="./out", parser.add_argument("--o", type=str, default="out",
help="Output directory name") help="Output directory name")
parser.add_argument("--riscv_dv_root", type=str, default="", parser.add_argument("--riscv_dv_root", type=str, default="",
help="Root directory of RISCV-DV") help="Root directory of RISCV-DV")
parser.add_argument("--testlist", type=str, parser.add_argument("--testlist", help="Regression testlist",
default="riscv_dv_extension/testlist.yaml", default=os.path.join(_CORE_IBEX,
help="Regression testlist") 'riscv_dv_extension',
'testlist.yaml'))
parser.add_argument("--test", type=str, default="all", parser.add_argument("--test", type=str, default="all",
help="Test name, 'all' means all tests in the list") help="Test name, 'all' means all tests in the list")
parser.add_argument("--seed", type=int, default=-1, parser.add_argument("--seed", type=int, default=-1,
@ -306,9 +307,11 @@ def main():
help="Override the iteration count in the test list") help="Override the iteration count in the test list")
parser.add_argument("--simulator", type=str, default="vcs", parser.add_argument("--simulator", type=str, default="vcs",
help="RTL simulator to use (default: vcs)") help="RTL simulator to use (default: vcs)")
parser.add_argument("--simulator_yaml", type=str, parser.add_argument("--simulator_yaml",
default="yaml/rtl_simulation.yaml", help="RTL simulator setting YAML",
help="RTL simulator setting YAML") default=os.path.join(_CORE_IBEX,
'yaml',
'rtl_simulation.yaml'))
parser.add_argument("--iss", type=str, default="spike", parser.add_argument("--iss", type=str, default="spike",
help="Instruction set simulator") help="Instruction set simulator")
parser.add_argument("-v", "--verbose", dest="verbose", action="store_true", parser.add_argument("-v", "--verbose", dest="verbose", action="store_true",