Move W5FF to use XML generator Signed-off-by: David Shah <davey1576@gmail.com>
diff --git a/vlog_to_pbtype.py b/vlog_to_pbtype.py index f81ebbb..0e23af8 100755 --- a/vlog_to_pbtype.py +++ b/vlog_to_pbtype.py
@@ -40,6 +40,8 @@ - `(* ASSOC_CLOCK="RDCLK" *)` : force a port's associated clock to a given value - `(* PORT_CLASS="clock" *)` : specify the VPR "port_class" + +The Verilog define "PB_TYPE" is set during generation. """ import os, tempfile, sys @@ -73,6 +75,7 @@ args = parser.parse_args() +yosys.run.add_define("PB_TYPE") vjson = yosys.run.vlog_to_json(args.infiles, False, False) yj = YosysJson(vjson)
diff --git a/yosys/run.py b/yosys/run.py index 3f50221..4eb0755 100755 --- a/yosys/run.py +++ b/yosys/run.py
@@ -10,8 +10,17 @@ cmd = [get_yosys()] + params return subprocess.check_output(cmd).decode("utf-8") +defines = [] + +def add_define(defname): + defines.append(defname) + +def get_defines(): + return " ".join(["-D" + _ for _ in defines]) + def commands(commands, infiles = []): - params = ["-q", "-p", commands] + infiles + commands = "read_verilog %s %s; " % (get_defines(), " ".join(infiles)) + commands + params = ["-q", "-p", commands] return get_output(params) def script(script, infiles = []):