[vpr][test] update router lookahead test with the new structre of f_wire_cost_map

Author: amin1377

vpr/test/test_map_lookahead_serdes.cpp

@@ -11,17 +11,17 @@ static constexpr const char kMapLookaheadBin[] = "test_map_lookahead.bin";
 
 TEST_CASE("round_trip_map_lookahead", "[vpr]") {
     constexpr size_t num_layers = 1;
-    constexpr std::array<size_t, 6> kDim({num_layers, 10, 12, num_layers, 15, 16});
+    constexpr std::array<size_t, 6> kDim({num_layers, num_layers, 10, 12, 15, 16});
 
     f_wire_cost_map.resize(kDim);
     for (size_t from_layer = 0; from_layer < kDim[0]; from_layer++) {
-        for (size_t x = 0; x < kDim[1]; ++x) {
-            for (size_t y = 0; y < kDim[2]; ++y) {
-                for (size_t to_layer = 0; to_layer < kDim[3]; to_layer++) {
-                    for (size_t z = 0; z < kDim[4]; ++z) {
-                        for (size_t w = 0; w < kDim[5]; ++w) {
-                            f_wire_cost_map[from_layer][x][y][to_layer][z][w].delay = (x + 1) * (y + 1) * (z + 1) * (w + 1);
-                            f_wire_cost_map[from_layer][x][y][to_layer][z][w].congestion = 2 * (x + 1) * (y + 1) * (z + 1) * (w + 1);
+        for (size_t to_layer = 0; to_layer < kDim[1]; to_layer++) {
+            for (size_t z = 0; z < kDim[2]; ++z) {
+                for (size_t w = 0; w < kDim[3]; ++w) {
+                    for (size_t x = 0; x < kDim[4]; ++x) {
+                        for (size_t y = 0; y < kDim[5]; ++y) {
+                            f_wire_cost_map[from_layer][to_layer][z][w][x][y].delay = (x + 1) * (y + 1) * (z + 1) * (w + 1);
+                            f_wire_cost_map[from_layer][to_layer][z][w][x][y].congestion = 2 * (x + 1) * (y + 1) * (z + 1) * (w + 1);
                         }
                     }
                 }
@@ -32,13 +32,13 @@ TEST_CASE("round_trip_map_lookahead", "[vpr]") {
     write_router_lookahead(kMapLookaheadBin);
 
     for (size_t from_layer = 0; from_layer < kDim[0]; from_layer++) {
-        for (size_t x = 0; x < kDim[1]; ++x) {
-            for (size_t y = 0; y < kDim[2]; ++y) {
-                for (size_t to_layer = 0; to_layer < kDim[3]; to_layer++) {
-                    for (size_t z = 0; z < kDim[4]; ++z) {
-                        for (size_t w = 0; w < kDim[5]; ++w) {
-                            f_wire_cost_map[from_layer][x][y][to_layer][z][w].delay = 0.f;
-                            f_wire_cost_map[from_layer][x][y][to_layer][z][w].congestion = 0.f;
+        for (size_t to_layer = 0; to_layer < kDim[1]; to_layer++) {
+            for (size_t z = 0; z < kDim[2]; ++z) {
+                for (size_t w = 0; w < kDim[3]; ++w) {
+                    for (size_t x = 0; x < kDim[4]; ++x) {
+                        for (size_t y = 0; y < kDim[5]; ++y) {
+                            f_wire_cost_map[from_layer][to_layer][z][w][x][y].delay = 0.f;
+                            f_wire_cost_map[from_layer][to_layer][z][w][x][y].congestion = 0.f;
                         }
                     }
                 }
@@ -55,13 +55,13 @@ TEST_CASE("round_trip_map_lookahead", "[vpr]") {
     }
 
     for (size_t from_layer = 0; from_layer < kDim[0]; from_layer++) {
-        for (size_t x = 0; x < kDim[1]; ++x) {
-            for (size_t y = 0; y < kDim[2]; ++y) {
-                for (size_t to_layer = 0; to_layer < kDim[3]; to_layer++) {
-                    for (size_t z = 0; z < kDim[4]; ++z) {
-                        for (size_t w = 0; w < kDim[5]; ++w) {
-                            REQUIRE(f_wire_cost_map[from_layer][x][y][to_layer][z][w].delay == (x + 1) * (y + 1) * (z + 1) * (w + 1));
-                            REQUIRE(f_wire_cost_map[from_layer][x][y][to_layer][z][w].congestion == 2 * (x + 1) * (y + 1) * (z + 1) * (w + 1));
+        for (size_t to_layer = 0; to_layer < kDim[1]; to_layer++) {
+            for (size_t z = 0; z < kDim[2]; ++z) {
+                for (size_t w = 0; w < kDim[3]; ++w) {
+                    for (size_t x = 0; x < kDim[4]; ++x) {
+                        for (size_t y = 0; y < kDim[5]; ++y) {
+                            REQUIRE(f_wire_cost_map[from_layer][to_layer][z][w][x][y].delay == (x + 1) * (y + 1) * (z + 1) * (w + 1));
+                            REQUIRE(f_wire_cost_map[from_layer][to_layer][z][w][x][y].congestion == 2 * (x + 1) * (y + 1) * (z + 1) * (w + 1));
                         }
                     }
                 }