Changeset 687

Timestamp:

Aug 4, 2015, 11:21:24 AM (9 years ago)

Author:

alain

Message:

Introduce the ps command in shell.
Adapt the router application.

Location:

soft/giet_vm/applications

Files:

• router/main.c (modified) (9 diffs)
• shell/main.c (modified) (2 diffs)
• sort/main.c (modified) (1 diff)

soft/giet_vm/applications/router/main.c

@@ -4 +4 @@
 // author : Alain Greiner
 /////////////////////////////////////////////////////////////////////////////////////////////
-// This multi-threaded application emulates a packet routing communication application,
-// described as a TCG (Task and Communication Graph).
+// This multi-threaded application illustrates "task-farm" parallelism.
+// It is described as a TCG (Task and Communication Graph).
 // It contains 2 + N tasks : one "producer", one "consumer" and N "router")
 // It contains 2 MWMR channels : "fifo_in" and "fifo_out".
@@ -12 +12 @@
 // - The "consumer" task read token from "fifo_out" and displays instrumentation results.
 // Token are indexed (by the producer) from 0 to NMAX-1.
-// The router task contain a random delay emulating a variable processing time.
+// The router task contains a random delay emulating a variable processing time.
 //
 // This application is intended to run on a multi-processors, multi-clusters architecture,
@@ -28 +28 @@
 //   Each entry contain the arrival order to the consumer task.
 /////////////////////////////////////////////////////////////////////////////////////////////
+// Implementation note:
+// The synchronisation variables fifo_in, fifo_out, and tty_lock are initialised by the
+// "producer" task. Other tasks are waiting on the init_ok variable until completion.
+/////////////////////////////////////////////////////////////////////////////////////////////
+
 
 #include "stdio.h"
@@ -34 +39 @@
 #include "hard_config.h"
 
+#define VERBOSE  1
+#define NMAX     50           // total number of token
+#define DEPTH    20       // MWMR channels depth
 
-#define NMAX   50                       // total number of token
-#define DEPTH  20           // MWMR channels depth
-
-//////////////// MWMR channels and associated buffers  /////////////////////
+// MWMR channels and associated buffers
 
 __attribute__((section (".data_in")))  mwmr_channel_t fifo_in;
@@ -46 +51 @@
 __attribute__((section (".data_out"))) unsigned int   buf_out[DEPTH];
  
-//////////////// Instrumentation Counters //////////////////////////////////
+// Instrumentation Counters
 
 __attribute__((section (".data_out")))  unsigned int consumer_tab[NMAX];
 __attribute__((section (".data_out")))  unsigned int router_tab[NMAX];
 
+// synchronisation variables
 
+unsigned int  init_ok = 0;
 
 /////////////////////////////////////////////
@@ -63 +70 @@
     unsigned int    x;
     unsigned int    y;
-    unsigned int    lpid;
-    giet_proc_xyp( &x, &y, &lpid );
+    unsigned int    p;
+    giet_proc_xyp( &x , &y , &p );
 
-    giet_shr_printf("\n*** Starting task producer on P[%d,%d,%d] at cycle %d\n", 
-                    x, y, lpid, giet_proctime() );
+    // allocates a private TTY
+    giet_tty_alloc( 0 );
+
+    // initialises TTY lock
+    // lock_init( &tty_lock );
 
     // initializes fifo_in
-    mwmr_init( &fifo_in, buf_in, 1 , DEPTH );
+    mwmr_init( &fifo_in  , buf_in  , 1 , DEPTH );
 
-    // main loop : display token value = source index
+    // initializes fifo_out
+    mwmr_init( &fifo_out , buf_out , 1 , DEPTH );
+
+    init_ok = 1;
+
+    giet_tty_printf("\n[Producer] completes initialisation on P[%d,%d,%d] at cycle %d\n", 
+                    x , y , p , giet_proctime() );
+
+    // main loop 
     for(n = 0 ; n < NMAX ; n++) 
     { 
         buf = n;
         mwmr_write( &fifo_in , &buf , 1 );
+
+        if ( VERBOSE ) 
+        giet_tty_printf(" - token %d sent at cycle %d\n", n , giet_proctime() );
     }
 
