[Clustering] Moved Clustered Netlist Verification Into Load Packing

The verification and printing of the clustered netlsit made more sense
inside of the load_packing method. Moved.

Author: AlexandreSinger

vpr/src/base/vpr_api.cpp

@@ -623,50 +623,16 @@ bool vpr_pack_flow(t_vpr_setup& vpr_setup, const t_arch& arch) {
 
             // generate a .net file by legalizing an input flat placement file
             if (packer_opts.load_flat_placement) {
-
                 //Load and legalizer flat placement file
                 vpr_load_flat_placement(vpr_setup, arch);
 
                 //Load the result from the .net file
                 vpr_load_packing(vpr_setup, arch);
-
             } else {
-
                 //Load a previous packing from the .net file
                 vpr_load_packing(vpr_setup, arch);
-
             }
-
         }
-
-        // Load cluster_constraints data structure.
-        load_cluster_constraints();
-
-        /* Sanity check the resulting netlist */
-        check_netlist(packer_opts.pack_verbosity);
-
-        // Independently verify the clusterings to ensure the clustering can be
-        // used for the rest of the VPR flow.
-        // NOTE: This is done here since it must be done after vpr_load_packing
-        //       and load_cluster_constraints.
-        // TODO: If load_cluster_constraints was in vpr_load_packing, this could
-        //       also be in vpr_load_packing which would make more sense.
-        unsigned num_errors = verify_clustering(g_vpr_ctx);
-        if (num_errors == 0) {
-            VTR_LOG("Completed clustering consistency check successfully.\n");
-        } else {
-            VPR_ERROR(VPR_ERROR_PACK,
-                      "%u errors found while performing clustering consistency "
-                      "check. Aborting program.\n",
-                      num_errors);
-        }
-
-        /* Output the netlist stats to console and optionally to file. */
-        writeClusteredNetlistStats(vpr_setup.FileNameOpts.write_block_usage);
-
-        // print the total number of used physical blocks for each
-        // physical block type after finishing the packing stage
-        print_pb_type_count(g_vpr_ctx.clustering().clb_nlist);
     }
 
     return status;
@@ -759,6 +725,31 @@ void vpr_load_packing(t_vpr_setup& vpr_setup, const t_arch& arch) {
         std::ofstream ofs("packing_pin_util.rpt");
         report_packing_pin_usage(ofs, g_vpr_ctx);
     }
+
+    // Load cluster_constraints data structure.
+    load_cluster_constraints();
+
+    /* Sanity check the resulting netlist */
+    check_netlist(vpr_setup.PackerOpts.pack_verbosity);
+
+    // Independently verify the clusterings to ensure the clustering can be
+    // used for the rest of the VPR flow.
+    unsigned num_errors = verify_clustering(g_vpr_ctx);
+    if (num_errors == 0) {
+        VTR_LOG("Completed clustering consistency check successfully.\n");
+    } else {
+        VPR_ERROR(VPR_ERROR_PACK,
+                  "%u errors found while performing clustering consistency "
+                  "check. Aborting program.\n",
+                  num_errors);
+    }
+
+    /* Output the netlist stats to console and optionally to file. */
+    writeClusteredNetlistStats(vpr_setup.FileNameOpts.write_block_usage);
+
+    // print the total number of used physical blocks for each
+    // physical block type after finishing the packing stage
+    print_pb_type_count(g_vpr_ctx.clustering().clb_nlist);
 }
 
 bool vpr_load_flat_placement(t_vpr_setup& vpr_setup, const t_arch& arch) {

vpr/src/pack/verify_clustering.cpp

@@ -222,7 +222,7 @@ static unsigned check_clustering_pb_consistency(const ClusteredNetlist& clb_nlis
  *        with the floorplanning constraints on the atoms.
  *
  * This checks the following invariants:
- *  - If a cluster is unconstrained, all of its atoms are unconrstrained.
+ *  - If a cluster is unconstrained, all of its atoms are unconstrained.
  *  - If a cluster is constrained, at least one of its atoms are constrained.
  *  - If a cluster is constrained, each of its constrained atoms can be placed
  *    within its constrained region.

vpr/src/pack/verify_clustering.h

@@ -72,8 +72,9 @@ unsigned verify_clustering(const ClusteredNetlist& clb_nlist,
  * given VPR context itself. This verifies that the actual clustering being used
  * through the rest of the flow is valid.
  *
- * NOTE: The above method is used when one wishes to verify a temporary
- *       clustering befor updating the actual global VPR context.
+ * NOTE: The verify_clustering method with more arguments is used when one
+ *       wishes to verify a temporary clustering befor updating the actual
+ *       global VPR context.
  *
  *  @param ctx  The global VPR context variable found in g_vpr_ctx.
  *