Changeset 904 for branches

Timestamp:

Dec 11, 2014, 4:52:15 PM (10 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.

Location:

branches/reconfiguration/platforms/tsar_generic_iob

Files:

• Makefile (modified) (2 diffs)
• scripts/onerun.py (modified) (4 diffs)
• scripts/random_faulty_core_router.py (modified) (3 diffs)
• top.cpp (modified) (4 diffs)
• tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h (modified) (1 diff)
• tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp (modified) (4 diffs)

branches/reconfiguration/platforms/tsar_generic_iob/Makefile

@@ -1 +1 @@
 TAGS := cscope.out
+
+SOCLIB_CC_ARGS :=
+SOCLIB_CC_ARGS += "-b caba:reconf:vci_xicu"
 
 all: simul.x
@@ -5 +8 @@
 
 simul.x: top.cpp top.desc
-        soclib-cc -P -p top.desc -I. -o simul.x
+        soclib-cc $(SOCLIB_CC_ARGS) -p top.desc -I. -o simul.x
 
 $(TAGS): top.desc

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

@@ -21 +21 @@
     compileonly  -- stops after platform's compilation
     batchmode    -- TTY and FB are only redirected to FILES
-    faultyrouter -- a list containing faulty routers' coordinates (x, y)
+    faultyrouter -- a list containing faulty routers' coordinates (t, x, y)
     faultymask   -- a mask of disabled routers' interfaces
     faultycore   -- a list containing faulty cores' coordinates (x, y, l)
@@ -103 +103 @@
         command.extend(["-FAULTY_MASK", str(args.faultymask)])
         for f in args.faultyrouter:
-            command.extend(["-FAULTY_ROUTER", str(f[0]), str(f[1])])
+            command.extend(["-FAULTY_ROUTER", str(f[0]), str(f[1]), str(f[2])])
 
     if args.debug != None:
@@ -112 +112 @@
     else:
         # by observation, the procedure grows linearly with the diameter of the mesh.
-        maxcycles = 150000 + (args.x + args.y) * 20000;
+        maxcycles = 400000 + (args.x + args.y) * 20000;
         command.extend(["-NCYCLES", str(maxcycles)])
 
@@ -158 +158 @@
 
     parser.add_argument(
-        '--faulty-router', '-fr', dest='faultyrouter', action='append', nargs=2,
-        help='ID (X,Y) of faulty router')
+        '--faulty-router', '-fr', dest='faultyrouter', action='append', nargs=3,
+        help='ID (T,X,Y) of faulty router. The T is 0:CMD, 1:RSP')
 
     parser.add_argument(

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

@@ -84 +84 @@
 SIM_FAULTFREE = False
 SIM_FAULTCORES = False
-SIM_FAULTROUTERS = False
-SIM_FAULTMIXED = True
+SIM_FAULTROUTERS = True
+SIM_FAULTMIXED = False
 
 # probability of faulty router (for mixed simul)
 SIM_FAULTMIXED_PROBROUTER = 0.05 # 5%
+
+# NoC index for faulty routers
+CMD = 0
+RSP = 1
 
 for xsize, ysize in [(4, 4), (4, 8), (8, 8), (8, 16), (16, 16)]:
@@ -135 +139 @@
                 cx = random.randint(0, args.xmax)
                 cy = random.randint(0, args.ymax)
-                if args.add_faultyrouter((cx, cy)): n += 1
+                if args.add_faultyrouter((CMD, cx, cy)): n += 1
 
             onerun.run(args)
@@ -159 +163 @@
                     # add faulty router
                     fr += 1
-                    while not args.add_faultyrouter((cx, cy)):
+                    while not args.add_faultyrouter((CMD, cx, cy)):
                         cx = random.randint(0, args.xmax)
                         cy = random.randint(0, args.ymax)

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;
          }

branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h

@@ -73 +73 @@
     sc_signal<bool>                       signal_irq_mdma[8];
     sc_signal<bool>                       signal_irq_memc;
-    sc_signal<uint32_t>                   signal_cfg_router;
+    sc_signal<uint32_t>                   signal_cfg_router_cmd[3];
+    sc_signal<uint32_t>                   signal_cfg_router_rsp[2];
 
     // INT network DSPIN signals between DSPIN routers and DSPIN local_crossbars

branches/reconfiguration/platforms/tsar_generic_iob/tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp

@@ -197 +197 @@
                      xcu_nb_inputs,                       // number of soft IRQs
                      16,                                  // number of output IRQs
-                     1);                                  // number of config regs
+                     5);                                  // number of config regs
 
     ////////////  MDMA
@@ -431 +431 @@
         int_router_cmd[k]->p_clk                 (this->p_clk);
         int_router_cmd[k]->p_resetn              (this->p_resetn);
-        (*int_router_cmd[k]->p_blackhole_pos)    (signal_cfg_router);
+        (*int_router_cmd[k]->p_blackhole_pos)    (signal_cfg_router_cmd[k]);
         for (int i = 0; i < 4; i++)
         {
@@ -443 +443 @@
         int_router_rsp[k]->p_clk                 (this->p_clk);
         int_router_rsp[k]->p_resetn              (this->p_resetn);
-        (*int_router_rsp[k]->p_blackhole_pos)    (signal_cfg_router);
+        (*int_router_rsp[k]->p_blackhole_pos)    (signal_cfg_router_rsp[k]);
         for (int i = 0; i < 4; i++)
         {
@@ -554 +554 @@
         else                     xicu->p_hwi[i]  (signal_false);
     }
-    xicu->p_cfg[0]                               (signal_cfg_router);
+    xicu->p_cfg[0]                               (signal_cfg_router_cmd[0]); // CMD
+    xicu->p_cfg[1]                               (signal_cfg_router_rsp[0]); // RSP
+    xicu->p_cfg[2]                               (signal_cfg_router_cmd[1]); // M2P
+    xicu->p_cfg[3]                               (signal_cfg_router_rsp[1]); // P2M
+    xicu->p_cfg[4]                               (signal_cfg_router_cmd[2]); // CLACK
 
     ///////////////////////////////////// MEMC