[AP] Full Legalizer Implementation

Author: AlexandreSinger

vpr/src/base/vpr_api.cpp

@@ -407,7 +407,7 @@ bool vpr_flow(t_vpr_setup& vpr_setup, t_arch& arch) {
     { //Analytical Place
         if (vpr_setup.PlacerOpts.doAnalyticalPlacement == STAGE_DO) {
             // TODO: Make this return a bool if the placement was successful or not.
-            run_analytical_placement_flow();
+            run_analytical_placement_flow(vpr_setup);
         }
     }
 

vpr/src/place/analytical_placement/PlacementLegalizer.cpp

@@ -754,9 +754,3 @@ void FlowBasedLegalizer::legalize(PartialPlacement &p_placement) {
     arch_model.export_node_locations(p_placement, netlist);
 }
 
-void FullLegalizer::legalize(PartialPlacement& p_placement) {
-    (void)p_placement;
-    VTR_LOG("Running Full Legalizer\n");
-    VTR_ASSERT(false && "Full legalizer not implemented yet.");
-}
-

vpr/src/place/analytical_placement/PlacementLegalizer.h

@@ -5,11 +5,6 @@
 
 class APNetlist;
 
-// TODO: Split this into two classes: PartialLegalizer and FullLegalizer
-//       Partial legalizer takes a partial placement and returns a partial
-//       placement.
-//       Full legalizer takes a partial placement and returns a clustered
-//       placement which can be fed into the Simulated Annealer.
 class PlacementLegalizer {
 public:
     PlacementLegalizer(const APNetlist& inetlist) : netlist(inetlist) {}
@@ -25,9 +20,3 @@ class FlowBasedLegalizer : public PlacementLegalizer {
     void legalize(PartialPlacement &p_placement) final;
 };
 
-class FullLegalizer : public PlacementLegalizer {
-    using PlacementLegalizer::PlacementLegalizer;
-public:
-    void legalize(PartialPlacement &p_placement) final;
-};
-

vpr/src/place/analytical_placement/analytical_placement_flow.cpp

@@ -7,15 +7,17 @@
 #include "AnalyticalSolver.h"
 #include "PlacementLegalizer.h"
 #include "atom_netlist.h"
+#include "full_legalizer.h"
 #include "globals.h"
 #include "prepack.h"
 #include "read_atom_netlist.h"
 #include "user_place_constraints.h"
 #include "vpr_context.h"
+#include "vpr_types.h"
 #include "vtr_assert.h"
 #include "vtr_time.h"
 
-void run_analytical_placement_flow() {
+void run_analytical_placement_flow(t_vpr_setup& vpr_setup) {
     vtr::ScopedStartFinishTimer timer("Analytical Placement Flow");
 
     // The global state used/modified by this flow.
@@ -62,6 +64,17 @@ void run_analytical_placement_flow() {
     export_to_flat_placement_file(p_placement, ap_netlist, mutable_atom_ctx.nlist, "flat_placement_file.txt");
 
     // Run the full legalizer
-    FullLegalizer(ap_netlist).legalize(p_placement);
+    FullLegalizer full_legalizer(ap_netlist,
+                                 vpr_setup,
+                                 g_vpr_ctx.device().grid,
+                                 g_vpr_ctx.device().arch,
+                                 g_vpr_ctx.atom().nlist,
+                                 prepacker,
+                                 g_vpr_ctx.device().logical_block_types,
+                                 vpr_setup.PackerRRGraph,
+                                 g_vpr_ctx.device().arch->models,
+                                 g_vpr_ctx.device().arch->model_library,
+                                 vpr_setup.PackerOpts);
+    full_legalizer.legalize(p_placement);
 }
 

vpr/src/place/analytical_placement/analytical_placement_flow.h

@@ -1,6 +1,8 @@
 
 #pragma once
 
-void run_analytical_placement_flow();
+struct t_vpr_setup;
+
+void run_analytical_placement_flow(t_vpr_setup& vpr_setup);