Changeset 248 for trunk/softs/soft_transpose_giet/main.c

Timestamp:

Aug 9, 2012, 10:57:23 AM (12 years ago)

Author:

meunier

Message:

Updates in the soft_filter application (bug corrections, formatting, and adaptation to the architecture generic_mmu)

File:

• trunk/softs/soft_transpose_giet/main.c (modified) (7 diffs)

trunk/softs/soft_transpose_giet/main.c

@@ -9 +9 @@
 #define NB_CLUSTER_MAX  256
 
-#define PRINTF(...)      ({ if (local_id == 0) { tty_printf(__VA_ARGS__); } })
+#define PRINTF(...)      ({ if (proc_id == 0) { tty_printf(__VA_ARGS__); } })
+
+//#define DISPLAY_ONLY
 
 ///////////////////////////////////////////
@@ -104 +106 @@
 
 
-   PRINTF("*** starting barrier init at cycle %d ***\n", proctime());
+   PRINTF("*** Starting barrier init at cycle %d ***\n", proctime());
 
    //  barriers initialization
@@ -111 +113 @@
    barrier_init(2, nglobal_procs);
 
-   PRINTF("*** completing barrier init at cycle %d ***\n", proctime());
+   PRINTF("*** Completing barrier init at cycle %d ***\n", proctime());
 
    // Main loop (on frames)
@@ -127 +129 @@
             LOAD_START[cluster_id][p] = date;
          }
-         tty_printf("    block_device offset : %d\n", nblocks * cluster_id / nclusters);
          if (ioc_read(frame * nblocks + nblocks * cluster_id / nclusters, A[cluster_id], nblocks / nclusters)){
-            tty_printf("echec ioc_read\n");
+            PRINTF("echec ioc_read\n");
             exit();
          }
          if (ioc_completed()){
-            tty_printf("echec ioc_completed\n");
+            PRINTF("echec ioc_completed\n");
             exit();
          }
@@ -150 +151 @@
       // (p,l) are the (x,y) pixel coordinates in the source frame
 
+#ifndef DISPLAY_ONLY
       date = proctime();
       PRINTF("\n*** Starting transpose for frame %d at cycle %d\n", frame, date);
@@ -173 +175 @@
       PRINTF("*** Completing transpose for frame %d at cycle %d\n", frame, date);
       TRSP_END[cluster_id][local_id] = date;
-
       barrier_wait(1);
+#endif
 
       // parallel display from B[c] to frame buffer 
@@ -184 +186 @@
 
       unsigned int npxt = npixels / nglobal_procs;   // number of pixels per proc
-      if (npixels - npxt * nglobal_procs != 0){
-         tty_printf("*** Error line %d\n", __LINE__);
+
+#ifndef DISPLAY_ONLY
+      if (fb_write(npxt * proc_id, B[cluster_id] + npxt * local_id, npxt)){
+         PRINTF("[%d]: echec fb_sync_write\n", proc_id);
          exit();
       }
-      tty_printf("    npxt : %d\n", npxt);
-
-      if (fb_write(npxt * proc_id, B[cluster_id] + npxt * local_id, npxt)){
-         tty_printf("[%d]: echec fb_sync_write\n", proc_id);
+#else
+      if (fb_write(npxt * proc_id, A[cluster_id] + npxt * local_id, npxt)){
+         PRINTF("[%d]: echec fb_sync_write\n", proc_id);
          exit();
       }
-      
-      PRINTF("    After fb_write and before fb_completed\n");
+#endif
 
       if (fb_completed()){
-         tty_printf("[%d]: echec fb_completed\n", proc_id);
+         PRINTF("[%d]: echec fb_completed\n", proc_id);
          exit();
       }