Merge remote-tracking branch 'origin/master' into temp_opin_chanz

Author: soheilshahrouz

libs/libarchfpga/src/grid_types.h

@@ -8,7 +8,7 @@
 #include <string>
 #include <memory>
 
-// Forward declerations
+// Forward declarations
 
 struct t_metadata_dict;
 
@@ -112,7 +112,6 @@ struct t_grid_loc_def {
      * @brief When 1 metadata tag is split among multiple t_grid_loc_def, one
      * t_grid_loc_def is arbitrarily chosen to own the metadata, and the other
      * t_grid_loc_def point to the owned version.
-     * 
      */
     std::unique_ptr<t_metadata_dict> owned_meta;
 
@@ -125,7 +124,7 @@ struct t_grid_loc_def {
 };
 
 /**
- * @brief Enum for specfying if the architecture grid specification is for an auto sized device (variable size)
+ * @brief Enum for specifying if the architecture grid specification is for an auto sized device (variable size)
  * or a fixed size device.
  */
 enum class e_grid_def_type {

libs/libarchfpga/src/physical_types.cpp

@@ -2,6 +2,7 @@
 #include "arch_types.h"
 #include "vtr_math.h"
 #include "vtr_util.h"
+#include "vtr_assert.h"
 
 #include "arch_util.h"
 
@@ -408,3 +409,13 @@ const t_physical_tile_port* t_sub_tile::get_port_by_pin(int pin) const {
 
     return nullptr;
 }
+
+const t_grid_def& t_arch::grid_layout() const {
+    for (const t_grid_def& layout : grid_layouts) {
+        if (layout.name == device_layout) {
+            return layout;
+        }
+    }
+    VTR_ASSERT_SAFE_MSG(false, "Device layout not found.");
+    return grid_layouts.front(); // unreachable, keeps compiler happy
+}

libs/libarchfpga/src/physical_types.h

@@ -2055,7 +2055,11 @@ struct t_arch {
     // The name of the switch used for the input connection block (i.e. to connect routing tracks to block pins).
     std::string ipin_cblock_switch_name;
 
-    std::vector<t_grid_def> grid_layouts; //Set of potential device layouts
+    /// Set of potential device layouts
+    std::vector<t_grid_def> grid_layouts;
+
+    /// @brief Returns the grid layout specified by the --device command-line option.
+    const t_grid_def& grid_layout() const;
 
     // the layout that is chosen to be used with command line options
     // It is used to generate custom SB for a specific locations within the device

libs/libarchfpga/src/scatter_gather_types.h

@@ -14,17 +14,20 @@ enum class e_scatter_gather_type {
 };
 
 /**
- * @brief Struct containing information of an <sg_location> tag. An <sg_location> tag instantiates the scatter-gather pattern in some switchblock locations around the device.
+ * @brief Struct containing information of an <sg_location> tag.
+ * An <sg_location> tag instantiates the scatter-gather pattern in some switchblock locations within the device.
+ * `region` is only valid if type == e_sb_location::E_XY_SPECIFIED.
  */
 struct t_sg_location {
     e_sb_location type;       ///< Type of locations that the pattern is instantiated at.
+    t_specified_loc region;   ///< Specification of the region where gather is applied
     int num;                  ///< Number of scatter-gather pattern instantiations per location.
     std::string sg_link_name; ///< Name of scatter-gather link to be used.
 };
 
 /**
- * @brief Struct containing information of a <sg_link> tag. This tag describes how and where the scatter (fanout) happens relative to the gather (fanin).
- * 
+ * @brief Struct containing information of a <sg_link> tag.
+ * This tag describes how and where the scatter (fanout) happens relative to the gather (fanin).
  */
 struct t_sg_link {
     std::string name;     ///< Name of the sg_link.

libs/libarchfpga/src/switchblock_types.h

@@ -81,9 +81,7 @@ inline const std::unordered_map<std::string, e_sb_location> SB_LOCATION_STRING_M
                                                                                       {"FRINGE", e_sb_location::E_FRINGE},
                                                                                       {"XY_SPECIFIED", e_sb_location::E_XY_SPECIFIED}};
 
-/**
- * @brief Describes regions that a specific switch block specifications should be applied to
- */
+/// @brief Describes regions that a specific switch block specifications should be applied to
 struct t_sb_loc_spec {
     int start = -1;
     int repeat = -1;
@@ -97,8 +95,8 @@ struct t_sb_loc_spec {
 class SBSideConnection {
   public:
     // Specify the two SB sides that form a connection
-    enum e_side from_side = TOP;
-    enum e_side to_side = TOP;
+    e_side from_side = TOP;
+    e_side to_side = TOP;
 
     void set_sides(enum e_side from, enum e_side to) {
         from_side = from;

libs/librrgraph/src/base/check_rr_graph.cpp

@@ -556,7 +556,7 @@ void check_rr_node(const RRGraphView& rr_graph,
     float C = rr_graph.node_C(rr_node);
     float R = rr_graph.node_R(rr_node);
 
-    if (rr_type == e_rr_type::CHANX || rr_type == e_rr_type::CHANY) {
+    if (rr_type == e_rr_type::CHANX || rr_type == e_rr_type::CHANY || rr_type == e_rr_type::CHANZ) {
         if (C < 0. || R < 0.) {
             VPR_ERROR(VPR_ERROR_ROUTE,
                       "in check_rr_node: node %d of type %d has R = %g and C = %g.\n", inode, rr_type, R, C);

libs/librrgraph/src/base/rr_graph_storage.h

@@ -835,7 +835,7 @@ class t_rr_graph_storage {
         vtr::StrongIdRange<RREdgeId> edge_range(RREdgeId(0), RREdgeId(num_edges));
         std::vector<RREdgeId> edge_indices(edge_range.begin(), edge_range.end());
 
-        std::ranges::stable_sort(edge_indices, comparison_function);
+        std::stable_sort(edge_indices.begin(), edge_indices.end(), comparison_function);
 
         // Generic lambda that allocates a 'vec'-sized new vector with all elements set to default value,
         // then builds the new vector to have rearranged elements from 'vec' and finaly move the new vector

libs/librrgraph/src/base/rr_rc_data.cpp

@@ -4,24 +4,24 @@ t_rr_rc_data::t_rr_rc_data(float Rval, float Cval) noexcept
     : R(Rval)
     , C(Cval) {}
 
-short find_create_rr_rc_data(const float R, const float C, std::vector<t_rr_rc_data>& rr_rc_data) {
+NodeRCIndex find_create_rr_rc_data(const float R, const float C, std::vector<t_rr_rc_data>& rr_rc_data) {
 
     auto match = [&](const t_rr_rc_data& val) {
         return val.R == R
                && val.C == C;
     };
 
-    //Just a linear search for now
+    // Just a linear search for now
     auto itr = std::find_if(rr_rc_data.begin(),
                             rr_rc_data.end(),
                             match);
 
     if (itr == rr_rc_data.end()) {
-        //Not found -> create it
+        // Not found -> create it
         rr_rc_data.emplace_back(R, C);
 
-        itr = --rr_rc_data.end(); //Iterator to inserted value
+        itr = --rr_rc_data.end(); // Iterator to inserted value
     }
 
-    return std::distance(rr_rc_data.begin(), itr);
+    return NodeRCIndex(std::distance(rr_rc_data.begin(), itr));
 }

libs/librrgraph/src/base/rr_rc_data.h

@@ -10,4 +10,4 @@
  *
  * The returned indicies index into DeviceContext.rr_rc_data.
  */
-short find_create_rr_rc_data(const float R, const float C, std::vector<t_rr_rc_data>& rr_rc_data);
+NodeRCIndex find_create_rr_rc_data(const float R, const float C, std::vector<t_rr_rc_data>& rr_rc_data);

libs/librrgraph/src/io/rr_graph_uxsdcxx_serializer.h

@@ -804,7 +804,8 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
     inline int init_node_timing(int& inode, float C, float R) final {
         auto node = (*rr_nodes_)[inode];
         RRNodeId node_id = node.id();
-        rr_graph_builder_->set_node_rc_index(node_id, NodeRCIndex(find_create_rr_rc_data(R, C, *rr_rc_data_)));
+        const NodeRCIndex rc_index = find_create_rr_rc_data(R, C, *rr_rc_data_);
+        rr_graph_builder_->set_node_rc_index(node_id, rc_index);
         return inode;
     }
     inline void finish_node_timing(int& /*inode*/) final {}
@@ -932,7 +933,7 @@ class RrGraphSerializer final : public uxsd::RrGraphBase<RrGraphContextTypes> {
                     type);
         }
 
-        rr_graph_builder_->set_node_rc_index(node_id, NodeRCIndex(find_create_rr_rc_data(0, 0, *rr_rc_data_)));
+        rr_graph_builder_->set_node_rc_index(node_id, find_create_rr_rc_data(0, 0, *rr_rc_data_));
 
         return id;
     }