remove detailed_link_bandwidth_ and its getter

Author: soheilshahrouz

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -2545,7 +2545,7 @@ static void ProcessBlockTypeLocs(t_grid_def& grid_def,
             right_edge.y.start_expr = "0";
             right_edge.y.end_expr = "H - 1";
 
-            t_grid_loc_def bottom_edge(type_name, priority); //Exclucing corners
+            t_grid_loc_def bottom_edge(type_name, priority); //Excluding corners
             bottom_edge.x.start_expr = "1";
             bottom_edge.x.end_expr = "W - 2";
             bottom_edge.y.start_expr = "0";
@@ -3496,9 +3496,6 @@ static void ProcessSubTiles(pugi::xml_node Node,
     // used to assign indices to subtiles
     int subtile_index = 0;
 
-    // used to find duplicate port names
-    std::unordered_map<std::string, t_physical_tile_port> tile_port_names;
-
     CurSubTile = get_first_child(Node, "sub_tile", loc_data);
 
     while (CurSubTile) {

vpr/src/noc/bfs_routing.h

@@ -42,7 +42,7 @@ class BFSRouting : public NocRouting {
      * Identifies the ending point of the route within the NoC.This represents a 
      * physical router on the FPGA.
      * @param traffic_flow_id The unique ID for the traffic flow being routed.
-     * @param flow_route Stores the path returned by this fuction
+     * @param flow_route Stores the path returned by this function
      * as a series of NoC links found by 
      * a NoC routing algorithm between two routers in a traffic flow.
      * The function will clear any

vpr/src/noc/noc_storage.cpp

@@ -11,31 +11,31 @@ const std::vector<NocLinkId>& NocStorage::get_noc_router_connections(NocRouterId
     return router_link_list[id];
 }
 
-const vtr::vector<NocRouterId, NocRouter>& NocStorage::get_noc_routers(void) const {
+const vtr::vector<NocRouterId, NocRouter>& NocStorage::get_noc_routers() const {
     return router_storage;
 }
 
 int NocStorage::get_number_of_noc_routers(void) const {
     return router_storage.size();
 }
 
-const vtr::vector<NocLinkId, NocLink>& NocStorage::get_noc_links(void) const {
+const vtr::vector<NocLinkId, NocLink>& NocStorage::get_noc_links() const {
     return link_storage;
 }
 
-vtr::vector<NocLinkId, NocLink>& NocStorage::get_mutable_noc_links(void) {
+vtr::vector<NocLinkId, NocLink>& NocStorage::get_mutable_noc_links() {
     return link_storage;
 }
 
-int NocStorage::get_number_of_noc_links(void) const {
+int NocStorage::get_number_of_noc_links() const {
     return link_storage.size();
 }
 
-double NocStorage::get_noc_link_latency(void) const {
+double NocStorage::get_noc_link_latency() const {
     return noc_link_latency;
 }
 
-double NocStorage::get_noc_router_latency(void) const {
+double NocStorage::get_noc_router_latency() const {
     return noc_router_latency;
 }
 
@@ -47,10 +47,6 @@ bool NocStorage::get_detailed_link_latency() const {
     return detailed_link_latency_;
 }
 
-bool NocStorage::get_detailed_link_bandwidth() const {
-    return detailed_link_bandwidth_;
-}
-
 const NocRouter& NocStorage::get_single_noc_router(NocRouterId id) const {
     return router_storage[id];
 }
@@ -225,12 +221,6 @@ void NocStorage::finished_building_noc() {
                                                   return a.get_latency() != b.get_latency();
                                               });
     detailed_link_latency_ = (link_latency_it != link_storage.end());
-
-    auto link_bandwidth_it = std::adjacent_find(link_storage.begin(), link_storage.end(),
-                                                [](const NocLink& a, const NocLink& b) {
-                                                    return a.get_bandwidth() != b.get_bandwidth();
-                                                });
-    detailed_link_bandwidth_ = (link_bandwidth_it != link_storage.end());
 }
 
 void NocStorage::clear_noc() {
@@ -252,7 +242,7 @@ NocRouterId NocStorage::convert_router_id(int id) const {
     return result->second;
 }
 
-void NocStorage::make_room_for_noc_router_link_list(void) {
+void NocStorage::make_room_for_noc_router_link_list() {
     VTR_ASSERT_MSG(!built_noc, "NoC already built, cannot modify further.");
     router_link_list.resize(router_storage.size());
 }

vpr/src/noc/noc_storage.h

@@ -142,13 +142,6 @@ class NocStorage {
      */
     bool detailed_link_latency_;
 
-    /**
-     * @brief When set true, specifies that some NoC links have different
-     * bandwidth than others. When set false, all the NoC link have the same
-     * bandwidth.
-     */
-    bool detailed_link_bandwidth_;
-
     /**
      * @brief A constant reference to this vector is returned by get_noc_links(...).
      * This is used to avoid memory allocation whenever get_noc_links(...) is called.
@@ -200,13 +193,13 @@ class NocStorage {
      * 
      * @return A vector of routers.
      */
-    const vtr::vector<NocRouterId, NocRouter>& get_noc_routers(void) const;
+    const vtr::vector<NocRouterId, NocRouter>& get_noc_routers() const;
 
     /**
      * @return An integer representing the total number of routers within the
      * NoC.
      */
-    int get_number_of_noc_routers(void) const;
+    int get_number_of_noc_routers() const;
 
     /**
      * @brief Get all the links in the NoC. The links themselves cannot
@@ -215,7 +208,7 @@ class NocStorage {
      * 
      * @return A vector of links. 
      */
-    const vtr::vector<NocLinkId, NocLink>& get_noc_links(void) const;
+    const vtr::vector<NocLinkId, NocLink>& get_noc_links() const;
 
     /**
      * @brief Get all the links in the NoC. The links themselves can
@@ -368,7 +361,7 @@ class NocStorage {
      * tile that this router represents.
      */
     void add_router(int id,
-                    int grid_position_x, int grid_position_y, int layer_poisition,
+                    int grid_position_x, int grid_position_y, int layer_position,
                     double latency);
 
     /**
@@ -477,7 +470,7 @@ class NocStorage {
      * number of routers in the NoC. 
      * 
      */
-    void make_room_for_noc_router_link_list(void);
+    void make_room_for_noc_router_link_list();
 
     /**
      * @brief Two links are considered parallel when the source router of one

vpr/src/place/noc_place_utils.h

@@ -173,7 +173,10 @@ std::vector<NocLinkId>& route_traffic_flow(NocTrafficFlowId traffic_flow_id,
  * @param traffic_flow_bandwidth The bandwidth of a traffic flow. This will
  * be used to update bandwidth usage of the links.
  */
-void update_traffic_flow_link_usage(const std::vector<NocLinkId>& traffic_flow_route, NocStorage& noc_model, int inc_or_dec, double traffic_flow_bandwidth);
+void update_traffic_flow_link_usage(const std::vector<NocLinkId>& traffic_flow_route,
+                                    NocStorage& noc_model,
+                                    int inc_or_dec,
+                                    double traffic_flow_bandwidth);
 
 /**
  * @brief Goes through all the traffic flows associated to a moved
@@ -355,7 +358,8 @@ int check_noc_placement_costs(const t_placer_costs& costs, double error_toleranc
  * its priority.
  * @return The computed aggregate bandwidth for the provided traffic flow
  */
-double calculate_traffic_flow_aggregate_bandwidth_cost(const std::vector<NocLinkId>& traffic_flow_route, const t_noc_traffic_flow& traffic_flow_info);
+double calculate_traffic_flow_aggregate_bandwidth_cost(const std::vector<NocLinkId>& traffic_flow_route,
+                                                       const t_noc_traffic_flow& traffic_flow_info);
 
 /**
  * @brief Determines the latency cost of a routed traffic flow.