Merge branch 'master' into temp_chanx_place_cost_fac

Author: soheilshahrouz

libs/librrgraph/src/base/rr_graph_utils.cpp

@@ -139,7 +139,8 @@ vtr::vector<RRNodeId, std::vector<RREdgeId>> get_fan_in_list(const RRGraphView&
 
     //Walk the graph and increment fanin on all dwnstream nodes
     rr_graph.rr_nodes().for_each_edge(
-        [&](RREdgeId edge, __attribute__((unused)) RRNodeId src, RRNodeId sink) {
+        [&](RREdgeId edge, RRNodeId src, RRNodeId sink) -> void {
+            (void) src;
             node_fan_in_list[sink].push_back(edge);
         });
 
@@ -258,4 +259,4 @@ bool inter_layer_connections_limited_to_opin(const RRGraphView& rr_graph) {
     }
 
     return limited_to_opin;
-}
+}

libs/librrgraph/src/io/gen/rr_graph_uxsdcxx.h

@@ -202,10 +202,15 @@ inline void write_rr_graph_xml(T &in, Context &context, std::ostream &os){
 }
 
 
+#if defined(_MSC_VER)
+typedef const uint32_t __declspec(align(1)) triehash_uu32;
+typedef const uint64_t __declspec(align(1)) triehash_uu64;
+#else
 typedef const uint32_t __attribute__((aligned(1))) triehash_uu32;
 typedef const uint64_t __attribute__((aligned(1))) triehash_uu64;
 static_assert(alignof(triehash_uu32) == 1, "Unaligned 32-bit access not found.");
 static_assert(alignof(triehash_uu64) == 1, "Unaligned 64-bit access not found.");
+#endif
 #if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__
 #define onechar(c, s, l) (((uint64_t)(c)) << (s))
 #else

vpr/src/analytical_place/analytical_placement_flow.cpp

@@ -8,19 +8,21 @@
 #include "analytical_placement_flow.h"
 #include "ap_netlist.h"
 #include "atom_netlist.h"
+#include "full_legalizer.h"
 #include "gen_ap_netlist_from_atoms.h"
 #include "globals.h"
+#include "partial_placement.h"
 #include "prepack.h"
 #include "user_place_constraints.h"
 #include "vpr_context.h"
-#include "vpr_error.h"
 #include "vpr_types.h"
+#include "vtr_assert.h"
 #include "vtr_time.h"
 
 void run_analytical_placement_flow(t_vpr_setup& vpr_setup) {
     (void)vpr_setup;
     // Start an overall timer for the Analytical Placement flow.
-    vtr::ScopedStartFinishTimer timer("Analytical Placement Flow");
+    vtr::ScopedStartFinishTimer timer("Analytical Placement");
 
     // The global state used/modified by this flow.
     const AtomNetlist& atom_nlist = g_vpr_ctx.atom().nlist;
@@ -37,9 +39,38 @@ void run_analytical_placement_flow(t_vpr_setup& vpr_setup) {
                                                      prepacker,
                                                      constraints);
 
-    // AP is currently under-construction. Fail gracefully just in case this
-    // is somehow being called.
-    VPR_FATAL_ERROR(VPR_ERROR_AP,
-                    "Analytical Placement flow not implemented yet");
+    // Run the Global Placer
+    //  For now, just put all the moveable blocks at the center of the device
+    //  grid. This will be replaced later. This is just for testing.
+    PartialPlacement p_placement(ap_netlist);
+    const size_t device_width = device_ctx.grid.width();
+    const size_t device_height = device_ctx.grid.height();
+    double device_center_x = static_cast<double>(device_width) / 2.0;
+    double device_center_y = static_cast<double>(device_height) / 2.0;
+    for (APBlockId ap_blk_id : ap_netlist.blocks()) {
+        if (ap_netlist.block_mobility(ap_blk_id) != APBlockMobility::MOVEABLE)
+            continue;
+        // If the APBlock is moveable, put it on the center for the device.
+        p_placement.block_x_locs[ap_blk_id] = device_center_x;
+        p_placement.block_y_locs[ap_blk_id] = device_center_y;
+    }
+    VTR_ASSERT(p_placement.verify(ap_netlist,
+                                  device_width,
+                                  device_height,
+                                  device_ctx.grid.get_num_layers()));
+
+    // Run the Full Legalizer.
+    FullLegalizer full_legalizer(ap_netlist,
+                                 vpr_setup,
+                                 device_ctx.grid,
+                                 device_ctx.arch,
+                                 atom_nlist,
+                                 prepacker,
+                                 device_ctx.logical_block_types,
+                                 vpr_setup.PackerRRGraph,
+                                 device_ctx.arch->models,
+                                 device_ctx.arch->model_library,
+                                 vpr_setup.PackerOpts);
+    full_legalizer.legalize(p_placement);
 }