utils/vlog: General Python style improvements Signed-off-by: David Shah <davey1576@gmail.com>
diff --git a/vlog_to_model.py b/vlog_to_model.py index b4a3463..daf750a 100755 --- a/vlog_to_model.py +++ b/vlog_to_model.py
@@ -84,8 +84,9 @@ with open(args.infiles[0], 'r') as f: for line in f: im = inc_re.match(line) - if im: - deps_files.add(im.group(1)) + if not im: + continue + deps_files.add(im.group(1)) if len(deps_files) > 0: # Has dependencies, not a leaf model @@ -98,7 +99,7 @@ if wm: model_path = "%s/%s.model.xml" % (module_path, wm.group(1).lower()) else: - assert False + assert False, "included Verilog file name %s does not follow pattern %%.sim.v" % module_basename xmlinc.include_xml(models_xml, model_path, outfile, "xpointer(models/child::node())") else: # Is a leaf model @@ -131,7 +132,7 @@ elif iodir == "output": ET.SubElement(outports_xml, "port", attrs) else: - assert(False) #how does VPR specify inout (only applicable for PACKAGEPIN of an IO primitive) + assert False, "bidirectional ports not permitted in VPR models" if len(models_xml) == 0:
diff --git a/vlog_to_pbtype.py b/vlog_to_pbtype.py index 683b301..ebeb49d 100755 --- a/vlog_to_pbtype.py +++ b/vlog_to_pbtype.py
@@ -201,7 +201,7 @@ """Add a suitable timing spec if necessary to the pb_type""" if tmgspec is not None: splitspec = tmgspec.split(" ") - assert len(splitspec) == 2 + assert len(splitspec) == 2, 'bad timing specification "%s", must be of format "clock value"' % tmgspec attrs = {"port": port, "clock": splitspec[0]} if xmltype == "T_clock_to_Q": attrs["max"] = splitspec[1] @@ -276,7 +276,7 @@ pb_xml_attrs["blif_model"] = ".latch" pb_xml_attrs["class"] = "flipflop" else: - assert False + assert False, "unknown class %s" % mod_cls elif is_blackbox and not has_modes: pb_xml_attrs["blif_model"] = ".subckt " + mod.attr("MODEL_NAME", mod.name) @@ -298,7 +298,7 @@ elif iodir == "output": ET.SubElement(pb_type_xml, "output", ioattrs) else: - assert False + assert False, "bidirectional ports not supported in VPR pb_types" if has_modes: for mode in modes: