Changeset 998 for branches/reconfiguration

Timestamp:

Jun 12, 2015, 3:22:12 PM (9 years ago)

Author:

cfuguet

Message:

reconf: several improvements in the dspin_router synthetic test platform

Location:

branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test

Files:

• broadcast_latency.sh (deleted)
• dspin_packet_generator (added)
• dspin_packet_generator/caba (added)
• dspin_packet_generator/caba/metadata (added)
• dspin_packet_generator/caba/metadata/dspin_packet_generator.sd (added)
• dspin_packet_generator/caba/source (added)
• dspin_packet_generator/caba/source/include (added)
• dspin_packet_generator/caba/source/include/dspin_packet_generator.h (added)
• dspin_packet_generator/caba/source/src (added)
• dspin_packet_generator/caba/source/src/dspin_packet_generator.cpp (added)
• run_broadcast_latency.sh (deleted)
• scripts (added)
• scripts/broadcast_check.sh (moved) (moved from branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test/broadcast_check.sh) (1 diff)
• scripts/broadcast_latency.sh (added)
• scripts/run_broadcast_check.sh (moved) (moved from branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test/run_broadcast_check.sh) (2 diffs)
• scripts/run_broadcast_latency.sh (added)
• scripts/run_unicast_latency.sh (added)
• scripts/unicast_latency.sh (added)
• top.cpp (modified) (8 diffs)
• top.desc (modified) (1 diff)

branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test/scripts/broadcast_check.sh

@@ -69 +69 @@
 
         error=sent - min
-        if (error > 20) {
+        if (error > 0) {
                 print "error: the number of broadcast received by a router is inferior "
-                print "to the error threshold\n";
+                print "to the error threshold: error = " error "\n";
                 exit 1;
         }

branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test/scripts/run_broadcast_check.sh

@@ -1 +1 @@
 #!/usr/bin/env sh
 LOGDIR=logs
-COMMON="-X 5 -Y 5 -N 10000"
+COMMON="-X 5 -Y 5 -P 1500"
+SCRIPTPATH=$(dirname $0)
+
+# compile the platform
+make
+if [[ ! -f ./simul.x ]]; then exit 1; fi;
 
 mkdir -p $LOGDIR
@@ -13 +18 @@
                                 echo "./simul.x $ARGS ($LOGFILE)"
                                 ./simul.x $ARGS > $LOGFILE 2>/dev/null;
-                                ./broadcast_check.sh $LOGFILE
+                                $SCRIPTPATH/broadcast_check.sh $LOGFILE
                                 if [[ $? == 1 ]]; then
                                         echo "FAILURE";

branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test/top.cpp

@@ -9 +9 @@
 #include <systemc>
 #include <cassert>
+#include <cstdlib>
 
 #include "dspin_router.h"
@@ -25 +26 @@
 #define Y_WIDTH 4
 
-#define FIFO_DEPTH 8
-#define NFLITS 2
+#define FIFO_DEPTH 2
+#define NFLITS 8
 #define LOAD 1000
-#define BROADCAST_PERIOD 3
+#define BROADCAST_PERIOD 1
 #define DSPIN_WIDTH 39
+#define MAX_PACKETS 100
 
 /*
  * Platform default values
  */
-#define X_SIZE 4
-#define Y_SIZE 4
+#define X_SIZE 5
+#define Y_SIZE 5
 
 static inline int cluster(int x, int y)
@@ -78 +80 @@
     int yFaulty = -1;
 
-    /* enable the DSPIN router's debug */
-    int debug = false;
-
-    /* number of simulation cycles */
-    int simCycles = 100000;
+    /* simulation cycles */
+    size_t simCycles = 0;
+
+    /* debug */
+    bool debug = false;
 
     /* synthetic generator load */
     int load = LOAD;
+
+    /* broadcast period */
+    int bcp = BROADCAST_PERIOD;
+
+    /* maximum number of packets per generator */
+    size_t max = MAX_PACKETS;
 
     for (int n = 1; n < argc; n += 2) {
@@ -122 +130 @@
             continue;
         }
-        if ((strcmp(argv[n--], "-DEBUG") == 0)) {
+        if ((strcmp(argv[n], "-B") == 0) && ((n + 1) < argc) ) {
+            bcp = strtol(argv[n + 1], NULL, 0);
+            assert(bcp >= 0);
+            continue;
+        }
+        if ((strcmp(argv[n], "-P") == 0) && ((n + 1) < argc) ) {
+            max = strtol(argv[n + 1], NULL, 0);
+            continue;
+        }
+        if ((strcmp(argv[n--], "-G") == 0)) {
             debug = true;
             continue;
@@ -154 +171 @@
             }
 
-            int broadcast_period = 0;
             int ld = 0;
             const int SRCID = cluster(x,y);
             bool all = (xSrc == -1) || (ySrc == -1);
             if (all || (cluster(x,y) == cluster(xSrc,ySrc))) {
-               broadcast_period = BROADCAST_PERIOD;
-               ld = load;
+                ld = load;
+            }
+            if ((x == xFaulty) && (y == yFaulty)) {
+                ld = 0;
+            }
+            if (simCycles > 0) {
+                max = 0;
             }
             std::ostringstream generatorStr;
@@ -167 +188 @@
                 new DspinGeneratorType(generatorStr.str().c_str(),
                                        SRCID, NFLITS,
-                                       ld, FIFO_DEPTH,
-                                       broadcast_period);
+                                       ld, 8,
+                                       bcp,
+                                       X_WIDTH, Y_WIDTH,
+                                       X_SIZE, Y_SIZE,
+                                       max);
         }
     }
