Changeset 432 for soft/giet_vm/applications/transpose/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)
• transpose (moved) (moved from soft/giet_vm/transpose)
• transpose/main.c (modified) (8 diffs)

soft/giet_vm/applications/transpose/main.c

@@ -66 +66 @@
     unsigned int c;                                                // cluster index for loops
 
-    unsigned int proc_id    = giet_procid();                       // global processor id
-    unsigned int lpid       = proc_id % NB_PROCS_MAX;              // local processor id
-    unsigned int cluster_xy = proc_id / NB_PROCS_MAX;              // 8 bits format
-    unsigned int x          = cluster_xy >> Y_WIDTH;               // x coordinate
-    unsigned int y          = cluster_xy & ((1<<Y_WIDTH)-1);       // y coordinate
+    // get processor identifiers
+    unsigned int x;                                                // x cluster coordinate
+    unsigned int y;                                                // y cluster coordinate
+    unsigned int lpid;                                             // local processor index
+    giet_proc_xyp( &x, &y, &lpid);             
 
     unsigned int npixels    = NN * NN;                             // pixels per image
@@ -83 +83 @@
     // It includes parameters checking, barriers initialization,
     // distributed buffers allocation, and file open
-    if ( proc_id == 0 )
+    if ( (x==0) && (y==0) && (lpid==0) )
     {
         // Parameters checking
@@ -140 +140 @@
         if (file < 0)
         { 
-            giet_shr_printf("\n[TRANSPOSE ERROR] Processor[%d,%d,%d]"
+            giet_shr_printf("\n[TRANSPOSE ERROR] Proc [%d,%d,%d]"
                             " cannot open file misc/images.raw",
                             x, y, lpid );
@@ -147 +147 @@
         else
         {
-            giet_shr_printf("\n[TRANSPOSE] Processor[0,0,0] open file misc/images.raw\n");
+            giet_shr_printf("\n[TRANSPOSE] Proc [0,0,0] open file misc/images.raw\n");
         }
         init_ok = 0;
@@ -154 +154 @@
     {
         while ( init_ok == 1 );
+        giet_shr_printf("\n[TRANSPOSE] Processor[%d,%d,%d] starts at cycle %d\n", x, y, lpid);
     }
     
-
     /////////////////////////
     // Main loop (on images)
@@ -173 +173 @@
                            ((image*nblocks) + ((nblocks*cluster_id)/NB_CLUSTERS)) );
 
-            giet_shr_printf("\n[TRANSPOSE] Proc [%d,%d,0] completes load"
+            giet_shr_printf("\n[TRANSPOSE] Proc [%d,%d,%d] completes load"
                             "  for image %d at cycle %d\n",
-                            x, y, image, giet_proctime() );
+                            x, y, lpid, image, giet_proctime() );
         }
 
@@ -307 +307 @@
         barrier_wait( &barrier );
 
-        // instrumentation done by processor [0,0,0]
-
-        if ( (proc_id == 0) && INSTRUMENTATION_OK )
+        // instrumentation done by processor [0,0,0] 
+        if ( (x==0) && (y==0) && (lpid==0) && INSTRUMENTATION_OK )
         {
             int cc, pp;
@@ -377 +376 @@
 
     // Processor[0,0,0] releases the Distributed buffers
-    if ( proc_id == 0 )
+    if ( (x==0) && (y==0) && (lpid==0) )
     {
         for ( c = 0 ; c < NB_CLUSTERS ; c++ )