utils/vlog: Further Python style improvements Signed-off-by: David Shah <davey1576@gmail.com>
diff --git a/vlog_to_model.py b/vlog_to_model.py index b2353fa..012a7e8 100755 --- a/vlog_to_model.py +++ b/vlog_to_model.py
@@ -98,7 +98,7 @@ model_path = "{}/{}.model.xml" .format(module_path, wm.group(1).lower()) else: assert False, "included Verilog file name {} does not follow pattern %%.sim.v".format(module_basename) - xmlinc.include_xml(models_xml, model_path, outfile, "xpointer(models/child::node())") + xmlinc.include_xml(parent=models_xml, href=model_path, outfile=outfile, xptr="xpointer(models/child::node())") else: # Is a leaf model topname = tmod.attr("MODEL_NAME", top)
diff --git a/vlog_to_pbtype.py b/vlog_to_pbtype.py index 6d8006e..62adaab 100755 --- a/vlog_to_pbtype.py +++ b/vlog_to_pbtype.py
@@ -133,7 +133,7 @@ cname = mod_pb_name(yj.module(cname)) else: cname = mod_pname - return ("%s.%s" % (cname, cellpin)) + return ("{}.{}".format(cname, cellpin)) def make_direct_conn(ic_xml, source, dest): source_pin = get_full_pin_name(source) @@ -166,7 +166,7 @@ pb_type_path = "{}/{}.pb_type.xml".format(module_path, wm.group(1).lower()) else: pb_type_path = "{}/pb_type.xml".format(module_path) - xmlinc.include_xml(xml_parent, pb_type_path, outfile) + xmlinc.include_xml(parent=xml_parent, href=pb_type_path, outfile=outfile) # In order to avoid overspecifying interconnect, there are two directions we currently # consider. All interconnect going INTO a cell, and interconnect going out of a cell # into a top level output - or all outputs if "mode" is used. @@ -200,7 +200,7 @@ """Add a suitable timing spec if necessary to the pb_type""" if tmgspec is not None: splitspec = tmgspec.split(" ") - assert len(splitspec) == 2, 'bad timing specification "%s", must be of format "clock value"' % tmgspec + assert len(splitspec) == 2, 'bad timing specification "{}", must be of format "clock value"'.format(tmgspec) attrs = {"port": port, "clock": splitspec[0]} if xmltype == "T_clock_to_Q": attrs["max"] = splitspec[1]
diff --git a/xmlinc.py b/xmlinc.py index 55dbe5f..120c834 100644 --- a/xmlinc.py +++ b/xmlinc.py
@@ -3,7 +3,7 @@ xi_url = "http://www.w3.org/2001/XInclude" -xi_include = "{%s}include" % xi_url +xi_include = "{{{}}}include".format(xi_url) ET.register_namespace('xi', xi_url)
diff --git a/yosys/run.py b/yosys/run.py index 4626e38..18e6458 100755 --- a/yosys/run.py +++ b/yosys/run.py
@@ -56,7 +56,7 @@ flatten : set to flatten output hierarchy aig : generate And-Inverter-Graph modules for gates mode : set to a value other than None to use `chparam` to set the value of the MODE parameter - mode_mod : the name of the module to apply `mode` to + module_with_mode : the name of the module to apply `mode` to """ prep_opts = "-flatten" if flatten else "" json_opts = "-aig" if aig else ""