Changeset 1016 for branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test

Timestamp:

Sep 14, 2015, 9:42:16 AM (9 years ago)

Author:

cfuguet

Message:

reconf: dspin_router

• improve the code readability of the dspin_router model.

• update the unitary tests of the dspin_router to support the local gateway hardware barrier, and the memory cache scratchpad mode.

File:

• branches/reconfiguration/modules/dspin_router/caba/test/synthetic_test/top.cpp (modified) (2 diffs)

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

@@ -44 +44 @@
 }
 
-static inline uint32_t configRouter(int bypass_mode,
-                                    int reallocation_dir,
+static inline uint32_t configRouter(int reallocation_dir,
+                                    int recovery_mode,
                                     int blackhole_pos)
 {
-    return (bypass_mode << 7) | (reallocation_dir << 4) | blackhole_pos;
+    return ((reallocation_dir & 0x7) << 5) |
+           ((recovery_mode    & 0x1) << 4) |
+           (blackhole_pos     & 0xF);
 }
 
@@ -295 +297 @@
 
     /* initialize the configuration signals */
-    sConfigNONE.write(configRouter(0, REQ_NOP, BH_NONE));
-    sConfigN.write(configRouter(1, REQ_SOUTH, BH_N));
-    sConfigNE.write(configRouter(1, REQ_WEST, BH_NE));
-    sConfigE.write(configRouter(1, REQ_WEST, BH_E));
-    sConfigSE.write(configRouter(1, REQ_WEST, BH_SE));
-    sConfigS.write(configRouter(1, REQ_NORTH, BH_S));
-    sConfigSW.write(configRouter(1, REQ_EAST, BH_SW));
-    sConfigW.write(configRouter(1, REQ_EAST, BH_W));
-    sConfigNW.write(configRouter(1, REQ_EAST, BH_NW));
+    sConfigNONE.write(configRouter(0, 0, NORMAL));
+
+    // requests to the deactivated segment are dropped
+    sConfigN.write(configRouter(REQ_SOUTH, 1, N_OF_X));
+    sConfigNE.write(configRouter(REQ_WEST, 1, NE_OF_X));
+    sConfigE.write(configRouter(REQ_WEST, 1, E_OF_X));
+    sConfigSE.write(configRouter(REQ_WEST, 1, SE_OF_X));
+    sConfigS.write(configRouter(REQ_NORTH, 1, S_OF_X));
+    sConfigSW.write(configRouter(REQ_EAST, 1, SW_OF_X));
+    sConfigW.write(configRouter(REQ_EAST, 1, W_OF_X));
+    sConfigNW.write(configRouter(REQ_EAST, 1, NW_OF_X));
 
     /* initialize mesh boundary signals */