Changeset 693 for soft/giet_vm


Ignore:
Timestamp:
Aug 5, 2015, 6:46:14 PM (9 years ago)
Author:
guerin
Message:

remove last references to giet_shr_printf()

Location:
soft/giet_vm
Files:
7 edited

Legend:

Unmodified
Added
Removed

  • soft/giet_vm/applications/ocean/giet_utils.C

    r598 r693  
    102102
    103103    giet_proc_xyp(&cx, &cy, &lp);
    104     giet_shr_printf("Thread %d (%d:%d.%d) waiting\n", id, cx, cy, lp);
     104    giet_tty_printf("Thread %d (%d:%d.%d) waiting\n", id, cx, cy, lp);
    105105
    106106    if (lp == 0) {
    … …  
    212212        }
    213213    }
    214     giet_shr_printf("Thread %d launched\n", id);
     214    giet_tty_printf("Thread %d launched\n", id);
    215215
    216216    slave(&id);

  • soft/giet_vm/applications/ocean/giet_utils.H

    r581 r693  
    1414
    1515
    16 #define printf(...) giet_shr_printf(__VA_ARGS__)
     16#define printf(...) giet_tty_printf(__VA_ARGS__)
    1717
    1818extern const char *optarg;

  • soft/giet_vm/applications/ocean/null_macros/c.m4.null.GIET

    r581 r693  
    2323        asm volatile("nop\r\n");
    2424    }
    25     giet_shr_printf("Tas initialisés\n");
     25    giet_tty_printf("Tas initialisés\n");
    2626        sqt_barrier_init(&($1), nclusters_x, nclusters_y, procs_per_cluster);
    2727}')
    … …  
    4242
    4343define(WAIT_FOR_END, `{
    44         giet_shr_printf("Wait threads...\n");
     44        giet_tty_printf("Wait threads...\n");
    4545        BARRIER(bars->barrier)
    4646}')

  • soft/giet_vm/giet_libs/mwmr_channel.c

    r479 r693  
    2323unsigned int    lpid;
    2424giet_proc_xyp( &x, &y, &lpid );
    25 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] initialises fifo %x / "
     25giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] initialises fifo %x / "
    2626                " buffer = %x / width = %d / nitems = %d\n",
    2727                x, y, lpid, (unsigned int)mwmr, (unsigned int)buffer, width, nitems );
    … …  
    5050unsigned int    lpid;
    5151giet_proc_xyp( &x, &y, &lpid );
    52 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters nb_mwmr_write()"
     52giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters nb_mwmr_write()"
    5353                " : mwmr = %x / buffer = %x / items =  %d\n",
    5454                x, y, lpid, (unsigned int)mwmr, (unsigned int)buffer, items );
    … …  
    8888
    8989#if GIET_DEBUG_USER_MWMR
    90 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n",
     90giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n",
    9191                x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts );
    9292#endif
    … …  
    113113
    114114#if GIET_DEBUG_USER_MWMR
    115 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n",
     115giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n",
    116116                x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts );
    117117#endif
    … …  
    135135unsigned int    lpid;
    136136giet_proc_xyp( &x, &y, &lpid );
    137 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters nb_mwmr_read()"
     137giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters nb_mwmr_read()"
    138138                " : mwmr = %x / buffer = %x / items =  %d\n",
    139139                x, y, lpid, (unsigned int)mwmr, (unsigned int)buffer, items );
    … …  
    171171
    172172#if GIET_DEBUG_USER_MWMR
    173 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n",
     173giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n",
    174174                x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts );
    175175#endif
    … …  
    182182
    183183#if GIET_DEBUG_USER_MWMR
    184 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read nothing in fifo %x : sts = %d\n",
     184giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read nothing in fifo %x : sts = %d\n",
    185185                x, y, lpid, (unsigned int)mwmr, mwmr->sts );
    186186#endif
    … …  
    202202
    203203#if GIET_DEBUG_USER_MWMR
    204 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n",
     204giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n",
    205205                x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts );
    206206#endif
    … …  
    224224unsigned int    lpid;
    225225giet_proc_xyp( &x, &y, &lpid );
    226 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters mwmr_write()"
     226giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters mwmr_write()"
    227227                " : mwmr = %x / buffer = %x / items =  %d\n",
    228228                x, y, lpid, (unsigned int)mwmr, (unsigned int)buffer, items );
    … …  
    264264
    265265#if GIET_DEBUG_USER_MWMR
    266 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n",
     266giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n",
    267267                x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts );
    268268#endif
    … …  
    290290
    291291#if GIET_DEBUG_USER_MWMR
    292 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n",
     292giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] writes %d words in fifo %x : sts = %d\n",
    293293                x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts );
    294294#endif
    … …  
    314314unsigned int    lpid;
    315315giet_proc_xyp( &x, &y, &lpid );
    316 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters mwmr_read()"
     316giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] enters mwmr_read()"
    317317                " : mwmr = %x / buffer = %x / items =  %d\n",
    318318                x, y, lpid, (unsigned int)mwmr, (unsigned int)buffer, items );
    … …  
    352352
    353353#if GIET_DEBUG_USER_MWMR
    354 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n",
     354giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n",
    355355                x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts );
    356356#endif
    … …  
    378378
    379379#if GIET_DEBUG_USER_MWMR
    380 giet_shr_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n",
     380giet_tty_printf("\n[MWMR DEBUG] Proc[%d,%d,%d] read %d words in fifo %x : sts = %d\n",
    381381                x, y, lpid, nwords, (unsigned int)mwmr, mwmr->sts );
    382382#endif

  • soft/giet_vm/giet_libs/user_barrier.c

    r588 r693  
    3535unsigned int p;
    3636giet_proc_xyp( &x, &y, &p );
    37 giet_shr_printf("\n[DEBUG USER BARRIER] proc[%d,%d,%d] enters barrier_wait()\n",
     37giet_tty_printf("\n[DEBUG USER BARRIER] proc[%d,%d,%d] enters barrier_wait()\n",
    3838                x, y, p );
    3939#endif
    … …  
    8585
    8686#if GIET_DEBUG_USER_BARRIER
    87 giet_shr_printf("\n[DEBUG USER BARRIER] proc[%d,%d,%d] exit barrier_wait()\n",
     87giet_tty_printf("\n[DEBUG USER BARRIER] proc[%d,%d,%d] exit barrier_wait()\n",
    8888                x, y, p );
    8989#endif
    … …  
    126126
    127127#if GIET_DEBUG_USER_BARRIER
    128 giet_shr_printf("\n[DEBUG USER BARRIER] initialize sqt_node[%d][%d][%d] : arity = %d\n"
     128giet_tty_printf("\n[DEBUG USER BARRIER] initialize sqt_node[%d][%d][%d] : arity = %d\n"
    129129                " parent = %x / child0 = %x / child1 = %x / child2 = %x / child3 = %x\n",
    130130                x, y, level, node->arity,
    … …  
    175175
    176176#if GIET_DEBUG_USER_BARRIER
    177 giet_shr_printf("\n[DEBUG USER BARRIER] initialize sqt_node[%d][%d][%d] : arity = %d\n"
     177giet_tty_printf("\n[DEBUG USER BARRIER] initialize sqt_node[%d][%d][%d] : arity = %d\n"
    178178                " parent = %x / child0 = %x / child1 = %x / child0 = %x / child1 = %x\n",
    179179                x, y, level, node->arity,
    … …  
    220220    unsigned int side;
    221221    side   = (z < 2) ? 1 : (z < 3) ? 2 : (z < 5) ? 4 : (z < 9) ? 8 : 16;
    222 giet_shr_printf("\n[DEBUG USER BARRIER] sqt_nodes allocation\n"
     222giet_tty_printf("\n[DEBUG USER BARRIER] sqt_nodes allocation\n"
    223223                " x_size = %d / y_size = %d / levels = %d / side = %d\n",
    224224                x_size , y_size , levels , side );
    … …  
    248248
    249249#if GIET_DEBUG_USER_BARRIER
    250 giet_shr_printf("\n[DEBUG USER BARRIER] SQT node[%d][%d][%d] : vaddr = %x\n",
     250giet_tty_printf("\n[DEBUG USER BARRIER] SQT node[%d][%d][%d] : vaddr = %x\n",
    251251                x, y, l, (unsigned int)barrier->node[x][y][l] );
    252252#endif
    … …  
    285285unsigned int    pl;
    286286giet_proc_xyp( &px, &py, &pl );
    287 giet_shr_printf("\n[DEBUG USER BARRIER] P[%d,%d,%d] decrement SQT barrier node %x :\n"
     287giet_tty_printf("\n[DEBUG USER BARRIER] P[%d,%d,%d] decrement SQT barrier node %x :\n"
    288288                " level = %d / parent = %x / arity = %d / sense = %d / count = %d\n",
    289289                px , py , pl , (unsigned int)node ,
    … …  
    326326
    327327#if GIET_DEBUG_USER_BARRIER
    328 giet_shr_printf("\n[DEBUG USER BARRIER] P[%d,%d,%d] reset SQT barrier node %x :\n"
     328giet_tty_printf("\n[DEBUG USER BARRIER] P[%d,%d,%d] reset SQT barrier node %x :\n"
    329329                " level = %d / arity = %d / sense = %d / count = %d\n",
    330330                px , py , pl , (unsigned int)node ,
    … …  
    358358    giet_proc_xyp( &x, &y, &lpid );
    359359#if GIET_DEBUG_USER_BARRIER
    360 giet_shr_printf("[DEBUG SQT USER BARRIER] proc[%d,%d,%d] enters sqt_barrier_wait(). vaddr=%x. node=%x\n",
     360giet_tty_printf("[DEBUG SQT USER BARRIER] proc[%d,%d,%d] enters sqt_barrier_wait(). vaddr=%x. node=%x\n",
    361361                x, y, lpid, barrier, barrier->node[x][y][0] );
    362362#endif

  • soft/giet_vm/giet_libs/user_lock.c

    r501 r693  
    4949unsigned int    lpid;
    5050giet_proc_xyp( &x, &y, &lpid );
    51 giet_shr_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] get ticket = %d"
     51giet_tty_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] get ticket = %d"
    5252                " for lock %x at cycle %d (current = %d / free = %d)\n",
    5353                x, y, lpid, ticket,
    … …  
    6565               
    6666#if GIET_DEBUG_USER_LOCK
    67 giet_shr_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] get lock %x"
     67giet_tty_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] get lock %x"
    6868                " at cycle %d (current = %d / free = %d)\n",
    6969                x, y, lpid, (unsigned int)lock,
    … …  
    8787unsigned int    lpid;
    8888giet_proc_xyp( &x, &y, &lpid );
    89 giet_shr_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] release lock %x"
     89giet_tty_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] release lock %x"
    9090                " at cycle %d (current = %d / free = %d)\n",
    9191                x, y, lpid, (unsigned int)lock,
    … …  
    108108unsigned int    lpid;
    109109giet_proc_xyp( &x, &y, &lpid );
    110 giet_shr_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] init lock %x"
     110giet_tty_printf("\n[USER_LOCK DEBUG] P[%d,%d,%d] init lock %x"
    111111                " at cycle %d (current = %d / free = %d)\n",
    112112                x, y, lpid, (unsigned int)lock,

  • soft/giet_vm/giet_libs/user_sqt_lock.c

    r581 r693  
    4040
    4141#if GIET_DEBUG_USER_LOCK
    42 giet_shr_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] initialises SQT node[%d,%d,%d] : \n"
     42giet_tty_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] initialises SQT node[%d,%d,%d] : \n"
    4343      " parent = %x / childO = %x / child1 = %x / child2 = %x / child3 = %x\n",
    4444      px , py , pl , x , y , level ,
    … …  
    8585
    8686#if GIET_DEBUG_USER_LOCK
    87 giet_shr_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] initialises SQT node[%d,%d,%d] : \n"
     87giet_tty_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] initialises SQT node[%d,%d,%d] : \n"
    8888      " parent = %x / childO = %x / child1 = %x / child2 = %x / child3 = %x\n",
    8989      px , py , pl , x , y , level ,
    … …  
    134134giet_proc_xyp(&px, &py, &pl);
    135135unsigned int side   = (z < 2) ? 1 : (z < 3) ? 2 : (z < 5) ? 4 : (z < 9) ? 8 : 16;
    136 giet_shr_printf("\n[DEBUG USER SQT_LOCK] sqt_nodes allocation\n"
     136giet_tty_printf("\n[DEBUG USER SQT_LOCK] sqt_nodes allocation\n"
    137137                " x_size = %d / y_size = %d / levels = %d / side = %d\n",
    138138                x_size , y_size , levels , side );
    … …  
    162162
    163163#if GIET_DEBUG_USER_LOCK
    164 giet_shr_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] allocates SQT node[%d,%d,%d]"
     164giet_tty_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] allocates SQT node[%d,%d,%d]"
    165165               " : vaddr = %x\n",
    166166               px , py , pl , x , y , l , (unsigned int)lock->node[x][y][l] );
    … …  
    183183
    184184#if GIET_DEBUG_USER_LOCK
    185 giet_shr_printf("\n[DEBUG USER SQT_LOCK] SQT nodes initialisation completed\n");
     185giet_tty_printf("\n[DEBUG USER SQT_LOCK] SQT nodes initialisation completed\n");
    186186#endif
    187187
    … …  
    201201unsigned int    l;
    202202giet_proc_xyp(&x, &y, &l);
    203 giet_shr_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] get ticket %d for SQT lock %x"
     203giet_tty_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] get ticket %d for SQT lock %x"
    204204               " / level = %d / current = %d / free = %d\n",
    205205               x , y , l , ticket , (unsigned int)node ,
    … …  
    211211
    212212#if GIET_DEBUG_USER_LOCK
    213 giet_shr_printf("\n[DEBUG SQT_LOCK] P[%d,%d,%d] get SQT lock %x"
     213giet_tty_printf("\n[DEBUG SQT_LOCK] P[%d,%d,%d] get SQT lock %x"
    214214               " / level = %d / current = %d / free = %d\n",
    215215               x , y , l , (unsigned int)node ,
    … …  
    248248unsigned int    l;
    249249giet_proc_xyp(&x, &y, &l);
    250 giet_shr_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] release SQT lock %x"
     250giet_tty_printf("\n[DEBUG USER SQT_LOCK] P[%d,%d,%d] release SQT lock %x"
    251251               " / level = %d / current = %d / free = %d\n",
    252252               x , y , l , (unsigned int)node,
Note: See TracChangeset for help on using the changeset viewer.