Changeset 580 for soft/giet_vm/giet_libs/user_barrier.c

Timestamp:

May 28, 2015, 3:34:23 PM (9 years ago)

Author:

laurent

Message:

Try

File:

• soft/giet_vm/giet_libs/user_barrier.c (modified) (4 diffs)

soft/giet_vm/giet_libs/user_barrier.c

@@ -214 +214 @@
     // compute SQT levels
     unsigned int levels; 
-    unsigned int side; 
     unsigned int z = (x_size > y_size) ? x_size : y_size;
     levels = (z < 2) ? 1 : (z < 3) ? 2 : (z < 5) ? 3 : (z < 9) ? 4 : 5;
+
+#if GIET_DEBUG_USER_BARRIER
+    unsigned int side; 
     side   = (z < 2) ? 1 : (z < 3) ? 2 : (z < 5) ? 4 : (z < 9) ? 8 : 16;
-
-#if GIET_DEBUG_USER_BARRIER
 giet_shr_printf("\n[DEBUG USER BARRIER] sqt_nodes allocation\n"
                 " x_size = %d / y_size = %d / levels = %d / side = %d\n",
@@ -286 +286 @@
 giet_proc_xyp( &px, &py, &pl );
 giet_shr_printf("\n[DEBUG USER BARRIER] P[%d,%d,%d] decrement SQT barrier node %x :\n"
-                " level = %d / arity = %d / sense = %d / count = %d\n",
+                " level = %d / parent = %x / arity = %d / sense = %d / count = %d\n",
                 px , py , pl , (unsigned int)node , 
-                node->level , node->arity , node->sense , node->count );
+                node->level , node->parent, node->arity , node->sense , node->count );
 #endif
 
     // compute expected sense value 
     unsigned int expected;
+    
     if ( node->sense == 0) expected = 1;
     else                   expected = 0;
@@ -312 +313 @@
                   : "r" (pcount)
                   : "$2", "$8", "$9", "memory" );
-
+    
     if ( count == 1 )    // last task  
     {
         // decrement the parent node if the current node is not the root
-        if ( node->parent != NULL )      
+        if ( node->parent != NULL )      {
             sqt_barrier_decrement( node->parent );
+        }
 
         // reset the current node
@@ -355 +357 @@
     unsigned int    lpid;
     giet_proc_xyp( &x, &y, &lpid );
+#if GIET_DEBUG_USER_BARRIER
+giet_shr_printf("[DEBUG SQT USER BARRIER] proc[%d,%d,%d] enters sqt_barrier_wait(). vaddr=%x. node=%x\n", 
+                x, y, lpid, barrier, barrier->node[x][y][0] );
+#endif
 
     // recursively decrement count from bottom to root