Changeset 542

Timestamp:

Mar 30, 2015, 6:22:52 PM (9 years ago)

Author:

bellefin

Message:

Using the heap_init() function

File:

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

soft/giet_vm/applications/classif/main.c

@@ -33 +33 @@
 // The MWMR fifo descriptors array is defined as a global variable in cluster[0][0]. 
 //
-// Initialisation is done in two steps by the "load" & "store" tasks:
-// - Task "load" in cluster[0][0] initialises the barrier between all "load" tasks,
-//   allocates NIC & CMA RX channel, and starts the NIC_CMA RX transfer.
+// Initialisation is done in three steps by the "load" & "store" tasks:
+// - Task "load" in cluster[0][0] initialises the heaps in all clusters. Other tasks
+//   are waiting on the global_sync synchronisation variable.
+// - Then task "load" in cluster[0][0] initialises the barrier between all "load"
+//   tasks, allocates NIC & CMA RX channel, and starts the NIC_CMA RX transfer.
 //   Other "load" tasks are waiting on the load_sync synchronisation variable.
 //   Task "store" in cluster[0][0] initialises the barrier between all "store" tasks,
@@ -96 +98 @@
 
 // global synchro signaling global initialisation completion
-volatile unsigned int        load_sync  = 0; 
-volatile unsigned int        store_sync = 0; 
+volatile unsigned int        global_sync = 0;
+volatile unsigned int        load_sync   = 0; 
+volatile unsigned int        store_sync  = 0; 
 
 // instrumentation counters
@@ -117 +120 @@
 {
     // each "load" task get platform parameters
-    unsigned int    x_size;                                             // number of clusters in a row
+    unsigned int    x_size;                     // number of clusters in a row
     unsigned int    y_size;                     // number of clusters in a column
     unsigned int    nprocs;                     // number of processors per cluster
@@ -133 +136 @@
     giet_proc_xyp( &x, &y, &l );
 
-    // "load" task[0][0] initialises barrier between all load tasks,
-    // allocates the NIC & CMA RX channels, and start the NIC_CMA RX transfer.
+    // "load" task[0][0]
+    // - initialises the heap in every cluster
+    // - initialises barrier between all load tasks,
+    // - allocates the NIC & CMA RX channels, and start the NIC_CMA RX transfer.
     // Other "load" tasks wait completion
     if ( (x==0) && (y==0) )
@@ -141 +146 @@
                         "  x_size = %d / y_size = %d / nprocs = %d\n",
                         x , y , l , giet_proctime() , x_size, y_size, nprocs );
- 
+
+    unsigned int xid;  // x cluster coordinate index
+    unsigned int yid;  // y cluster coordinate index
+
+    for ( xid = 0 ; xid < x_size ; xid++ )
+      {
+        for ( yid = 0 ; yid < y_size ; yid++ )
+          {
+            heap_init( xid, yid );
+          }
+      }
+    
+        global_sync = 1;
+
         sqt_barrier_init( &rx_barrier, x_size , y_size , 1 );
         nic_rx_channel = giet_nic_rx_alloc( x_size , y_size );
@@ -271 +289 @@
     unsigned int    l;
     giet_proc_xyp( &x, &y, &l );
+
+    // "Store" tasks wait completion of heaps initialization
+    while ( global_sync == 0 ) asm volatile ("nop");
 
     // "store" task[0][0] initialises the barrier between all "store" tasks,
@@ -419 +440 @@
                         x , y , l , giet_proctime() , x_size, y_size, nprocs );
     }
- 
-    // all "analyse" tasks wait mwmr channels initialisation
+
+    // all "analyse" tasks wait heaps and mwmr channels initialisation
     while ( local_sync[x][y] == 0 ) asm volatile ("nop");