fix compilation errors in test_read_xml_arch_file.cpp

Author: soheilshahrouz

libs/libarchfpga/src/read_xml_arch_file_noc_tag.cpp

@@ -7,28 +7,6 @@
 #include "vtr_log.h"
 #include "arch_error.h"
 
-/**
- * @brief Describes a mesh topology as specified in the architecture file.
- *        It is assumed that NoC routers are equally distanced in each axis.
- */
-struct t_mesh_region {
-    /// The location the bottom left NoC router on the X-axis.
-    float start_x;
-    /// The location the top right NoC router on the X-axis.
-    float end_x;
-    /// The location the bottom left NoC router on the Y-axis.
-    float start_y;
-    /// The location the top right NoC router on the Y-axis.
-    float end_y;
-    /// The layer from which the mesh start.
-    int start_layer;
-    /// The layer at which the mesh ends.
-    int end_layer;
-    /// The number of NoC routers in each row or column.
-    int mesh_size;
-};
-
-
 /**
  * @brief Process the <topology> tag under <noc> tag.
  *

libs/libarchfpga/src/read_xml_arch_file_noc_tag.h

@@ -17,4 +17,25 @@ void process_noc_tag(pugi::xml_node noc_tag,
                      t_arch* arch,
                      const pugiutil::loc_data& loc_data);
 
+/**
+ * @brief Describes a mesh topology as specified in the architecture file.
+ *        It is assumed that NoC routers are equally distanced in each axis.
+ */
+struct t_mesh_region {
+    /// The location the bottom left NoC router on the X-axis.
+    float start_x;
+    /// The location the top right NoC router on the X-axis.
+    float end_x;
+    /// The location the bottom left NoC router on the Y-axis.
+    float start_y;
+    /// The location the top right NoC router on the Y-axis.
+    float end_y;
+    /// The layer from which the mesh start.
+    int start_layer;
+    /// The layer at which the mesh ends.
+    int end_layer;
+    /// The number of NoC routers in each row or column.
+    int mesh_size;
+};
+
 #endif //VTR_READ_XML_ARCH_FILE_NOC_TAG_H

libs/libarchfpga/test/test_read_xml_arch_file.cpp

@@ -148,31 +148,33 @@ TEST_CASE("Verifying mesh topology creation", "[NoC Arch Tests]") {
     t_noc_inf test_noc;
 
     // mesh parameters
-    float mesh_start_x = 10;
-    float mesh_start_y = 10;
-    float mesh_end_x = 5;
-    float mesh_end_y = 56;
-    float mesh_size = 0;
-    int mesh_start_layer = 0;
-    int mesh_end_layer = 0;
+    t_mesh_region mesh_region{
+        .start_x = 10.0f,
+        .end_x = 5.0f,
+        .start_y = 10.0f,
+        .end_y = 56.0f,
+        .start_layer = 0,
+        .end_layer = 0,
+        .mesh_size = 0
+    };
 
     SECTION("Check the error where a mesh size was illegal.") {
-        REQUIRE_THROWS_WITH(generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_start_layer, mesh_end_layer, mesh_size), "The NoC mesh size cannot be 0.");
+        REQUIRE_THROWS_WITH(generate_noc_mesh(test, test_location, &test_noc, mesh_region), "The NoC mesh size cannot be 0.");
     }
     SECTION("Check the error where a mesh region size was invalid.") {
-        mesh_size = 3;
+        mesh_region.mesh_size = 3;
 
-        REQUIRE_THROWS_WITH(generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_start_layer, mesh_end_layer, mesh_size), "The NoC region is invalid.");
+        REQUIRE_THROWS_WITH(generate_noc_mesh(test, test_location, &test_noc, mesh_region), "The NoC region is invalid.");
     }
     SECTION("Check the mesh creation for integer precision coordinates.") {
         // define test parameters
-        mesh_size = 3;
+        mesh_region.mesh_size = 3;
 
-        mesh_start_x = 0;
-        mesh_start_y = 0;
+        mesh_region.start_x = 0;
+        mesh_region.start_y = 0;
 
-        mesh_end_x = 4;
-        mesh_end_y = 4;
+        mesh_region.end_x = 4;
+        mesh_region.end_y = 4;
 
         // create the golden results
         float golden_results_x[9];
@@ -202,10 +204,10 @@ TEST_CASE("Verifying mesh topology creation", "[NoC Arch Tests]") {
         golden_results_x[8] = 4;
         golden_results_y[8] = 4;
 
-        generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_start_layer, mesh_end_layer, mesh_size);
+        generate_noc_mesh(test, test_location, &test_noc, mesh_region);
 
         // go through all the expected routers
-        for (int expected_router_id = 0; expected_router_id < (mesh_size * mesh_size); expected_router_id++) {
+        for (int expected_router_id = 0; expected_router_id < (mesh_region.mesh_size * mesh_region.mesh_size); expected_router_id++) {
             // make sure the router ids match
             REQUIRE(test_noc.router_list[expected_router_id].id == expected_router_id);
 
@@ -218,13 +220,13 @@ TEST_CASE("Verifying mesh topology creation", "[NoC Arch Tests]") {
     }
     SECTION("Check the mesh creation for double precision coordinates.") {
         // define test parameters
-        mesh_size = 3;
+        mesh_region.mesh_size = 3;
 
-        mesh_start_x = 3.5;
-        mesh_start_y = 5.7;
+        mesh_region.start_x = 3.5;
+        mesh_region.start_y = 5.7;
 
-        mesh_end_x = 10.8;
-        mesh_end_y = 6.4;
+        mesh_region.end_x = 10.8;
+        mesh_region.end_y = 6.4;
 
         // create the golden results
         float golden_results_x[9];
@@ -254,10 +256,10 @@ TEST_CASE("Verifying mesh topology creation", "[NoC Arch Tests]") {
         golden_results_x[8] = 10.8;
         golden_results_y[8] = 6.4;
 
-        generate_noc_mesh(test, test_location, &test_noc, mesh_start_x, mesh_end_x, mesh_start_y, mesh_end_y, mesh_start_layer, mesh_end_layer, mesh_size);
+        generate_noc_mesh(test, test_location, &test_noc, mesh_region);
 
         // go through all the expected routers
-        for (int expected_router_id = 0; expected_router_id < (mesh_size * mesh_size); expected_router_id++) {
+        for (int expected_router_id = 0; expected_router_id < (mesh_region.mesh_size * mesh_region.mesh_size); expected_router_id++) {
             // make sure the router ids match
             REQUIRE(test_noc.router_list[expected_router_id].id == expected_router_id);