Changeset 589 for soft/giet_vm/applications/convol

Timestamp:

Jul 8, 2015, 3:57:15 PM (9 years ago)

Author:

alain

Message:

Modify all applications to support two new rules:
1) introduce a local Makefile for each application.
2) change "application.elf" name to "application/appli.elf" name in the application.py" file.
Introduce the shell application.

Location:

soft/giet_vm/applications/convol

Files:

• Makefile (added)
• convol.py (modified) (5 diffs)
• main.c (modified) (7 diffs)
• philips_image.raw (deleted)

soft/giet_vm/applications/convol/convol.py

@@ -4 +4 @@
 
 ######################################################################################
-#   file   : convol.py  (for the convol application)
+#   file   : convol.py 
 #   date   : may 2014
 #   author : Alain Greiner
@@ -27 +27 @@
 
 ######################
-def convol( mapping ):
+def extend( mapping ):
 
     x_size    = mapping.x_size
@@ -54 +54 @@
     mapping.addVseg( vspace, 'conv_data', data_base , data_size,
                      'C_WU', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM',
-                     binpath = 'build/convol/convol.elf',
+                     binpath = 'build/convol/appli.elf',
                      local = False )
 
@@ -67 +67 @@
                 mapping.addVseg( vspace, 'conv_code_%d_%d' % (x,y), base, size,
                                  'CXWU', vtype = 'ELF', x = x , y = y , pseg = 'RAM', 
-                                 binpath = 'build/convol/convol.elf', 
+                                 binpath = 'build/convol/appli.elf', 
                                  local = True )
 
@@ -119 +119 @@
 if __name__ == '__main__':
 
-    vspace = convol( Mapping( 'test', 2, 2, 4 ) )
+    vspace = extend( Mapping( 'test', 2, 2, 4 ) )
     print vspace.xml()
 

soft/giet_vm/applications/convol/main.c

@@ -39 +39 @@
 #define FRAME_SIZE                 (NB_PIXELS * PIXEL_SIZE)
 
+#define SEEK_SET                   0
+
 #define TA(c,l,p)  (A[c][((NP) * (l)) + (p)])
 #define TB(c,p,l)  (B[c][((NL) * (p)) + (l)])
@@ -125 +127 @@
     unsigned int ntasks     = nclusters * nprocs;           // number of tasks
     unsigned int frame_size = FRAME_SIZE;                   // total size (bytes)
-    unsigned int nblocks    = frame_size / 512;             // number of blocks/frame
 
     unsigned int lines_per_task     = NL / ntasks;          // lines per task
@@ -166 +167 @@
     {
         giet_shr_printf("\n[CONVOL] task[0,0,0] starts barrier init at cycle %d\n" 
-                        "- CLUSTERS  = %d\n"
-                        "- PROCS     = %d\n" 
-                        "- TASKS     = %d\n" 
-                        "- BLOCKS    = %d\n",
-                        giet_proctime(), nclusters, nprocs, ntasks, nblocks );
+                        "- CLUSTERS   = %d\n"
+                        "- PROCS      = %d\n" 
+                        "- TASKS      = %d\n" 
+                        "- LINES/TASK = %d\n",
+                        giet_proctime(), nclusters, nprocs, ntasks, lines_per_task );
 #if USE_SQT_BARRIER
         sqt_barrier_init( &barrier, x_size , y_size , nprocs );
@@ -182 +183 @@
         barrier_init_ok = 1;
     }
-    else 
+    else
     {
         while ( barrier_init_ok == 0 );
@@ -250 +251 @@
     ///////////////////////////////////////////////////////////////////////////
     // task[0,0,0] open the file containing image, and load it from disk 
-    // to all A[c] buffers (nblocks / nclusters loaded in each cluster).
+    // to all A[c] buffers (frame_size / nclusters loaded in each cluster).
     // Other tasks are waiting on the init_ok condition.
     //////////////////////////////////////////////////////////////////////////
@@ -256 +257 @@
     {
         // open file
-        file = giet_fat_open("misc/philips_image.raw", 0 );
+        file = giet_fat_open( "misc/philips_image.raw" , 0 );
         if ( file < 0 ) giet_exit( "[CONVOL ERROR] task[0,0,0] cannot open"
                                    " file misc/philips_image.raw" );
@@ -268 +269 @@
                              "for cluster %d at cycle %d\n", c, giet_proctime() );
 
+            giet_fat_lseek( file,
+                            (frame_size/nclusters)*c,
+                            SEEK_SET );
+
             giet_fat_read( file,
                            A[c],
-                           nblocks/nclusters,
-                           (nblocks/nclusters)*c );
+                           frame_size/nclusters );
 
             giet_shr_printf( "\n[CONVOL] task[0,0,0] completes load "