Initial CMake version. Signed-off-by: Keith Rothman <537074+litghost@users.noreply.github.com>
diff --git a/vlog_to_model.py b/vlog_to_model.py index bd52b16..c0db17f 100755 --- a/vlog_to_model.py +++ b/vlog_to_model.py
@@ -42,6 +42,12 @@ Top level module, will usually be automatically determined from the file name %.sim.v """) +parser.add_argument( + '--includes', + help="""\ +Command seperate list of include directories. +""", +default="") parser.add_argument('-o', help="""\ Output filename, default 'model.xml' """) @@ -53,6 +59,9 @@ if "o" in args and args.o is not None: outfile = args.o +for include in args.includes.split(','): + yosys.run.add_include(include) + aig_json = yosys.run.vlog_to_json(args.infiles, flatten=True, aig=True) if args.top is not None:
diff --git a/vlog_to_pbtype.py b/vlog_to_pbtype.py index 7795f9e..1102886 100755 --- a/vlog_to_pbtype.py +++ b/vlog_to_pbtype.py
@@ -71,6 +71,12 @@ Top level module, will usually be automatically determined from the file name %.sim.v """) +parser.add_argument( + '--includes', + help="""\ +Command seperate list of include directories. +""", +default="") parser.add_argument('-o', help="""\ Output filename, default 'model.xml' """) @@ -83,6 +89,9 @@ outfile = args.o yosys.run.add_define("PB_TYPE") +for include in args.includes.split(','): + yosys.run.add_include(include) + vjson = yosys.run.vlog_to_json(args.infiles, flatten=False, aig=False) yj = YosysJSON(vjson)
diff --git a/yosys/run.py b/yosys/run.py index 3754eb3..9393425 100755 --- a/yosys/run.py +++ b/yosys/run.py
@@ -17,6 +17,7 @@ defines = [] +includes = [] def add_define(defname): @@ -29,6 +30,15 @@ return " ".join(["-D" + _ for _ in defines]) +def add_include(path): + """ Add a path to search when reading verilog to the list of includes set in Yosys""" + includes.append(path) + +def get_includes(): + """Return a list of include directories, as a list of arguments to pass to Yosys `read_verilog`""" + return " ".join(["-I" + _ for _ in includes]) + + def commands(commands, infiles=[]): """Run a given string containing Yosys commands @@ -37,7 +47,7 @@ commands : string of Yosys commands to run infiles : list of input files """ - commands = "read_verilog {} {}; ".format(get_defines(), + commands = "read_verilog {} {} {}; ".format(get_defines(), get_includes(), " ".join(infiles)) + commands params = ["-q", "-p", commands] return get_output(params)