remove the set_noc_link_bandwidth() call after generating the noc

Author: soheilshahrouz

vpr/src/base/setup_noc.cpp

@@ -51,8 +51,10 @@ void setup_noc(const t_arch& arch) {
     // generate noc model
     generate_noc(arch, noc_ctx, noc_router_tiles);
 
-    // store the general noc properties
-    noc_ctx.noc_model.set_noc_link_bandwidth(arch.noc->link_bandwidth);
+    /* store the general noc properties
+     * noc_ctx.noc_model.set_noc_link_bandwidth(...) is not called because all
+     * link bandwidths were set when create_noc_links(...) was called.
+     */
     noc_ctx.noc_model.set_noc_link_latency(arch.noc->link_latency);
     noc_ctx.noc_model.set_noc_router_latency(arch.noc->router_latency);
 
@@ -131,7 +133,6 @@ void create_noc_routers(const t_noc_inf& noc_info,
                         const std::vector<t_noc_router_tile_position>& noc_router_tiles) {
     // keep track of the shortest distance between a user described router (noc description in the arch file) and a physical router on the FPGA
     double shortest_distance;
-//    double curr_calculated_distance;
     // stores the index of a physical router within the noc_router_tiles that is closest to a given user described router
     int closest_physical_router;
 

vpr/src/base/setup_noc.h

@@ -100,7 +100,7 @@ void generate_noc(const t_arch& arch,
                   const std::vector<t_noc_router_tile_position>& list_of_noc_router_tiles);
 
 /**
- * @brief Go through the outers described by the user
+ * @brief Go through the routers described by the user
  *        in the architecture description file and assigns it a corresponding
  *        physical router tile in the FPGA. Each logical router has a grid
  *        location, so the closest physical router to the grid location is then

vpr/src/noc/noc_link.cpp

@@ -11,27 +11,25 @@ NocLink::NocLink(NocLinkId link_id, NocRouterId source, NocRouterId sink,
     , latency(lat) { }
 
 // getters
-NocRouterId NocLink::get_source_router(void) const {
+NocRouterId NocLink::get_source_router() const {
     return source_router;
 }
 
-NocRouterId NocLink::get_sink_router(void) const {
+NocRouterId NocLink::get_sink_router() const {
     return sink_router;
 }
 
-double NocLink::get_bandwidth_usage(void) const {
+double NocLink::get_bandwidth_usage() const {
     return bandwidth_usage;
 }
 
 //setters
 void NocLink::set_source_router(NocRouterId source) {
     source_router = source;
-    return;
 }
 
 void NocLink::set_sink_router(NocRouterId sink) {
     sink_router = sink;
-    return;
 }
 
 void NocLink::set_bandwidth_usage(double new_bandwidth_usage) {
@@ -40,7 +38,6 @@ void NocLink::set_bandwidth_usage(double new_bandwidth_usage) {
 
 void NocLink::set_bandwidth(double new_bandwidth) {
     bandwidth = new_bandwidth;
-    return;
 }
 
 double NocLink::get_bandwidth() const {

vpr/src/noc/noc_storage.cpp

@@ -128,7 +128,6 @@ void NocStorage::add_link(NocRouterId source, NocRouterId sink, double bandwidth
 }
 
 void NocStorage::set_noc_link_bandwidth(double link_bandwidth) {
-
     // Iterate over all links and set their bandwidth
     for (auto& link : link_storage) {
         link.set_bandwidth(link_bandwidth);

vpr/src/noc/noc_storage.h

@@ -379,7 +379,7 @@ class NocStorage {
     void add_link(NocRouterId source, NocRouterId sink, double bandwidth, double latency);
 
     /**
-     * @brief Set the maximum allowable bandwidth for a link
+     * @brief Set the maximum allowable bandwidth for all links
      * within the NoC
      */
     void set_noc_link_bandwidth(double link_bandwidth);

vpr/test/test_setup_noc.cpp

@@ -38,9 +38,6 @@ TEST_CASE("test_identify_and_store_noc_router_tile_positions", "[vpr_setup_noc]"
     router_tile.height = 2;
     router_tile.width = 2;
 
-    // name of the router physical tile
-    //std::string router_tile_name_string("router");
-
     // results from the test function
     std::vector<t_noc_router_tile_position> list_of_routers;
 
@@ -802,7 +799,7 @@ TEST_CASE("test_setup_noc", "[vpr_setup_noc]") {
     //assign the noc_info to the arch
     arch.noc = &noc_info;
 
-    // the architecture file has been setup to include the noc topology and we set the parameters below
+    // the architecture file has been setup to include the noc topology, and we set the parameters below
     noc_info.link_bandwidth = 67.8;
     noc_info.link_latency = 56.7;
     noc_info.router_latency = 2.3;