Merge branch 'abc_path_fix' of github.com:byuccl/vtr-verilog-to-routing into abc_path_fix

Author: jgoeders

vtr_flow/scripts/python_libs/vtr/abc/abc.py

@@ -114,7 +114,13 @@ def run(
         )
         if abc_flow_type == "blanket_bb":
             command_runner.run_system_command(
-                [blackbox_latches_script, "--input", input_file, "--output", pre_abc_blif.name,],
+                [
+                    blackbox_latches_script,
+                    "--input",
+                    input_file,
+                    "--output",
+                    pre_abc_blif.name,
+                ],
                 temp_dir=temp_dir,
                 log_filename=str(i) + "_blackboxing_latch.out",
                 indent_depth=1,
@@ -173,7 +179,8 @@ def run(
                     'echo "Output Netlist"',
                     'echo "=============="',
                     "write_hie {pre_abc_blif} {post_abc_raw_blif}".format(
-                        pre_abc_blif=pre_abc_blif.name, post_abc_raw_blif=post_abc_raw_blif.name,
+                        pre_abc_blif=pre_abc_blif.name,
+                        post_abc_raw_blif=post_abc_raw_blif.name,
                     ),
                     "time;",
                 ]
@@ -189,7 +196,8 @@ def run(
                     "time",
                     "scleanup",
                     "write_hie {pre_abc_blif} {post_abc_raw_blif}".format(
-                        pre_abc_blif=pre_abc_blif.name, post_abc_raw_blif=post_abc_raw_blif.name,
+                        pre_abc_blif=pre_abc_blif.name,
+                        post_abc_raw_blif=post_abc_raw_blif.name,
                     ),
                     "print_stats",
                 ]
@@ -269,7 +277,7 @@ def run(
 # pylint: enable=too-many-arguments, too-many-locals
 def parse_abc_args(abc_args):
     """
-        function to parse abc_args
+    function to parse abc_args
     """
     abc_flow_type = "iterative_bb"
     abc_run_args = ""
@@ -303,7 +311,7 @@ def parse_abc_args(abc_args):
 
 def populate_clock_list(circuit_file, blackbox_latches_script, clk_list, command_runner, temp_dir):
     """
-        function to populate the clock list
+    function to populate the clock list
     """
     clk_list_path = temp_dir / "report_clk.out"
     cmd = [
@@ -407,8 +415,8 @@ def run_lec(
 
 def check_abc_lec_status(output):
     """
-        Reads abc_lec output and determines if the files were equivelent and
-        if there were errors when preforming lec.
+    Reads abc_lec output and determines if the files were equivelent and
+    if there were errors when preforming lec.
     """
     equivalent = None
     errored = False

vtr_flow/scripts/python_libs/vtr/flow.py

@@ -31,26 +31,26 @@ def __ge__(self, other):
 
 # pylint: disable=too-many-arguments, too-many-locals, too-many-branches, too-many-statements
 def run(
-        architecture_file,
-        circuit_file,
-        power_tech_file=None,
-        start_stage=VtrStage.odin,
-        end_stage=VtrStage.vpr,
-        command_runner=vtr.CommandRunner(),
-        temp_dir=Path("./temp"),
-        odin_args=None,
-        abc_args=None,
-        vpr_args=None,
-        keep_intermediate_files=True,
-        keep_result_files=True,
-        min_hard_mult_size=3,
-        min_hard_adder_size=1,
-        check_equivalent=False,
-        check_incremental_sta_consistency=False,
-        use_old_abc_script=False,
-        relax_w_factor=1.3,
-        check_route = False,
-        check_place = False,
+    architecture_file,
+    circuit_file,
+    power_tech_file=None,
+    start_stage=VtrStage.odin,
+    end_stage=VtrStage.vpr,
+    command_runner=vtr.CommandRunner(),
+    temp_dir=Path("./temp"),
+    odin_args=None,
+    abc_args=None,
+    vpr_args=None,
+    keep_intermediate_files=True,
+    keep_result_files=True,
+    min_hard_mult_size=3,
+    min_hard_adder_size=1,
+    check_equivalent=False,
+    check_incremental_sta_consistency=False,
+    use_old_abc_script=False,
+    relax_w_factor=1.3,
+    check_route=False,
+    check_place=False,
 ):
     """
     Runs the VTR CAD flow to map the specified circuit_file onto the target architecture_file
@@ -252,7 +252,7 @@ def run(
             do_second_run = False
             second_run_args = vpr_args
 
-            if "write_rr_graph" in vpr_args or  "analysis" in vpr_args or "route" in vpr_args:
+            if "write_rr_graph" in vpr_args or "analysis" in vpr_args or "route" in vpr_args:
                 do_second_run = True
 
             vtr.vpr.run(
@@ -337,10 +337,14 @@ def run(
 
 
 def delete_intermediate_files(
-    next_stage_netlist, post_ace_activity_file, keep_result_files, temp_dir, power_tech_file,
+    next_stage_netlist,
+    post_ace_activity_file,
+    keep_result_files,
+    temp_dir,
+    power_tech_file,
 ):
     """
-        delete intermediate files
+    delete intermediate files
     """
     next_stage_netlist.unlink()
     exts = (".xml", ".sdf", ".v")

vtr_flow/scripts/run_vtr_flow.py

@@ -22,7 +22,7 @@
 # pylint: disable=too-few-public-methods
 class VtrStageArgparseAction(argparse.Action):
     """
-        Class to parse the VTR stages to begin and end at.
+    Class to parse the VTR stages to begin and end at.
     """
 
     def __call__(self, parser, namespace, value, option_string=None):
@@ -43,7 +43,7 @@ def __call__(self, parser, namespace, value, option_string=None):
 
 def vtr_command_argparser(prog=None):
     """
-        The VTR command arg parser
+    The VTR command arg parser
     """
     usage = "%(prog)s circuit_file architecture_file [options]"
     description = textwrap.dedent(
@@ -327,7 +327,9 @@ def vtr_command_argparser(prog=None):
         help="Tells VPR the amount of iterations allowed to obtain the critical path.",
     )
     vpr.add_argument(
-        "-fix_pins", type=str, help="Controls how the placer handles I/O pads during placement.",
+        "-fix_pins",
+        type=str,
+        help="Controls how the placer handles I/O pads during placement.",
     )
     vpr.add_argument(
         "-relax_w_factor",
@@ -354,7 +356,10 @@ def vtr_command_argparser(prog=None):
         help="Tells VPR to run final analysis stage.",
     )
     vpr.add_argument(
-        "-check_place", default=False, action="store_true", help="Tells VPR to run routing stage",
+        "-check_place",
+        default=False,
+        action="store_true",
+        help="Tells VPR to run routing stage",
     )
     vpr.add_argument(
         "-sdc_file", default=None, type=str, help="Path to SDC timing constraints file."
@@ -371,14 +376,14 @@ def vtr_command_argparser(prog=None):
 
 def main():
     """
-        Main function to call vtr_command_main to run VTR
+    Main function to call vtr_command_main to run VTR
     """
     return vtr_command_main(sys.argv[1:], prog=sys.argv[0])
 
 
 def vtr_command_main(arg_list, prog=None):
     """
-        Running VTR with the specified arguemnts.
+    Running VTR with the specified arguemnts.
     """
     start = datetime.now()
     # Load the arguments
@@ -431,8 +436,8 @@ def vtr_command_main(arg_list, prog=None):
             check_incremental_sta_consistency=args.check_incremental_sta_consistency,
             use_old_abc_script=args.use_old_abc_script,
             relax_w_factor=args.relax_w_factor,
-            check_route = args.check_route,
-            check_place = args.check_place,
+            check_route=args.check_route,
+            check_place=args.check_place,
         )
         error_status = "OK"
     except vtr.VtrError as error:
@@ -521,7 +526,7 @@ def process_unknown_args(unknown_args):
 
 def process_abc_args(args):
     """
-        Finds arguments needed in the ABC stage of the flow
+    Finds arguments needed in the ABC stage of the flow
     """
     abc_args = OrderedDict()
     if args.iterative_bb:
@@ -543,7 +548,7 @@ def process_abc_args(args):
 
 def process_odin_args(args):
     """
-        Finds arguments needed in the ODIN stage of the flow
+    Finds arguments needed in the ODIN stage of the flow
     """
     odin_args = OrderedDict()
     odin_args["adder_type"] = args.adder_type
@@ -562,7 +567,7 @@ def process_odin_args(args):
 
 def process_vpr_args(args, prog, temp_dir, vpr_args):
     """
-        Finds arguments needed in the VPR stage of the flow
+    Finds arguments needed in the VPR stage of the flow
     """
     if args.crit_path_router_iterations:
         if "max_router_iterations" not in vpr_args:
@@ -580,7 +585,7 @@ def process_vpr_args(args, prog, temp_dir, vpr_args):
 
 def get_sdc_file(sdc_file, prog):
     """
-        takes in the sdc_file and returns a path to that file if it exists.
+    takes in the sdc_file and returns a path to that file if it exists.
     """
     if not Path(sdc_file).exists():
         if sdc_file.startswith("/"):
@@ -593,7 +598,7 @@ def get_sdc_file(sdc_file, prog):
 
 def except_vtr_error(error, expect_fail, verbose):
     """
-        Handle vtr exceptions
+    Handle vtr exceptions
     """
     error_status = None
     actual_error = None