Changeset 889 for branches/reconfiguration/platforms

Timestamp:

Nov 17, 2014, 6:06:02 PM (9 years ago)

Author:

cfuguet

Message:

reconf: support multiple faulty routers in the platform

• Each faulty router can be passed as a main parameter and should be preceeded with -FAULTY_ROUTER.

• The same thing is supported by the onerun.py script.

Location:

branches/reconfiguration/platforms/tsar_generic_iob

Files:

• scripts/onerun.py (modified) (2 diffs)
• top.cpp (modified) (6 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/scripts/onerun.py

@@ -41 +41 @@
 
 parser.add_argument(
-    '--faulty-router', '-f', dest='faultyrouter', default=-1,
+    '--faulty-router', '-f', dest='faultyrouter', action='append',
     help='ID (X,Y) of faulty router')
 
@@ -130 +130 @@
 command.extend(["-THREADS", str(ompthreads)])
 
-if args.faultyrouter != -1:
-    command.extend(["-FAULTY_ROUTER", str(args.faultyrouter)])
+if args.faultyrouter != None:
     command.extend(["-FAULTY_MASK", str(args.faultymask)])
+    for f in args.faultyrouter:
+        command.extend(["-FAULTY_ROUTER", str(f)])
 
 if args.debug != None:

branches/reconfiguration/platforms/tsar_generic_iob/top.cpp

@@ -122 +122 @@
 #include <climits>
 #include <stdint.h>
+#include <vector>
 
 #include "gdbserver.h"
@@ -326 +327 @@
    char     nic_tx_name[256] = NIC_TX_NAME;       // pathname: tx packets file
    ssize_t  threads_nr       = 1;                 // simulator's threads number
-   size_t   faulty_router_id = 0xFFFFFFFF;        // faulty router coordinates
    size_t   faulty_mask      = 0x1F;              // interface mask for the faulty router
    bool     debug_ok         = false;             // trace activated
@@ -337 +337 @@
    uint32_t frozen_cycles    = MAX_FROZEN_CYCLES; // monitoring frozen processor
 
+   std::vector<size_t> faulty_routers;
+
    assert( (X_WIDTH == 4) and (Y_WIDTH == 4) and
    "ERROR: we must have X_WIDTH == Y_WIDTH == 4");
@@ -415 +417 @@
          else if ((strcmp(argv[n], "-FAULTY_ROUTER") == 0) && (n+1 < argc) )
          {
-            faulty_router_id = strtol(argv[n+1], NULL, 0);
+            size_t faulty_router_id = strtol(argv[n+1], NULL, 0);
             size_t x = faulty_router_id >> Y_WIDTH;
             size_t y = faulty_router_id & ((1 << Y_WIDTH) - 1);
@@ -423 +425 @@
                 exit(0);
             }
+            faulty_routers.push_back(faulty_router_id);
          }
          else if ((strcmp(argv[n], "-FAULTY_MASK") == 0) && (n+1 < argc) )
@@ -1129 +1132 @@
 
     // disable all interfaces of the faulty router
-    if (faulty_router_id != 0xFFFFFFFF)
+    for (std::vector<size_t>::iterator it = faulty_routers.begin();
+         it != faulty_routers.end();
+         ++it)
     {
-       int faulty_x = faulty_router_id >> Y_WIDTH;
-       int faulty_y = faulty_router_id & ((1 << Y_WIDTH) - 1);
-       clusters[faulty_x][faulty_y]->int_router_cmd[0]->set_disable_mask(faulty_mask);
+       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);
     }