Changeset 295 for soft/giet_vm/gameoflife

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/gameoflife/main.c (modified) (6 diffs)

soft/giet_vm/gameoflife/main.c

@@ -20 +20 @@
 
 giet_barrier_t barriers[2];
+
+unsigned int init_ok = 1;
 
 #define NEW 0
@@ -80 +82 @@
 }
 
+//////////////////////////////////////////////////////
 void compute_new_gen(size_t base_line, size_t nb_line)
 {
    size_t x,y;
-   for (y = base_line; y < base_line + nb_line; y++){
-      for(x = 0; x < WIDTH ; x++) {
+   for (y = base_line; y < base_line + nb_line; y++)
+   {
+      for(x = 0; x < WIDTH ; x++) 
+      {
          world[NEW][y][x] = compute_cell(x,y);  
       }
@@ -90 +95 @@
 }
 
+////////////////////////////////////////////////////
 void display_world(size_t base_line, size_t nb_line)
 {
@@ -100 +106 @@
    }
 
-   if (giet_fb_sync_write(base_line * WIDTH , &world[NEW][base_line][0], nb_line * WIDTH))
-   {
-      PRINTF("Echec fb_sync_write\n");
-      giet_exit();
-   }
-   // TODO COLOR !
-   /*if (giet_fb_sync_write(base_line * WIDTH + WIDTH*HEIGHT , &world_yuv[base_line][0], nb_line * WIDTH))
-   {
-      PRINTF("Echec fb_sync_write\n");
-      giet_exit();
-   }*/
+   giet_fb_sync_write( base_line * WIDTH , 
+                       &world[NEW][base_line][0], 
+                       nb_line * WIDTH);
 }
 
+/////////////////////////////////////////////////////
 void grow_old_world(size_t base_line, size_t nb_line)
 {
    size_t x,y;
-   for (y = base_line; y < base_line + nb_line; y++){
-      for(x = 0; x < WIDTH ; x++) {
+   for (y = base_line; y < base_line + nb_line; y++)
+   {
+      for(x = 0; x < WIDTH ; x++) 
+      {
          world[OLD][y][x] = world[NEW][y][x];  
       }
    }
 }
-
-
 
 ////////////////////////////////////////
@@ -131 +130 @@
    unsigned int nlocal_procs  = NB_PROCS_MAX;               // processors per cluster
    unsigned int nclusters     = X_SIZE*Y_SIZE;              // number of clusters
-   unsigned int local_id      = proc_id % nlocal_procs;     // local processor id
-   unsigned int cluster_id    = proc_id / nlocal_procs;     // cluster id
    unsigned int nglobal_procs = nclusters * nlocal_procs;   // number of tasks
    size_t i;
@@ -142 +139 @@
 
    //  barriers initialization
-   barrier_init(&barriers[0], nglobal_procs);
-   barrier_init(&barriers[1], nglobal_procs);
+   if ( proc_id == 0 )
+   {
+      barrier_init(&barriers[0], nglobal_procs);
+      barrier_init(&barriers[1], nglobal_procs);
+
+      init_ok = 0;
+   }
+   else
+   {
+      while ( init_ok == 1 );
+   }
+
    init_world(base_line, nb_line);