added another attribute of the noc, which is the name used to describe router tiles. Then updated setup_noc to use the new value.

Author: Srivat97

libs/libarchfpga/src/physical_types.h

@@ -1751,6 +1751,8 @@ struct t_noc_inf {
     int router_latency; // in nanoseconds
 
     std::vector<t_router> router_list;
+
+    std::string noc_router_tile_name;
 };
 
 /*   Detailed routing architecture */

libs/libarchfpga/src/read_xml_arch_file.cpp

@@ -4646,7 +4646,7 @@ static void ProcessClocks(pugi::xml_node Parent, t_clock_arch* clocks, const pug
 static void ProcessNoc(pugi::xml_node noc_tag, t_arch* arch, const pugiutil::loc_data& loc_data)
 {
     // a vector representing all the possible attributes within the noc tag
-    std::vector<std::string> expected_noc_attributes = {"link_bandwidth", "link_latency", "router_latency"};
+    std::vector<std::string> expected_noc_attributes = {"link_bandwidth", "link_latency", "router_latency", "noc_router_tile_name"};
 
     std::vector<std::string> expected_noc_children_tags = {"mesh","topology"};
 
@@ -4656,6 +4656,9 @@ static void ProcessNoc(pugi::xml_node noc_tag, t_arch* arch, const pugiutil::loc
     // identifier that lets us know when we could not properly convert an attribute value to a integer
     int attribute_conversion_failure = -1;
 
+    // identifier that lets us know when we could not properly convert a string conversion value
+    std::string attribute_conversion_failure_string = "";
+
     // if we are here, then the user has a NoC in their architecture, so need to add it
     arch->noc = new t_noc_inf;
     t_noc_inf* noc_ref = arch->noc;
@@ -4672,13 +4675,22 @@ static void ProcessNoc(pugi::xml_node noc_tag, t_arch* arch, const pugiutil::loc
 
     noc_ref->router_latency = pugiutil::get_attribute(noc_tag, "router_latency", loc_data, pugiutil::REQUIRED).as_int(attribute_conversion_failure);
 
+    noc_ref->noc_router_tile_name = pugiutil::get_attribute(noc_tag, "noc_router_tile_name", loc_data, pugiutil::REQUIRED).as_string();
+
     // the noc parameters can only be non-zero positive values
     if ((noc_ref->link_bandwidth < 0) || (noc_ref->link_latency < 0) || (noc_ref->router_latency < 0))
     {
         archfpga_throw(loc_data.filename_c_str(), loc_data.line(noc_tag),
                                "The link bandwidth, link latency and router latency for the NoC must be a positive non-zero integer.");
     }
 
+    // check that the router tile name was supplied properly
+    if (!(noc_ref->noc_router_tile_name.compare(attribute_conversion_failure_string)))
+    {
+        archfpga_throw(loc_data.filename_c_str(), loc_data.line(noc_tag),
+                               "The noc router tile name must be a string.");
+    }
+
     /* We processed the NoC node, so now process the topology*/
 
     // make sure that only the topology tag is found under NoC

vpr/src/base/setup_noc.cpp

@@ -9,7 +9,7 @@
 #include "vtr_math.h"
 
 
-void setup_noc(const t_arch& arch, std::string noc_router_tile_name)
+void setup_noc(const t_arch& arch)
 {
 
     // variable to store all the noc router tiles within the FPGA device
@@ -21,7 +21,7 @@ void setup_noc(const t_arch& arch, std::string noc_router_tile_name)
 
     // go through the FPGA grid and find the noc router tiles
     // then store the position 
-    identify_and_store_noc_router_tile_positions(device_ctx.grid,list_of_noc_router_tiles, noc_router_tile_name);
+    identify_and_store_noc_router_tile_positions(device_ctx.grid,list_of_noc_router_tiles, arch.noc->noc_router_tile_name);
 
     // check whether the noc topology information provided uses more than the number of available routers in the FPGA
     if (list_of_noc_router_tiles.size() < arch.noc->router_list.size())

vpr/src/base/setup_noc.h

@@ -29,7 +29,7 @@ struct t_noc_router_tile_position {
 };
 
 
-void setup_noc(const t_arch& arch, std::string noc_router_tile_name);
+void setup_noc(const t_arch& arch);
 
 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);