Changeset 1016 for branches/reconfiguration/modules/dspin_router/caba/test/simple_segment_recovery_test/main.c

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/simple_segment_recovery_test/main.c (modified) (1 diff)

branches/reconfiguration/modules/dspin_router/caba/test/simple_segment_recovery_test/main.c

@@ -25 +25 @@
     /* configure the routers around the blackhole (1, 1) to define a cycle-free
      * contour */
-    const int PATH_RECOVERY = 1;
+    const int RECOVERY = 1;
     uint32_t val;
 
     printf("router(0, 2): configuring as NW\n");
-    assert(xcu_get_register(0, 2, XICU_CFG_REG, 0) == BH_NONE);
-    val = (PATH_RECOVERY << 7) | (REQ_SOUTH << 4) | BH_NW;
+    val = (REQ_SOUTH << 5) | (RECOVERY << 4) | NW_OF_X;
     xcu_set_register(0, 2, XICU_CFG_REG, 0, val);     /* configure NW */
 
     printf("router(0, 1): configuring as W\n");
-    assert(xcu_get_register(0, 1, XICU_CFG_REG, 0) == BH_NONE);
-    val = (PATH_RECOVERY << 7) | (REQ_LOCAL << 4) | BH_W;
+    val = (REQ_LOCAL << 5) | (RECOVERY << 4) | W_OF_X;
     xcu_set_register(0, 1, XICU_CFG_REG, 0, val);     /* configure W */
 
     printf("router(0, 0): configuring as SW\n");
-    assert(xcu_get_register(0, 0, XICU_CFG_REG, 0) == BH_NONE);
-    val = (PATH_RECOVERY << 7) | (REQ_NORTH << 4) | BH_SW;
+    val = (REQ_NORTH << 5) | (RECOVERY << 4) | SW_OF_X;
     xcu_set_register(0, 0, XICU_CFG_REG, 0, val);     /* configure SW */
 
     printf("router(1, 2): configuring as N\n");
-    assert(xcu_get_register(1, 2, XICU_CFG_REG, 0) == BH_NONE);
-    val = (PATH_RECOVERY << 7) | (REQ_WEST << 4) | BH_N;
+    val = (REQ_WEST << 5) | (RECOVERY << 4) | N_OF_X;
     xcu_set_register(1, 2, XICU_CFG_REG, 0, val);     /* configure N */
 
     printf("router(2, 2): configuring as NE\n");
-    assert(xcu_get_register(2, 2, XICU_CFG_REG, 0) == BH_NONE);
-    val = (PATH_RECOVERY << 7) | (REQ_WEST << 4) | BH_NE;
+    val = (REQ_WEST << 5) | (RECOVERY << 4) | NE_OF_X;
     xcu_set_register(2, 2, XICU_CFG_REG, 0, val);     /* configure NE */
 
     printf("router(2, 1): configuring as E\n");
-    assert(xcu_get_register(2, 1, XICU_CFG_REG, 0) == BH_NONE);
-    val = (PATH_RECOVERY << 7) | (REQ_SOUTH << 4) | BH_E;
+    val = (REQ_SOUTH << 5) | (RECOVERY << 4) | E_OF_X;
     xcu_set_register(2, 1, XICU_CFG_REG, 0, val);     /* configure E */
 
     printf("router(2, 0): configuring as SE\n");
-    assert(xcu_get_register(2, 0, XICU_CFG_REG, 0) == BH_NONE);
-    val = (PATH_RECOVERY << 7) | (REQ_WEST << 4) | BH_SE;
+    val = (REQ_WEST << 5) | (RECOVERY << 4) | SE_OF_X;
     xcu_set_register(2, 0, XICU_CFG_REG, 0, val);     /* configure SE */
 
     printf("router(1, 0): configuring as S\n");
-    assert(xcu_get_register(1, 0, XICU_CFG_REG, 0) == BH_NONE);
-    val = (PATH_RECOVERY << 7) | (REQ_WEST << 4) | BH_S;
+    val = (REQ_WEST << 5) | (RECOVERY << 4) | S_OF_X;
     xcu_set_register(1, 0, XICU_CFG_REG, 0, val);     /* configure S */
 
-    assert((xcu_get_register(0, 2, XICU_CFG_REG, 0) & 0xF) == BH_NW);
-    assert((xcu_get_register(0, 1, XICU_CFG_REG, 0) & 0xF) == BH_W);
-    assert((xcu_get_register(0, 0, XICU_CFG_REG, 0) & 0xF) == BH_SW);
-    assert((xcu_get_register(1, 2, XICU_CFG_REG, 0) & 0xF) == BH_N);
-    assert((xcu_get_register(2, 2, XICU_CFG_REG, 0) & 0xF) == BH_NE);
-    assert((xcu_get_register(2, 1, XICU_CFG_REG, 0) & 0xF) == BH_E);
-    assert((xcu_get_register(2, 0, XICU_CFG_REG, 0) & 0xF) == BH_SE);
-    assert((xcu_get_register(1, 0, XICU_CFG_REG, 0) & 0xF) == BH_S);
+    assert((xcu_get_register(0, 2, XICU_CFG_REG, 0) & 0xF) == NW_OF_X);
+    assert((xcu_get_register(0, 1, XICU_CFG_REG, 0) & 0xF) == W_OF_X);
+    assert((xcu_get_register(0, 0, XICU_CFG_REG, 0) & 0xF) == SW_OF_X);
+    assert((xcu_get_register(1, 2, XICU_CFG_REG, 0) & 0xF) == N_OF_X);
+    assert((xcu_get_register(2, 2, XICU_CFG_REG, 0) & 0xF) == NE_OF_X);
+    assert((xcu_get_register(2, 1, XICU_CFG_REG, 0) & 0xF) == E_OF_X);
+    assert((xcu_get_register(2, 0, XICU_CFG_REG, 0) & 0xF) == SE_OF_X);
+    assert((xcu_get_register(1, 0, XICU_CFG_REG, 0) & 0xF) == S_OF_X);
 
     /* Test the recovered segment that has been migrated to the EAST cluster */