Changeset 295 for soft/giet_vm/router

Timestamp:

Mar 26, 2014, 6:44:44 PM (10 years ago)

Author:

alain

Message:

Introducing a major release, to suppoort the tsar_generic_leti platform
and the various (external or internal) peripherals configurations.
The map.xml format has been modified, in order to support the new
vci_iopic componentand a new policy for peripherals initialisation.
The IRQs are nom described in the XICU and IOPIC components
(and not anymore in the processors).
To enforce this major change, the map.xml file signature changed:
The signature value must be: 0xDACE2014

This new release has been tested on the tsar_generic_leti platform
for the following mappings:

• 4c_4p_sort_leti
• 4c_4p_sort_leti_ext
• 4c_4p_transpose_leti
• 4c_4p_transpose_leti_ext
• 4c_1p_four_leti_ext

File:

• soft/giet_vm/router/main.c (modified) (7 diffs)

soft/giet_vm/router/main.c

@@ -2 +2 @@
 #include "mwmr_channel.h"
 #include "mapping_info.h"
+#include "hard_config.h"
 
-#define NMAX 200
+#define NMAX 50
 
 /////////////////////////////////////////////
@@ -13 +14 @@
     mwmr_channel_t*     mwmr;
 
-    giet_tty_printf( "*** Starting task producer on processor %d", giet_procid() );
-    giet_tty_printf( " at cycle %d ***\n\n", giet_proctime() );
+    unsigned int    procid     = giet_procid();
+    unsigned int    cluster_xy = procid/NB_PROCS_MAX;
+    unsigned int    lpid       = procid%NB_PROCS_MAX;
+    unsigned int    x          = cluster_xy >> Y_WIDTH;
+    unsigned int    y          = cluster_xy & ((1<<Y_WIDTH)-1);
 
-    if( giet_vobj_get_vbase( "router" , 
-                             "mwmr_in", 
-                             VOBJ_TYPE_MWMR, 
-                             (void*)&mwmr ) )
-    {
-        giet_tty_printf( "\n[ERROR] in producer task :\n");
-        giet_tty_printf( "          undefined <mwmr_in> channel: %d\n", mwmr);
-        giet_tty_printf( "*** &mwmr_in = %x\n\n", (unsigned int)mwmr );
-        giet_exit();
-    }
+    giet_tty_printf( "*** Starting task producer on processor[%d,%d,%d] at cycle %d\n\n", 
+                      x, y, lpid, giet_proctime() );
+
+    giet_vobj_get_vbase( "router" , 
+                         "mwmr_in", 
+                         (void*)&mwmr );
 
     // main loop : display token value = source index
@@ -35 +35 @@
     }
 
-    giet_tty_printf( "\n*** Completing producer task at cycle %d ***\n", giet_proctime());
-    giet_exit();
+    giet_exit( "Producer task completed");
 
 } // end producer()
@@ -47 +46 @@
     mwmr_channel_t*     mwmr;
 
-    giet_tty_printf( "*** Starting task consumer on processor %d", giet_procid() );
-    giet_tty_printf( " at cycle %d ***\n\n", giet_proctime() );
+    unsigned int    procid     = giet_procid();
+    unsigned int    cluster_xy = procid/NB_PROCS_MAX;
+    unsigned int    lpid       = procid%NB_PROCS_MAX;
+    unsigned int    x          = cluster_xy >> Y_WIDTH;
+    unsigned int    y          = cluster_xy & ((1<<Y_WIDTH)-1);
 
-    if ( giet_vobj_get_vbase( "router" , 
-                              "mwmr_out", 
-                              VOBJ_TYPE_MWMR, 
-                              (void*)&mwmr ) )
-    {
-        giet_tty_printf( "\n[ERROR] in consumer task :\n");
-        giet_tty_printf( "          undefined <mwmr_out> channel\n");
-        giet_exit();
-    }
+    giet_tty_printf( "*** Starting task consumer on processor[%d,%d,%d] at cycle %d\n\n", 
+                      x, y, lpid, giet_proctime() );
+
+    giet_vobj_get_vbase( "router" , 
+                         "mwmr_out", 
+                         (void*)&mwmr );
 
     // main loop : display token arrival index and value
@@ -67 +66 @@
     }
 
-    giet_tty_printf( "\n*** Completing consumer task at cycle %d ***\n", giet_proctime());
-    giet_exit();
+    giet_exit( "Consumer task completed");
 
 } // end consumer()
@@ -76 +74 @@
 {
     unsigned int        buf;
-    unsigned int        x;
+    unsigned int        n;
     unsigned int        tempo;
     mwmr_channel_t*     mwmr_in ;
     mwmr_channel_t* mwmr_out ;
 
-    
-    giet_tty_printf( "*** Starting task router on processor %d", giet_procid() ); 
-    giet_tty_printf( " at cycle %d ***\n\n", giet_proctime() );
+    unsigned int    procid     = giet_procid();
+    unsigned int    cluster_xy = procid/NB_PROCS_MAX;
+    unsigned int    lpid       = procid%NB_PROCS_MAX;
+    unsigned int    x          = cluster_xy >> Y_WIDTH;
+    unsigned int    y          = cluster_xy & ((1<<Y_WIDTH)-1);
 
-    if ( giet_vobj_get_vbase( "router" , 
-                              "mwmr_out", 
-                              VOBJ_TYPE_MWMR, 
-                              (void*)&mwmr_out ) )
-    {
-        giet_tty_printf( "\n[ERROR] in router task :\n");
-        giet_tty_printf( "          undefined <mwmr_in> channel\n");
-        giet_exit();
-    }
+    giet_tty_printf( "*** Starting task router on processor[%d,%d,%d] at cycle %d\n\n", 
+                      x, y, lpid, giet_proctime() );
 
-    if (  giet_vobj_get_vbase( "router" , 
-                               "mwmr_in", 
-                               VOBJ_TYPE_MWMR, 
-                               (void*)&mwmr_in ) )
-    {
-        giet_tty_printf( "\n[ERROR] in router task :\n");
-        giet_tty_printf( "          undefined <mwmr_out> channel\n");
-        giet_exit();
-    }
+    giet_vobj_get_vbase( "router" , 
+                         "mwmr_out", 
+                         (void*)&mwmr_out );
 
+    giet_vobj_get_vbase( "router" , 
+                         "mwmr_in", 
+                         (void*)&mwmr_in );
     // main loop
     while(1)
@@ -110 +100 @@
         mwmr_read( mwmr_in , &buf , 1 );
         tempo = giet_rand() >> 6;
-        for ( x = 0 ; x < tempo ; x++ ) asm volatile ("");
+        for ( n = 0 ; n < tempo ; n++ ) asm volatile ("");
         giet_tty_printf( "token value : %d / temporisation = %d\n", buf, tempo);
         mwmr_write( mwmr_out, &buf , 1 );