Changeset 904 for branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

Timestamp:

Dec 11, 2014, 4:52:15 PM (9 years ago)

Author:

cfuguet

Message:

reconf: any router in any NoC can be faulty. Moreover, each NoC has its
own config register in the XICU.

File:

• branches/reconfiguration/platforms/tsar_generic_iob/top.cpp (modified) (4 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -415 +415 @@
             debug_period = strtol(argv[n+1], NULL, 0);
          }
-         else if ((strcmp(argv[n], "-FAULTY_ROUTER") == 0) && (n+2 < argc) )
-         {
-            size_t x = strtol(argv[n+1], NULL, 0);
-            size_t y = strtol(argv[n+2], NULL, 0);
-            n++;
+         else if ((strcmp(argv[n], "-FAULTY_ROUTER") == 0) && (n+3 < argc) )
+         {
+            size_t t = strtol(argv[n+1], NULL, 0);
+            size_t x = strtol(argv[n+2], NULL, 0);
+            size_t y = strtol(argv[n+3], NULL, 0);
+            n+=2;
+            if( (t > 4) )
+            {
+                std::cout << "FAULTY_ROUTER NoC index is too big (index > 4)" << std::endl;
+                exit(0);
+            }
             if( (x>=X_SIZE) || (y>=Y_SIZE) )
             {
@@ -425 +431 @@
                 exit(0);
             }
-            faulty_routers.push_back((x << Y_WIDTH) | y);
+            faulty_routers.push_back((t << (X_WIDTH + Y_WIDTH)) |
+                                     (x << (Y_WIDTH)) |
+                                     (y));
          }
          else if ((strcmp(argv[n], "-FAULTY_MASK") == 0) && (n+1 < argc) )
@@ -1131 +1139 @@
 #endif
 
-    // disable all interfaces of the faulty router
+    // disable all interfaces of the faulty CMD routers
+    std::cout << "\n*** List of deactivated routers ***\n";
     for (std::vector<size_t>::iterator it = faulty_routers.begin();
          it != faulty_routers.end();
          ++it)
     {
-       int router_id = *it;
-       int router_x = router_id >> Y_WIDTH;
-       int router_y = router_id & ((1 << Y_WIDTH) - 1);
-       clusters[router_x][router_y]->int_router_cmd[0]->set_disable_mask(faulty_mask);
+       int ry = (*it) & ((1 << Y_WIDTH) - 1);
+       int rx = (*it >> Y_WIDTH) & ((1 << X_WIDTH) - 1);
+       int rt = (*it) >> (X_WIDTH + Y_WIDTH);
+
+       if (rt == 0)
+       {
+          std::cout << "Deactivate CMD router (" << rx << "," << ry << ")"
+                    << std::endl;
+          clusters[rx][ry]->int_router_cmd[0]->set_disable_mask(faulty_mask);
+          continue;
+       }
+       if (rt == 1)
+       {
+          std::cout << "Deactivate RSP router (" << rx << "," << ry << ")"
+                    << std::endl;
+          clusters[rx][ry]->int_router_rsp[0]->set_disable_mask(faulty_mask);
+          continue;
+       }
+       if (rt == 2)
+       {
+          std::cout << "Deactivate M2P router (" << rx << "," << ry << ")"
+                    << std::endl;
+          clusters[rx][ry]->int_router_cmd[1]->set_disable_mask(faulty_mask);
+          continue;
+       }
+       if (rt == 3)
+       {
+          std::cout << "Deactivate P2M router (" << rx << "," << ry << ")"
+                    << std::endl;
+          clusters[rx][ry]->int_router_rsp[1]->set_disable_mask(faulty_mask);
+          continue;
+       }
+       if (rt == 4)
+       {
+          std::cout << "Deactivate CLACK router (" << rx << "," << ry << ")"
+                    << std::endl;
+          clusters[rx][ry]->int_router_cmd[2]->set_disable_mask(faulty_mask);
+          continue;
+       }
     }
 
@@ -1475 +1519 @@
             uint64_t ms2 = (uint64_t) t2.tv_sec  * 1000ULL +
                (uint64_t) t2.tv_usec / 1000;
-            std::cerr << "### cycle = " << n << " / frequency (Khz) = "
+            std::cerr << "### cycle = " << std::dec << n << " / frequency (Khz) = "
                << (double) stats_period / (double) (ms2 - ms1) << std::endl;
          }