update unit tests to be compatible with DeviceGrid constructors

Author: soheilshahrouz

vpr/test/test_compressed_grid.cpp

@@ -162,7 +162,8 @@ TEST_CASE("test_compressed_grid", "[vpr_compressed_grid]") {
     }
 
     auto& grid = g_vpr_ctx.mutable_device().grid;
-    grid = DeviceGrid("test_device_grid", test_grid);
+    std::vector<std::vector<int>> dummy_cuts0, dummy_cuts1;
+    grid = DeviceGrid("test_device_grid", test_grid, std::move(dummy_cuts0), std::move(dummy_cuts1));
 
     std::vector<t_compressed_block_grid> compressed_grids = create_compressed_block_grids();
 

vpr/test/test_setup_noc.cpp

@@ -129,7 +129,8 @@ TEST_CASE("test_identify_and_store_noc_router_tile_positions", "[vpr_setup_noc]"
         }
 
         // create a new device grid
-        DeviceGrid test_device = DeviceGrid(device_grid_name, test_grid);
+        std::vector<std::vector<int>> dummy_cuts0, dummy_cuts1;
+        DeviceGrid test_device = DeviceGrid(device_grid_name, test_grid, std::move(dummy_cuts0), std::move(dummy_cuts1));
 
         // call the test function
         list_of_routers = identify_and_store_noc_router_tile_positions(test_device, router_tile_name);
@@ -246,7 +247,8 @@ TEST_CASE("test_identify_and_store_noc_router_tile_positions", "[vpr_setup_noc]"
         }
 
         // create a new device grid
-        DeviceGrid test_device = DeviceGrid(device_grid_name, test_grid);
+        std::vector<std::vector<int>> dummy_cuts0, dummy_cuts1;
+        DeviceGrid test_device = DeviceGrid(device_grid_name, test_grid, std::move(dummy_cuts0), std::move(dummy_cuts1));
 
         // call the test function
         list_of_routers = identify_and_store_noc_router_tile_positions(test_device, router_tile_name);
@@ -363,7 +365,8 @@ TEST_CASE("test_identify_and_store_noc_router_tile_positions", "[vpr_setup_noc]"
         }
 
         // create a new device grid
-        DeviceGrid test_device = DeviceGrid(device_grid_name, test_grid);
+        std::vector<std::vector<int>> dummy_cuts0, dummy_cuts1;
+        DeviceGrid test_device = DeviceGrid(device_grid_name, test_grid, std::move(dummy_cuts0), std::move(dummy_cuts1));
 
         // call the test function
         list_of_routers = identify_and_store_noc_router_tile_positions(test_device, router_tile_name);
@@ -404,7 +407,7 @@ TEST_CASE("test_create_noc_routers", "[vpr_setup_noc]") {
     /*
      * Setup:
      * - The router will take over a 2x3 grid area
-     * - The NoC will be a 3x3 Mesh topology and located at 
+     * - The NoC will be a 3x3 Mesh topology and located at
      * the following positions:
      * - router 1: (0,0)
      * - router 2: (4,0)
@@ -590,7 +593,7 @@ TEST_CASE("test_create_noc_links", "[vpr_setup_noc]") {
     /*
      * Setup:
      * - The router will take over a 2x3 grid area
-     * - The NoC will be a 3x3 Mesh topology and located at 
+     * - The NoC will be a 3x3 Mesh topology and located at
      * the following positions:
      * - router 1: (0,0)
      * - router 2: (4,0)
@@ -738,7 +741,7 @@ TEST_CASE("test_setup_noc", "[vpr_setup_noc]") {
     /*
      * Setup:
      * - The router will take over a 2x3 grid area
-     * - The NoC will be a 3x3 Mesh topology and located at 
+     * - The NoC will be a 3x3 Mesh topology and located at
      * the following positions:
      * - router 1: (0,0)
      * - router 2: (4,0)
@@ -929,7 +932,8 @@ TEST_CASE("test_setup_noc", "[vpr_setup_noc]") {
             }
         }
 
-        device_ctx.grid = DeviceGrid(device_grid_name, test_grid);
+        std::vector<std::vector<int>> dummy_cuts0, dummy_cuts1;
+        device_ctx.grid = DeviceGrid(device_grid_name, test_grid, std::move(dummy_cuts0), std::move(dummy_cuts1));
 
         REQUIRE_THROWS_WITH(setup_noc(arch), "The Provided NoC topology information in the architecture file has more number of routers than what is available in the FPGA device.");
     }
@@ -980,7 +984,8 @@ TEST_CASE("test_setup_noc", "[vpr_setup_noc]") {
 
         noc_info.router_list.clear();
 
-        device_ctx.grid = DeviceGrid(device_grid_name, test_grid);
+        std::vector<std::vector<int>> dummy_cuts0, dummy_cuts1;
+        device_ctx.grid = DeviceGrid(device_grid_name, test_grid, std::move(dummy_cuts0), std::move(dummy_cuts1));
 
         REQUIRE_THROWS_WITH(setup_noc(arch), "No physical NoC routers were found on the FPGA device. Either the provided name for the physical router tile was incorrect or the FPGA device has no routers.");
     }
@@ -1215,7 +1220,8 @@ TEST_CASE("test_setup_noc", "[vpr_setup_noc]") {
             noc_info.link_bandwidth_overrides.insert({{noc_router_user_id, neighbor_router_user_id}, LINK_BANDWIDTH_OVERRIDE});
         }
 
-        device_ctx.grid = DeviceGrid(device_grid_name, test_grid);
+        std::vector<std::vector<int>> dummy_cuts0, dummy_cuts1;
+        device_ctx.grid = DeviceGrid(device_grid_name, test_grid, std::move(dummy_cuts0), std::move(dummy_cuts1));
 
         REQUIRE_NOTHROW(setup_noc(arch));