@@ -266 +290 @@
     }
 
+    srandom(3);
     sc_start(sc_core::SC_ZERO_TIME);
     signal_resetn = 0;
@@ -297 +322 @@
     signal_resetn = 1;
 
-    for(int i = 0; i < simCycles; ++i) {
-        if (!debug) {
+    size_t n;
+    if (debug) {
+        for(n = 0; n < simCycles; ++n) {
+            std::cout << std::endl;
+            std::cout << "##########################################" << std::endl;
+            std::cout << "Simulation cycle " << n << std::endl;
+            std::cout << "##########################################" << std::endl;
+            std::cout << std::endl;
+            sc_start(sc_core::sc_time(1, SC_NS));
+            for (int x = 0; x < xSize; ++x) {
+                for (int y = 0; y < ySize; ++y) {
+                    dspinRouter[x][y]->print_trace();
+                    dspinGenerator[x][y]->print_trace();
+                }
+            }
+        }
+    } else {
+        if (simCycles > 0) {
             sc_start(sc_core::sc_time(simCycles, SC_NS));
-            break;
-        }
-        std::cout << std::endl;
-        std::cout << "##########################################" << std::endl;
-        std::cout << "Simulation cycle " << i << std::endl;
-        std::cout << "##########################################" << std::endl;
-        std::cout << std::endl;
-        sc_start(sc_core::sc_time(1, SC_NS));
-        for (int x = 0; x < xSize; ++x) {
-            for (int y = 0; y < ySize; ++y) {
-                dspinRouter[x][y]->print_trace();
-            }
-        }
-    }
+        }
+        else {
+            const int period = 3000;
+            for (n = 0; n < (max * 200); n += period) {
+                if ((xSrc == -1) || (ySrc == -1)) {
+                    std::cout << "When using a packet limit, there must be one ";
+                    std::cout << "source only" << std::endl;
+                    std::exit(1);
+                }
+
+                sc_start(sc_core::sc_time(period, SC_NS));
+
+                uint32_t pkts = dspinGenerator[xSrc][ySrc]->get_sent_packets();
+                if (pkts >= max) break;
+            }
+            sc_start(sc_core::sc_time(period, SC_NS));
+            std::cout << "Simulated cycles: " << n + period << std::endl;
+        }
+    }
+
     for (int x = 0; x < xSize; ++x) {
         for (int y = 0; y < ySize; ++y) {

branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test/top.desc

@@ -10 +10 @@
                          flit_width=dspin_size),
 
-        Uses('caba:dspin_packet_generator',
+        Uses('caba:reconf:dspin_router:dspin_packet_generator',
              cmd_width=dspin_size,
              rsp_width=dspin_size)