@@ -92 +113 @@
     unsigned int    x;
     unsigned int    y;
-    unsigned int    lpid;
-    giet_proc_xyp( &x, &y, &lpid );
+    unsigned int    p;
+    giet_proc_xyp( &x, &y, &p );
 
-    giet_shr_printf("\n*** Starting task consumer on P[%d,%d,%d] at cycle %d\n", 
-                    x, y, lpid, giet_proctime() );
+    // allocates a private TTY
+    giet_tty_alloc( 0 );
 
-    // initializes fifo_out 
-    mwmr_init( &fifo_out, buf_out, 1 , DEPTH );
+    while ( init_ok == 0 ) asm volatile( "nop" );
 
-    // main loop : register token arrival index and value
+    giet_tty_printf("\n[Consumer] starts execution on P[%d,%d,%d] at cycle %d\n", 
+                    x, y, p, giet_proctime() );
+
+    // main loop 
     for( n = 0 ; n < NMAX ; n++ ) 
     { 
         mwmr_read( &fifo_out , &buf , 1 );
         consumer_tab[n] = buf;
+
+        if ( VERBOSE ) 
+        giet_tty_printf(" - token %d received at cycle %d\n", buf , giet_proctime() );
     }
 
     // instrumentation display
-    giet_shr_printf("\n");
+    giet_tty_printf("\n[Consumer] displays instrumentation results\n");
     for( n = 0 ; n < NMAX ; n++ )
     {
-        giet_shr_printf("@@@ arrival = %d / value = %d / router = %x\n",
-                        n, consumer_tab[n], router_tab[n] );
+        giet_tty_printf(" - arrival = %d / value = %d / router = %x\n",
+                        n , consumer_tab[n] , router_tab[n] );
     }
 
-    giet_exit( "Consumer task completed");
+    giet_exit( "Consumer completed" );
 
 } // end consumer()
@@ -130 +156 @@
     unsigned int    x;
     unsigned int    y;
-    unsigned int    lpid;
-    giet_proc_xyp( &x, &y, &lpid );
+    unsigned int    p;
+    giet_proc_xyp( &x, &y, &p );
 
-    giet_shr_printf("\n*** Starting task router on P[%d,%d,%d] at cycle %d\n", 
-                    x, y, lpid, giet_proctime() );
+    // allocates a private TTY
+    giet_tty_alloc( 0 );
 
-    // waiting fifo_in and fifo_out initialisation
-    while( (fifo_in.depth == 0) || (fifo_out.depth == 0) ) asm volatile( "nop" ); 
+    giet_tty_printf("\n[Router] starts execution on P[%d,%d,%d] at cycle %d\n", 
+                    x, y, p, giet_proctime() );
+
+    while ( init_ok == 0 ) asm volatile( "nop" );
 
     // main loop
@@ -147 +175 @@
         for ( n = 0 ; n < tempo ; n++ ) asm volatile ( "nop" );
 
-        router_tab[buf] = (x<<(Y_WIDTH + P_WIDTH)) + (y<<P_WIDTH) + lpid;
+        router_tab[buf] = (x<<(Y_WIDTH + P_WIDTH)) + (y<<P_WIDTH) + p;
 
         mwmr_write( &fifo_out , &buf , 1 );
+
+        if ( VERBOSE ) 
+        giet_tty_printf(" - token %d routed at cycle %d\n", buf , giet_proctime() );
     }
 } // end router

soft/giet_vm/applications/shell/main.c

@@ -245 +245 @@
         giet_tty_printf("\n  error : %s cannot be killed\n", argv[0] );
     }
+}
+
+///////////////////////////////////////////////
+static void cmd_ps(int argc, char** argv)
+{
+    giet_tasks_status();
 }
 
@@ -260 +266 @@
     { "exec",       cmd_exec },
     { "kill",       cmd_kill },
+    { "ps",         cmd_ps },
     { NULL,         NULL }
 };

soft/giet_vm/applications/sort/main.c

@@ -25 +25 @@
 #include "user_lock.h"
 
-#define ARRAY_LENGTH    0x1000
+#define ARRAY_LENGTH    0x400
 #define IPT             (ARRAY_LENGTH / threads) // ITEMS PER THREAD