Changeset 432 for soft/giet_vm/applications/convol/main.c

Timestamp:

Oct 4, 2014, 4:33:31 PM (10 years ago)

Author:

alain

Message:

1) Introduce the "applications" directory.
2) Introduce the fixed format (X_WIDTH / Y_WIDTH / P_WIDTH) for processor index in all applications.

Location:

soft/giet_vm/applications

Files:

• . (added)
• convol (moved) (moved from soft/giet_vm/convol)
• convol/main.c (modified) (10 diffs)

soft/giet_vm/applications/convol/main.c

@@ -94 +94 @@
     int z; // vertical filter index for loops
 
+    // processor identifiers
+    unsigned int x;                                           // x coordinate
+    unsigned int y;                                           // y coordinate
+    unsigned int lpid;                                        // local proc/task id
+    giet_proc_xyp( &x, &y, &lpid );
+
     int          file        = 0;                             // file descriptor
-    unsigned int pid         = giet_procid();                 // processor id
     unsigned int nprocs      = NB_PROCS_MAX;                  // procs per cluster
     unsigned int nclusters   = NB_CLUSTERS;                   // number of clusters
-    unsigned int lpid        = pid % nprocs;                  // local task id
-    unsigned int cluster_xy  = pid / nprocs;                  // cluster index
-    unsigned int x           = cluster_xy >> Y_WIDTH;         // x coordinate
-    unsigned int y           = cluster_xy & ((1<<Y_WIDTH)-1); // y coordinate
     unsigned int cluster_id  = (x * Y_SIZE) + y;              // continuous cluster index
     unsigned int task_id     = (cluster_id * nprocs) + lpid;  // continuous task index
@@ -145 +146 @@
     ///////////////////////////////////////////////////////////////////
     
-    if ( pid == 0 )
+    if ( (x==0) && (y==0) && (lpid==0) )
     {
         giet_shr_printf("\n[CONVOL] task[0,0,0] starts barrier init at cycle %d\n" 
@@ -237 +238 @@
     // Other tasks are waiting on the init_ok condition.
     //////////////////////////////////////////////////////////////////////////
-    if ( pid == 0 )
+    if ( (x==0) && (y==0) && (lpid==0) )
     {
         // open file
@@ -331 +332 @@
                  x, y, lpid, date );
 #else
-if ( pid == 0 ) giet_shr_printf( "\n[CONVOL] task[0,0,0] starts horizontal filter"
-                                 " at cycle %d\n", date );
+if ( (x==0) && (y==0) && (lpid==0) ) 
+giet_shr_printf( "\n[CONVOL] task[0,0,0] starts horizontal filter"
+                 " at cycle %d\n", date );
 #endif
 
@@ -404 +406 @@
                  x, y, lpid, date );
 #else
-if ( pid == 0 ) giet_shr_printf( "\n[CONVOL] task[0,0,0] completes horizontal filter"
-                                 " at cycle %d\n", date );
+if ( (x==0) && (y==0) && (lpid==0) ) 
+giet_shr_printf( "\n[CONVOL] task[0,0,0] completes horizontal filter"
+                 " at cycle %d\n", date );
 #endif
 
@@ -433 +436 @@
                  x, y, lpid, date );
 #else
-if ( pid == 0 ) giet_shr_printf( "\n[CONVOL] task[0,0,0] starts vertical filter"
-                                 " at cycle %d\n", date );
+if ( (x==0) && (y==0) && (lpid==0) ) 
+giet_shr_printf( "\n[CONVOL] task[0,0,0] starts vertical filter"
+                 " at cycle %d\n", date );
 #endif
 
@@ -522 +526 @@
                  x, y, lpid, date );
 #else
-if ( pid == 0 ) giet_shr_printf( "\n[CONVOL] task[0,0,0] completes vertical filter"
-                                 " at cycle %d\n", date );
+if ( (x==0) && (y==0) && (lpid==0) ) 
+giet_shr_printf( "\n[CONVOL] task[0,0,0] completes vertical filter"
+                 " at cycle %d\n", date );
 #endif
 
@@ -548 +553 @@
                  x, y, lpid, date);
 #else
-if ( pid == 0 ) giet_shr_printf( "\n[CONVOL] task[0,0,0] starts final display"
-                                 " at cycle %d\n", date );
+if ( (x==0) && (y==0) && (lpid==0) ) 
+giet_shr_printf( "\n[CONVOL] task[0,0,0] starts final display"
+                 " at cycle %d\n", date );
 #endif
 
@@ -579 +585 @@
                  x, y, lpid, date);
 #else
-if ( pid == 0 ) giet_shr_printf( "\n[CONVOL] task[0,0,0] completes final display"
-                                 " at cycle %d\n", date );
+if ( (x==0) && (y==0) && (lpid==0) ) 
+giet_shr_printf( "\n[CONVOL] task[0,0,0] completes final display"
+                 " at cycle %d\n", date );
 #endif
      
@@ -596 +603 @@
     /////////////////////////////////////////////////////////
 
-    if ( pid == 0 )
+    if ( (x==0) && (y==0) && (lpid==0) )
     {
         date  = giet_proctime();