Changeset 502 for soft/giet_vm/applications/convol/convol.py

Timestamp:

Feb 8, 2015, 9:20:45 PM (9 years ago)

Author:

alain

Message:

1) Introduce distributed barriers in the multi-threads applications
(classif) transpose, convol, sort, gameoflife)

2) Introducing support for architectures containing empty clusters
in the mapping of these multi-threaded applications.

3) Removing the "command line arguments" in the sort application
(replaced by the giet_procs_number() system call.

File:

• soft/giet_vm/applications/convol/convol.py (modified) (4 diffs)

soft/giet_vm/applications/convol/convol.py

@@ -12 +12 @@
 #  This include both the mapping of virtual segments on the clusters,
 #  and the mapping of tasks on processors.
+#  There is one task per processor.
+#  The mapping of virtual segments is the following:
+#    - There is one shared data vseg in cluster[0][0]
+#    - The code vsegs are replicated on all clusters containing processors.
+#    - There is one heap vseg per cluster containing processors.
+#    - The stacks vsegs are distibuted on all clusters containing processors.
 #  This mapping uses 5 platform parameters, (obtained from the "mapping" argument)
-#  - x_size    : number of clusters in a row
-#  - y_size    : number of clusters in a column
-#  - x_width   : number of bits coding x coordinate
-#  - y_width   : number of bits coding y coordinate
-#  - nprocs : number of processors per cluster
+#    - x_size    : number of clusters in a row
+#    - y_size    : number of clusters in a column
+#    - x_width   : number of bits coding x coordinate
+#    - y_width   : number of bits coding y coordinate
+#    - nprocs : number of processors per cluster
 ####################################################################################
 
@@ -46 +52 @@
     
     # data vseg in cluster[0,0] : non local
-    mapping.addVseg( vspace, 'conv_data', data_base , data_size, 'C_WU', vtype = 'ELF',
-                     x = 0, y = 0, pseg = 'RAM', binpath = 'build/convol/convol.elf',
+    mapping.addVseg( vspace, 'conv_data', data_base , data_size,
+                     'C_WU', vtype = 'ELF', x = 0, y = 0, pseg = 'RAM',
+                     binpath = 'build/convol/convol.elf',
                      local = False )
 
@@ -53 +60 @@
     for x in xrange (x_size):
         for y in xrange (y_size):
-            size       = code_size
-            base       = code_base 
-            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', 
-                             local = True )
+            cluster_id = (x * y_size) + y
+            if ( mapping.clusters[cluster_id].procs ):
+                size       = code_size
+                base       = code_base 
+
+                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', 
+                                 local = True )
 
     # stack vsegs : local (one stack per processor)
     for x in xrange (x_size):
         for y in xrange (y_size):
-            for p in xrange( nprocs ):
-                proc_id = (((x * y_size) + y) * nprocs) + p
-                size    = (stack_size / nprocs) & 0xFFFFF000
-                base    = stack_base + (proc_id * size)
-                mapping.addVseg( vspace, 'conv_stack_%d_%d_%d' % (x,y,p), base, size,
-                                 'C_WU', vtype = 'BUFFER', x = x , y = y , pseg = 'RAM',
-                                 local = True, big = True )
+            cluster_id = (x * y_size) + y
+            if ( mapping.clusters[cluster_id].procs ):
+                for p in xrange( nprocs ):
+                    proc_id = (((x * y_size) + y) * nprocs) + p
+                    size    = (stack_size / nprocs) & 0xFFFFF000
+                    base    = stack_base + (proc_id * size)
+
+                    mapping.addVseg( vspace, 'conv_stack_%d_%d_%d' % (x,y,p),
+                                     base, size, 'C_WU', vtype = 'BUFFER', 
+                                     x = x , y = y , pseg = 'RAM',
+                                     local = True, big = True )
             
-    # heap vsegs : distributed but non local (all heap vsegs can be accessed by all tasks)
+    # heap vsegs : distributed but non local (any heap can be accessed by any task)
     for x in xrange (x_size):
         for y in xrange (y_size):
             cluster_id = (x * y_size) + y
-            size       = heap_size
-            base       = heap_base + (cluster_id * size)
-            mapping.addVseg( vspace, 'conv_heap_%d_%d' % (x,y), base, size,
-                             'C_WU', vtype = 'BUFFER', x = x , y = y , pseg = 'RAM',
-                             local = False, big = True )
+            if ( mapping.clusters[cluster_id].procs ):
+                size       = heap_size
+                base       = heap_base + (cluster_id * size)
+
+                mapping.addVseg( vspace, 'conv_heap_%d_%d' % (x,y), base, size,
+                                 'C_WU', vtype = 'BUFFER', x = x , y = y , pseg = 'RAM',
+                                 local = False, big = True )
 
     # distributed tasks : one task per processor 
     for x in xrange (x_size):
         for y in xrange (y_size):
-            for p in xrange( nprocs ):
-                trdid = (((x * y_size) + y) * nprocs) + p
-                mapping.addTask( vspace, 'conv_%d_%d_%d' % (x,y,p), trdid, x, y, p,
-                                 'conv_stack_%d_%d_%d' % (x,y,p),
-                                 'conv_heap_%d_%d' % (x,y), 0 )
+            cluster_id = (x * y_size) + y
+            if ( mapping.clusters[cluster_id].procs ):
+                for p in xrange( nprocs ):
+                    trdid = (((x * y_size) + y) * nprocs) + p
+
+                    mapping.addTask( vspace, 'conv_%d_%d_%d' % (x,y,p),
+                                     trdid, x, y, p,
+                                     'conv_stack_%d_%d_%d' % (x,y,p),
+                                     'conv_heap_%d_%d' % (x,y), 0 )
 
     # extend mapping name
@@ -95 +115 @@
     return vspace  # useful for test
             
-################################ test ######################################################
+################################ test ################################################
 
 if __name__ == '__main__':