Merge pull request #787 from os-fpga/merge_patched_vpr_context

merge patched vpr_context.h, vpr_types.h

Author: serge-dsa

include/base_fix/PATCHED/vpr_context.h

@@ -356,7 +356,7 @@ struct ClusteringHelperContext : public Context {
     t_ext_pin_util_targets target_external_pin_util;
 
     // During clustering, a block is related to un-clustered primitives with nets.
-    // This relation has three types: low fanout, high fanout, and trasitive
+    // This relation has three types: low fanout, high fanout, and transitive
     // high_fanout_thresholds stores the threshold for nets to a block type to be considered high fanout
     t_pack_high_fanout_thresholds high_fanout_thresholds;
 
@@ -403,6 +403,12 @@ struct PlacementContext : public Context {
     ///@brief The pl_macros array stores all the placement macros (usually carry chains).
     std::vector<t_pl_macro> pl_macros;
 
+    ///@brief Stores ClusterBlockId of all movable clustered blocks (blocks that are not locked down to a single location)
+    std::vector<ClusterBlockId> movable_blocks;
+
+    ///@brief Stores ClusterBlockId of all movable clustered of each block type
+    std::vector<std::vector<ClusterBlockId>> movable_blocks_per_type;
+
     /**
      * @brief Compressed grid space for each block type
      *
@@ -528,6 +534,17 @@ struct FloorplanningContext : public Context {
      */
     vtr::vector<ClusterBlockId, PartitionRegion> cluster_constraints;
 
+    /**
+     * @brief Floorplanning constraints in the compressed grid coordinate system.
+     *
+     * Each clustered block has a logical type with a corresponding compressed grid.
+     * Compressed floorplanning constraints are calculated by translating the grid locations
+     * of floorplanning regions to compressed grid locations. To ensure regions do not enlarge:
+     * - The bottom left corner is rounded up to the nearest compressed location.
+     * - The top right corner is rounded down to the nearest compressed location.
+     */
+    vtr::vector<ClusterBlockId, PartitionRegion> compressed_cluster_constraints;
+
     std::vector<Region> overfull_regions;
 };
 

include/base_fix/PATCHED/vpr_types.h

@@ -1583,6 +1583,7 @@ struct t_det_routing_arch {
 
     /* Xifan Tang: tileable routing */
     bool tileable;
+    bool perimeter_cb;
     bool shrink_boundary;
     bool through_channel;
     bool opin2all_sides;