Changeset 431 for soft/giet_vm/giet_libs/barrier.c

Timestamp:

Oct 4, 2014, 3:35:35 PM (10 years ago)

Author:

alain

Message:

Introducing fixed format (X_WIDTH / Y_WIDTH / P_WIDTH) for processor index.

File:

• soft/giet_vm/giet_libs/barrier.c (modified) (8 diffs)

soft/giet_vm/giet_libs/barrier.c

@@ -31 +31 @@
 void barrier_wait( giet_barrier_t* barrier ) 
 {
+
+#if GIET_DEBUG_BARRIER
+unsigned int x;
+unsigned int y;
+unsigned int p;
+giet_proc_xyp( &x, &y, &p );
+giet_shr_printf("[DEBUG BARRIER] proc[%d,%d,%d] enters barrier_wait()\n", x, y, p );
+#endif
+
     // compute expected sense value 
     unsigned int expected;
@@ -75 +84 @@
 
     asm volatile ("sync" ::: "memory");
+
+#if GIET_DEBUG_BARRIER
+giet_shr_printf("[DEBUG BARRIER] proc[%d,%d,%d] exit barrier_wait()\n", x, y, p );
+#endif
+
 }
 
@@ -162 +176 @@
     barrier->ntasks = ntasks;
     
-#if GIET_DEBUG_SBT
-giet_shr_printf("\n[DEBUG SBT] SBT nodes allocation / ntasks = %d\n", ntasks ); 
+#if GIET_DEBUG_BARRIER
+giet_shr_printf("\n[DEBUG BARRIER] sbt_nodes allocation / ntasks = %d\n", ntasks ); 
 #endif
 
@@ -188 +202 @@
                      barrier->node[x][y][l] = remote_malloc( SBT_NODE_SIZE, x, y );
 
-#if GIET_DEBUG_SBT
+#if GIET_DEBUG_BARRIER
 giet_shr_printf("[DEBUG SBT] node[%d][%d][%d] : vaddr = %x\n",
                 x, y, l, (unsigned int)barrier->node[x][y][l] );
@@ -197 +211 @@
     }
             
-#if GIET_DEBUG_SBT
+#if GIET_DEBUG_BARRIER
 giet_shr_printf("\n[DEBUG SBT] SBT nodes initialisation\n"); 
 #endif
@@ -211 +225 @@
 {
     // compute cluster coordinates for the calling task
-    unsigned int procid     = giet_procid();
-    unsigned int cluster_xy = procid / NB_PROCS_MAX;
-    unsigned int x          = cluster_xy >> Y_WIDTH;
-    unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);
+    unsigned int    x;
+    unsigned int    y;
+    unsigned int    lpid;
+    giet_proc_xyp( &x, &y, &lpid );
 
     // recursively decrement count from bottom to root
@@ -247 +261 @@
         node->child1   = NULL;
 
-#if GIET_DEBUG_SBT
-giet_shr_printf("[DEBUG SBT] initialize node[%d][%d][%d] :"
+#if GIET_DEBUG_BARRIER
+giet_shr_printf("[DEBUG BARRIER] initialize sbt_node[%d][%d][%d] :"
                 " arity = %d / child0 = %x / child1 = %x\n", 
                 x, y, level, 
@@ -288 +302 @@
         node->child1   = barrier->node[x1][y1][level-1];
 
-#if GIET_DEBUG_SBT
-giet_shr_printf("[DEBUG SBT] initialize node[%d][%d][%d] :"
+#if GIET_DEBUG_BARRIER
+giet_shr_printf("[DEBUG BARRIER] initialize sbt_node[%d][%d][%d] :"
                 " arity = %d / child0 = %x / child1 = %x\n", 
                 x, y, level,