Index: /soft/giet_vm/applications/ocean/giet_utils.C =================================================================== --- /soft/giet_vm/applications/ocean/giet_utils.C (revision 692) +++ /soft/giet_vm/applications/ocean/giet_utils.C (revision 693) @@ -102,5 +102,5 @@ giet_proc_xyp(&cx, &cy, &lp); - giet_shr_printf("Thread %d (%d:%d.%d) waiting\n", id, cx, cy, lp); + giet_tty_printf("Thread %d (%d:%d.%d) waiting\n", id, cx, cy, lp); if (lp == 0) { @@ -212,5 +212,5 @@ } } - giet_shr_printf("Thread %d launched\n", id); + giet_tty_printf("Thread %d launched\n", id); slave(&id); Index: /soft/giet_vm/applications/ocean/giet_utils.H =================================================================== --- /soft/giet_vm/applications/ocean/giet_utils.H (revision 692) +++ /soft/giet_vm/applications/ocean/giet_utils.H (revision 693) @@ -14,5 +14,5 @@ -#define printf(...) giet_shr_printf(__VA_ARGS__) +#define printf(...) giet_tty_printf(__VA_ARGS__) extern const char *optarg; Index: /soft/giet_vm/applications/ocean/null_macros/c.m4.null.GIET =================================================================== --- /soft/giet_vm/applications/ocean/null_macros/c.m4.null.GIET (revision 692) +++ /soft/giet_vm/applications/ocean/null_macros/c.m4.null.GIET (revision 693) @@ -23,5 +23,5 @@ asm volatile("nop\r\n"); } - giet_shr_printf("Tas initialisés\n"); + giet_tty_printf("Tas initialisés\n"); sqt_barrier_init(&($1), nclusters_x, nclusters_y, procs_per_cluster); }') @@ -42,5 +42,5 @@ define(WAIT_FOR_END, `{ - giet_shr_printf("Wait threads...\n"); + giet_tty_printf("Wait threads...\n"); BARRIER(bars->barrier) }') Index: /soft/giet_vm/giet_libs/mwmr_channel.c =================================================================== --- /soft/giet_vm/giet_libs/mwmr_channel.c (revision 692) +++ /soft/giet_vm/giet_libs/mwmr_channel.c (revision 693) @@ -23,5 +23,5 @@ unsigned int lpid; giet_proc_xyp( &x, &y, &lpid ); -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] initialises fifo %x / " +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] initialises fifo %x / " " buffer = %x / width = %d / nitems = %d\n", x, y, lpid, (unsigned int)mwmr, (unsigned int)buffer, width, nitems ); @@ -50,5 +50,5 @@ unsigned int lpid; giet_proc_xyp( &x, &y, &lpid ); -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters nb_mwmr_write()" +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters nb_mwmr_write()" " : mwmr = %x / buffer = %x / items = %d\n", x, y, lpid, (unsigned int)mwmr, (unsigned int)buffer, items ); @@ -88,5 +88,5 @@ #if GIET_DEBUG_USER_MWMR -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n", +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n", x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts ); #endif @@ -113,5 +113,5 @@ #if GIET_DEBUG_USER_MWMR -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n", +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n", x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts ); #endif @@ -135,5 +135,5 @@ unsigned int lpid; giet_proc_xyp( &x, &y, &lpid ); -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters nb_mwmr_read()" +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters nb_mwmr_read()" " : mwmr = %x / buffer = %x / items = %d\n", x, y, lpid, (unsigned int)mwmr, (unsigned int)buffer, items ); @@ -171,5 +171,5 @@ #if GIET_DEBUG_USER_MWMR -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n", +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n", x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts ); #endif @@ -182,5 +182,5 @@ #if GIET_DEBUG_USER_MWMR -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read nothing in fifo %x : sts = %d\n", +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read nothing in fifo %x : sts = %d\n", x, y, lpid, (unsigned int)mwmr, mwmr->sts ); #endif @@ -202,5 +202,5 @@ #if GIET_DEBUG_USER_MWMR -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n", +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n", x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts ); #endif @@ -224,5 +224,5 @@ unsigned int lpid; giet_proc_xyp( &x, &y, &lpid ); -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters mwmr_write()" +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters mwmr_write()" " : mwmr = %x / buffer = %x / items = %d\n", x, y, lpid, (unsigned int)mwmr, (unsigned int)buffer, items ); @@ -264,5 +264,5 @@ #if GIET_DEBUG_USER_MWMR -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n", +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n", x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts ); #endif @@ -290,5 +290,5 @@ #if GIET_DEBUG_USER_MWMR -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n", +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n", x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts ); #endif @@ -314,5 +314,5 @@ unsigned int lpid; giet_proc_xyp( &x, &y, &lpid ); -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters mwmr_read()" +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters mwmr_read()" " : mwmr = %x / buffer = %x / items = %d\n", x, y, lpid, (unsigned int)mwmr, (unsigned int)buffer, items ); @@ -352,5 +352,5 @@ #if GIET_DEBUG_USER_MWMR -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n", +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n", x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts ); #endif @@ -378,5 +378,5 @@ #if GIET_DEBUG_USER_MWMR -giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n", +giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n", x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts ); #endif Index: /soft/giet_vm/giet_libs/user_barrier.c =================================================================== --- /soft/giet_vm/giet_libs/user_barrier.c (revision 692) +++ /soft/giet_vm/giet_libs/user_barrier.c (revision 693) @@ -35,5 +35,5 @@ unsigned int p; giet_proc_xyp( &x, &y, &p ); -giet_shr_printf("\n[DEBUG USER BARRIER] proc[%d,%d,%d] enters barrier_wait()\n", +giet_tty_printf("\n[DEBUG USER BARRIER] proc[%d,%d,%d] enters barrier_wait()\n", x, y, p ); #endif @@ -85,5 +85,5 @@ #if GIET_DEBUG_USER_BARRIER -giet_shr_printf("\n[DEBUG USER BARRIER] proc[%d,%d,%d] exit barrier_wait()\n", +giet_tty_printf("\n[DEBUG USER BARRIER] proc[%d,%d,%d] exit barrier_wait()\n", x, y, p ); #endif @@ -126,5 +126,5 @@ #if GIET_DEBUG_USER_BARRIER -giet_shr_printf("\n[DEBUG USER BARRIER] initialize sqt_node[%d][%d][%d] : arity = %d\n" +giet_tty_printf("\n[DEBUG USER BARRIER] initialize sqt_node[%d][%d][%d] : arity = %d\n" " parent = %x / child0 = %x / child1 = %x / child2 = %x / child3 = %x\n", x, y, level, node->arity, @@ -175,5 +175,5 @@ #if GIET_DEBUG_USER_BARRIER -giet_shr_printf("\n[DEBUG USER BARRIER] initialize sqt_node[%d][%d][%d] : arity = %d\n" +giet_tty_printf("\n[DEBUG USER BARRIER] initialize sqt_node[%d][%d][%d] : arity = %d\n" " parent = %x / child0 = %x / child1 = %x / child0 = %x / child1 = %x\n", x, y, level, node->arity, @@ -220,5 +220,5 @@ unsigned int side; side = (z < 2) ? 1 : (z < 3) ? 2 : (z < 5) ? 4 : (z < 9) ? 8 : 16; -giet_shr_printf("\n[DEBUG USER BARRIER] sqt_nodes allocation\n" +giet_tty_printf("\n[DEBUG USER BARRIER] sqt_nodes allocation\n" " x_size = %d / y_size = %d / levels = %d / side = %d\n", x_size , y_size , levels , side ); @@ -248,5 +248,5 @@ #if GIET_DEBUG_USER_BARRIER -giet_shr_printf("\n[DEBUG USER BARRIER] SQT node[%d][%d][%d] : vaddr = %x\n", +giet_tty_printf("\n[DEBUG USER BARRIER] SQT node[%d][%d][%d] : vaddr = %x\n", x, y, l, (unsigned int)barrier->node[x][y][l] ); #endif @@ -285,5 +285,5 @@ unsigned int pl; giet_proc_xyp( &px, &py, &pl ); -giet_shr_printf("\n[DEBUG USER BARRIER] P[%d,%d,%d] decrement SQT barrier node %x :\n" +giet_tty_printf("\n[DEBUG USER BARRIER] P[%d,%d,%d] decrement SQT barrier node %x :\n" " level = %d / parent = %x / arity = %d / sense = %d / count = %d\n", px , py , pl , (unsigned int)node , @@ -326,5 +326,5 @@ #if GIET_DEBUG_USER_BARRIER -giet_shr_printf("\n[DEBUG USER BARRIER] P[%d,%d,%d] reset SQT barrier node %x :\n" +giet_tty_printf("\n[DEBUG USER BARRIER] P[%d,%d,%d] reset SQT barrier node %x :\n" " level = %d / arity = %d / sense = %d / count = %d\n", px , py , pl , (unsigned int)node , @@ -358,5 +358,5 @@ 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", +giet_tty_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 Index: /soft/giet_vm/giet_libs/user_lock.c =================================================================== --- /soft/giet_vm/giet_libs/user_lock.c (revision 692) +++ /soft/giet_vm/giet_libs/user_lock.c (revision 693) @@ -49,5 +49,5 @@ unsigned int lpid; giet_proc_xyp( &x, &y, &lpid ); -giet_shr_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] get ticket = %d" +giet_tty_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] get ticket = %d" " for lock %x at cycle %d (current = %d / free = %d)\n", x, y, lpid, ticket, @@ -65,5 +65,5 @@ #if GIET_DEBUG_USER_LOCK -giet_shr_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] get lock %x" +giet_tty_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] get lock %x" " at cycle %d (current = %d / free = %d)\n", x, y, lpid, (unsigned int)lock, @@ -87,5 +87,5 @@ unsigned int lpid; giet_proc_xyp( &x, &y, &lpid ); -giet_shr_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] release lock %x" +giet_tty_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] release lock %x" " at cycle %d (current = %d / free = %d)\n", x, y, lpid, (unsigned int)lock, @@ -108,5 +108,5 @@ unsigned int lpid; giet_proc_xyp( &x, &y, &lpid ); -giet_shr_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] init lock %x" +giet_tty_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] init lock %x" " at cycle %d (current = %d / free = %d)\n", x, y, lpid, (unsigned int)lock, Index: /soft/giet_vm/giet_libs/user_sqt_lock.c =================================================================== --- /soft/giet_vm/giet_libs/user_sqt_lock.c (revision 692) +++ /soft/giet_vm/giet_libs/user_sqt_lock.c (revision 693) @@ -40,5 +40,5 @@ #if GIET_DEBUG_USER_LOCK -giet_shr_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] initialises SQT node[%d,%d,%d] : \n" +giet_tty_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] initialises SQT node[%d,%d,%d] : \n" " parent = %x / childO = %x / child1 = %x / child2 = %x / child3 = %x\n", px , py , pl , x , y , level , @@ -85,5 +85,5 @@ #if GIET_DEBUG_USER_LOCK -giet_shr_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] initialises SQT node[%d,%d,%d] : \n" +giet_tty_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] initialises SQT node[%d,%d,%d] : \n" " parent = %x / childO = %x / child1 = %x / child2 = %x / child3 = %x\n", px , py , pl , x , y , level , @@ -134,5 +134,5 @@ giet_proc_xyp(&px, &py, &pl); unsigned int side = (z < 2) ? 1 : (z < 3) ? 2 : (z < 5) ? 4 : (z < 9) ? 8 : 16; -giet_shr_printf("\n[DEBUG USER SQT_LOCK] sqt_nodes allocation\n" +giet_tty_printf("\n[DEBUG USER SQT_LOCK] sqt_nodes allocation\n" " x_size = %d / y_size = %d / levels = %d / side = %d\n", x_size , y_size , levels , side ); @@ -162,5 +162,5 @@ #if GIET_DEBUG_USER_LOCK -giet_shr_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] allocates SQT node[%d,%d,%d]" +giet_tty_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] allocates SQT node[%d,%d,%d]" " : vaddr = %x\n", px , py , pl , x , y , l , (unsigned int)lock->node[x][y][l] ); @@ -183,5 +183,5 @@ #if GIET_DEBUG_USER_LOCK -giet_shr_printf("\n[DEBUG USER SQT_LOCK] SQT nodes initialisation completed\n"); +giet_tty_printf("\n[DEBUG USER SQT_LOCK] SQT nodes initialisation completed\n"); #endif @@ -201,5 +201,5 @@ unsigned int l; giet_proc_xyp(&x, &y, &l); -giet_shr_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] get ticket %d for SQT lock %x" +giet_tty_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] get ticket %d for SQT lock %x" " / level = %d / current = %d / free = %d\n", x , y , l , ticket , (unsigned int)node , @@ -211,5 +211,5 @@ #if GIET_DEBUG_USER_LOCK -giet_shr_printf("\n[DEBUG SQT_LOCK] P[%d,%d,%d] get SQT lock %x" +giet_tty_printf("\n[DEBUG SQT_LOCK] P[%d,%d,%d] get SQT lock %x" " / level = %d / current = %d / free = %d\n", x , y , l , (unsigned int)node , @@ -248,5 +248,5 @@ unsigned int l; giet_proc_xyp(&x, &y, &l); -giet_shr_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] release SQT lock %x" +giet_tty_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] release SQT lock %x" " / level = %d / current = %d / free = %d\n", x , y , l , (unsigned int)node,