set per link and per router latency and bandwidth in noc setup

Author: soheilshahrouz

libs/libarchfpga/src/read_xml_arch_file_noc_tag.cpp

@@ -618,5 +618,4 @@ static void process_noc_overrides(pugi::xml_node noc_overrides_tag,
             bad_tag(override_tag, loc_data, noc_overrides_tag, {"router", "link"});
         }
     }
-
 }

vpr/src/base/setup_noc.cpp

@@ -16,36 +16,26 @@
  * 
  * Router Creation
  * ---------------
- * Each router described in the archietcture file is created and
+ * Each router described in the architecture file is created and
  * added to the NoC. Since the routers represents physical tiles on
  * the FPGA, when the router is created, it is also assigned to a
  * corresponding physical router tile. 
  * 
  * Link Creation
  * -------------
- * The user describes a "connection list", which rerpesents an intended
+ * The user describes a "connection list", which represents an intended
  * connection between two routers in the NoC. Each link connects two
  * routers together. For each router, a number
  * of Links are created to connect it to another router in its "connection
  * list".
  * 
  */
 
-#include <iostream>
-#include <string>
+#include <string_view>
 #include <vector>
 
-#include "physical_types.h"
 #include "device_grid.h"
-#include "globals.h"
-#include "noc_storage.h"
-#include "vpr_error.h"
-
-// a default condition that helps keep track of whether a physical router has been assigned to a logical router or not
-#define PHYSICAL_ROUTER_NOT_ASSIGNED -1
-
-// a deafult index used for initiailization purposes. No router will have a negative index
-#define INVALID_PHYSICAL_ROUTER_INDEX -1
+#include "vpr_context.h"
 
 // a data structure to store the position information of a noc router in the FPGA device
 struct t_noc_router_tile_position {
@@ -83,13 +73,14 @@ void setup_noc(const t_arch& arch);
  *        stored in a list.
  * 
  * @param device_grid The FPGA device description.
- * @param list_of_noc_router_tiles Stores the grid position information
- *                                 for all NoC router tiles in the FPGA.
  * @param noc_router_tile_name The name used when describing the NoC router
  *                             tile in the FPGA architecture description
  *                             file.
+ *
+ * @return The grid position information for all NoC router tiles in the FPGA.
  */
-void identify_and_store_noc_router_tile_positions(const DeviceGrid& device_grid, std::vector<t_noc_router_tile_position>& list_of_noc_router_tiles, std::string noc_router_tile_name);
+std::vector<t_noc_router_tile_position> identify_and_store_noc_router_tile_positions(const DeviceGrid& device_grid,
+                                                                                     std::string_view noc_router_tile_name);
 
 /**
  * @brief Creates NoC routers and adds them to the NoC model based
@@ -104,7 +95,9 @@ void identify_and_store_noc_router_tile_positions(const DeviceGrid& device_grid,
  * @param list_of_noc_router_tiles Stores the grid position information
  *                                 for all NoC router tiles in the FPGA.
  */
-void generate_noc(const t_arch& arch, NocContext& noc_ctx, std::vector<t_noc_router_tile_position>& list_of_noc_router_tiles);
+void generate_noc(const t_arch& arch,
+                  NocContext& noc_ctx,
+                  const std::vector<t_noc_router_tile_position>& list_of_noc_router_tiles);
 
 /**
  * @brief Go through the outers described by the user
@@ -121,7 +114,9 @@ void generate_noc(const t_arch& arch, NocContext& noc_ctx, std::vector<t_noc_rou
  * @param list_of_noc_router_tiles Stores the grid position information
  *                                 for all NoC router tiles in the FPGA.
  */
-void create_noc_routers(const t_noc_inf& noc_info, NocStorage* noc_model, std::vector<t_noc_router_tile_position>& list_of_noc_router_tiles);
+void create_noc_routers(const t_noc_inf& noc_info,
+                        NocStorage* noc_model,
+                        const std::vector<t_noc_router_tile_position>& list_of_noc_router_tiles);
 
 /**
  * @brief Goes through the topology information as described in the FPGA
@@ -134,6 +129,6 @@ void create_noc_routers(const t_noc_inf& noc_info, NocStorage* noc_model, std::v
  * @param noc_model An internal model that describes the NoC. Contains a list of
  *                  routers and links that connect the routers together.
  */
-void create_noc_links(const t_noc_inf* noc_info, NocStorage* noc_model);
+void create_noc_links(const t_noc_inf& noc_info, NocStorage* noc_model);
 
 #endif

vpr/src/base/setup_noc.h

@@ -1,12 +1,14 @@
 #include "noc_link.h"
 
 // constructor
-NocLink::NocLink(NocLinkId link_id, NocRouterId source, NocRouterId sink, double bw)
+NocLink::NocLink(NocLinkId link_id, NocRouterId source, NocRouterId sink,
+                 double bw, double lat)
     : id(link_id)
     , source_router(source)
     , sink_router(sink)
     , bandwidth_usage(0.0)
-    , bandwidth(bw) { }
+    , bandwidth(bw)
+    , latency(lat) { }
 
 // getters
 NocRouterId NocLink::get_source_router(void) const {

vpr/src/noc/noc_link.cpp

@@ -51,9 +51,11 @@ class NocLink {
 
     double bandwidth_usage; /*!< Represents the bandwidth of the data being transmitted on the link. Units in bits-per-second(bps)*/
     double bandwidth; /*!< Represents the maximum bits per second that can be transmitted over the link without causing congestion*/
+    double latency;
 
   public:
-    NocLink(NocLinkId link_id, NocRouterId source_router, NocRouterId sink_router, double bw);
+    NocLink(NocLinkId link_id, NocRouterId source_router, NocRouterId sink_router,
+            double bw, double lat);
 
     // getters
 

vpr/src/noc/noc_link.h

@@ -1,11 +1,14 @@
 #include "noc_router.h"
 
 // constructor
-NocRouter::NocRouter(int id, int grid_position_x, int grid_position_y, int layer_position)
+NocRouter::NocRouter(int id,
+                     int grid_position_x, int grid_position_y, int layer_position,
+                     double latency)
     : router_user_id(id)
     , router_grid_position_x(grid_position_x)
     , router_grid_position_y(grid_position_y)
-    , router_layer_position(layer_position) {
+    , router_layer_position(layer_position)
+    , router_latency(latency){
     // initialize variables
     router_block_ref = ClusterBlockId(0);
 }
@@ -43,5 +46,4 @@ ClusterBlockId NocRouter::get_router_block_ref(void) const {
 // setters
 void NocRouter::set_router_block_ref(ClusterBlockId router_block_ref_id) {
     router_block_ref = router_block_ref_id;
-    return;
 }

vpr/src/noc/noc_router.cpp

@@ -53,12 +53,16 @@ class NocRouter {
      * that the physical router is located*/
     int router_layer_position;
 
+    double router_latency;
+
     /** A unique identifier that represents a router block in the 
      * clustered netlist that is placed on the physical router*/
     ClusterBlockId router_block_ref;
 
   public:
-    NocRouter(int id, int grid_position_x, int grid_position_y, int layer_position);
+    NocRouter(int id,
+              int grid_position_x, int grid_position_y, int layer_position,
+              double latency);
 
     // getters
 

vpr/src/noc/noc_router.h

@@ -89,10 +89,12 @@ NocRouterId NocStorage::get_router_at_grid_location(const t_pl_loc& hard_router_
 
 // setters for the NoC
 
-void NocStorage::add_router(int id, int grid_position_x, int grid_posistion_y, int layer_position) {
+void NocStorage::add_router(int id,
+                            int grid_position_x, int grid_posistion_y, int layer_position,
+                            double latency) {
     VTR_ASSERT_MSG(!built_noc, "NoC already built, cannot modify further.");
 
-    router_storage.emplace_back(id, grid_position_x, grid_posistion_y, layer_position);
+    router_storage.emplace_back(id, grid_position_x, grid_posistion_y, layer_position, latency);
 
     /* Get the corresponding NocRouterId for the newly added router and
      * add it to the conversion table.
@@ -107,23 +109,18 @@ void NocStorage::add_router(int id, int grid_position_x, int grid_posistion_y, i
     // get the key to identify the current router
     int router_key = generate_router_key_from_grid_location(grid_position_x, grid_posistion_y, layer_position);
     grid_location_to_router_id.insert(std::pair<int, NocRouterId>(router_key, converted_id));
-
-    return;
 }
 
-void NocStorage::add_link(NocRouterId source, NocRouterId sink) {
+void NocStorage::add_link(NocRouterId source, NocRouterId sink, double bandwidth, double latency) {
     VTR_ASSERT_MSG(!built_noc, "NoC already built, cannot modify further.");
 
     // the new link will be added to the back of the list,
     // so we can use the total number of links added so far as id
     NocLinkId added_link_id((int)link_storage.size());
 
-    double link_bandwidth = get_noc_link_bandwidth();
-    link_storage.emplace_back(added_link_id, source, sink, link_bandwidth);
+    link_storage.emplace_back(added_link_id, source, sink, bandwidth, latency);
 
     router_link_list[source].push_back(added_link_id);
-
-    return;
 }
 
 void NocStorage::set_noc_link_bandwidth(double link_bandwidth) {

vpr/src/noc/noc_storage.cpp

@@ -322,7 +322,9 @@ class NocStorage {
      * @param grid_position_y The vertical position on the FPGA of the physical
      * tile that this router represents.
      */
-    void add_router(int id, int grid_position_x, int grid_position_y, int layer_poisition);
+    void add_router(int id,
+                    int grid_position_x, int grid_position_y, int layer_poisition,
+                    double latency);
 
     /**
      * @brief Creates a new link and adds it to the NoC. The newly created
@@ -336,7 +338,7 @@ class NocStorage {
      * @param sink A unique identifier for the router that the new link enters
      * into (incoming to the router) 
      */
-    void add_link(NocRouterId source, NocRouterId sink);
+    void add_link(NocRouterId source, NocRouterId sink, double bandwidth, double latency);
 
     /**
      * @brief Set the maximum allowable bandwidth for a link