fix unit test compilation errors

Author: soheilshahrouz

libs/libarchfpga/test/test_read_xml_arch_file.cpp

@@ -2,8 +2,8 @@
 #include "catch2/catch_test_macros.hpp"
 #include "catch2/matchers/catch_matchers_all.hpp"
 
-// testting statuc functions so include whole source file it is in
-#include "read_xml_arch_file.cpp"
+// testing static functions so include whole source file it is in
+#include "read_xml_arch_file_noc_tag.cpp"
 
 // for comparing floats
 #include "vtr_math.h"
@@ -25,7 +25,7 @@ TEST_CASE("Updating router info in arch", "[NoC Arch Tests]") {
 
         it = test_router_list.find(router_id);
 
-        // check first that the router was newly added to the router databse
+        // check first that the router was newly added to the router database
         REQUIRE(it != test_router_list.end());
 
         // no verify the components of the router parameter
@@ -39,7 +39,7 @@ TEST_CASE("Updating router info in arch", "[NoC Arch Tests]") {
 
         it = test_router_list.find(router_id);
 
-        // check first that the router was newly added to the router databse
+        // check first that the router was newly added to the router database
         REQUIRE(it != test_router_list.end());
 
         // no verify the components of the router parameter
@@ -56,7 +56,7 @@ TEST_CASE("Updating router info in arch", "[NoC Arch Tests]") {
 
         it = test_router_list.find(router_id);
 
-        // check first that the router was newly added to the router databse
+        // check first that the router was newly added to the router database
         REQUIRE(it != test_router_list.end());
 
         // no verify the components of the router parameter
@@ -75,7 +75,7 @@ TEST_CASE("Updating router info in arch", "[NoC Arch Tests]") {
 
         it = test_router_list.find(router_id);
 
-        // check first that the router was newly added to the router databse
+        // check first that the router was newly added to the router database
         REQUIRE(it != test_router_list.end());
 
         // no verify the components of the router parameter
@@ -172,7 +172,7 @@ TEST_CASE("Verifying mesh topology creation", "[NoC Arch Tests]") {
         mesh_end_x = 4;
         mesh_end_y = 4;
 
-        // create the golden golden results
+        // create the golden results
         double golden_results_x[9];
         double golden_results_y[9];
 

vpr/test/test_bfs_routing.cpp

@@ -5,6 +5,9 @@
 
 namespace {
 
+constexpr double DUMMY_LATENCY = 1e-9;
+constexpr double DUMMY_BANDWIDTH = 1e12;
+
 TEST_CASE("test_route_flow", "[vpr_noc_bfs_routing]") {
     /*
      * Creating a test FPGA device below. The NoC itself will be
@@ -29,7 +32,7 @@ TEST_CASE("test_route_flow", "[vpr_noc_bfs_routing]") {
     // add all the routers
     for (int i = 0; i < 4; i++) {
         for (int j = 0; j < 4; j++) {
-            noc_model.add_router((i * 4) + j, j, i, 0);
+            noc_model.add_router((i * 4) + j, j, i, 0, DUMMY_LATENCY);
         }
     }
 
@@ -40,19 +43,19 @@ TEST_CASE("test_route_flow", "[vpr_noc_bfs_routing]") {
         for (int j = 0; j < 4; j++) {
             // add a link to the left of the router if there exists another router there
             if ((j - 1) >= 0) {
-                noc_model.add_link((NocRouterId)((i * 4) + j), (NocRouterId)(((i * 4) + j) - 1));
+                noc_model.add_link((NocRouterId)((i * 4) + j), (NocRouterId)(((i * 4) + j) - 1), DUMMY_BANDWIDTH, DUMMY_LATENCY);
             }
             // add a link to the top of the router if there exists another router there
             if ((i + 1) <= 3) {
-                noc_model.add_link((NocRouterId)((i * 4) + j), (NocRouterId)(((i * 4) + j) + 4));
+                noc_model.add_link((NocRouterId)((i * 4) + j), (NocRouterId)(((i * 4) + j) + 4), DUMMY_BANDWIDTH, DUMMY_LATENCY);
             }
             // add a link to the right of the router if there exists another router there
             if ((j + 1) <= 3) {
-                noc_model.add_link((NocRouterId)((i * 4) + j), (NocRouterId)(((i * 4) + j) + 1));
+                noc_model.add_link((NocRouterId)((i * 4) + j), (NocRouterId)(((i * 4) + j) + 1), DUMMY_BANDWIDTH, DUMMY_LATENCY);
             }
             // add a link to the bottom of the router if there exists another router there
             if ((i - 1) >= 0) {
-                noc_model.add_link((NocRouterId)((i * 4) + j), (NocRouterId)(((i * 4) + j) - 4));
+                noc_model.add_link((NocRouterId)((i * 4) + j), (NocRouterId)(((i * 4) + j) - 4), DUMMY_BANDWIDTH, DUMMY_LATENCY);
             }
         }
     }
@@ -97,12 +100,12 @@ TEST_CASE("test_route_flow", "[vpr_noc_bfs_routing]") {
         int number_of_links = noc_model.get_noc_links().size();
 
         // add the diagonal links and also add them to the golden path
-        noc_model.add_link(NocRouterId(12), NocRouterId(9));
-        golden_path.push_back(NocLinkId(number_of_links++));
-        noc_model.add_link(NocRouterId(9), NocRouterId(6));
-        golden_path.push_back(NocLinkId(number_of_links++));
-        noc_model.add_link(NocRouterId(6), NocRouterId(3));
-        golden_path.push_back(NocLinkId(number_of_links++));
+        noc_model.add_link(NocRouterId(12), NocRouterId(9), DUMMY_BANDWIDTH, DUMMY_LATENCY);
+        golden_path.emplace_back(number_of_links++);
+        noc_model.add_link(NocRouterId(9), NocRouterId(6), DUMMY_BANDWIDTH, DUMMY_LATENCY);
+        golden_path.emplace_back(number_of_links++);
+        noc_model.add_link(NocRouterId(6), NocRouterId(3), DUMMY_BANDWIDTH, DUMMY_LATENCY);
+        golden_path.emplace_back(number_of_links++);
 
         // now run the routinjg algorithm
         // make sure that a legal route was found (no error should be thrown)