Changeset 708 for soft/giet_vm/applications/transpose/transpose.py

Timestamp:

Oct 1, 2015, 4:09:25 PM (9 years ago)

Author:

alain

Message:

Adapt the following application to the POSIX threads API

• convol
• classif
• raycast
• coproc
• display
• gameoflife
• transpose
• shell

File:

• soft/giet_vm/applications/transpose/transpose.py (modified) (6 diffs)

soft/giet_vm/applications/transpose/transpose.py

@@ -10 +10 @@
 #  This file describes the mapping of the multi-threaded "transpose" 
 #  application on a multi-clusters, multi-processors architecture.
-#  This include both the mapping of virtual segments on the clusters,
-#  and the mapping of tasks on processors.
-#  There is one task per processor.
+#  There is one thread per processor.
 #  The mapping of virtual segments is the following:
 #    - There is one shared data vseg in cluster[0][0]
@@ -37 +35 @@
     # define vsegs base & size
     code_base  = 0x10000000
-    code_size  = 0x00010000     # 64 Kbytes (replicated in each cluster)
+    code_size  = 0x00010000     # 64 Kbytes (per cluster)
     
     data_base  = 0x20000000
@@ -43 +41 @@
 
     stack_base = 0x40000000 
-    stack_size = 0x00200000     # 2 Mbytes (per cluster)
+    stack_size = 0x00010000     # 64 Kbytes (per thread)
 
     heap_base  = 0x60000000 
@@ -76 +74 @@
                 for p in xrange( nprocs ):
                     proc_id = (((x * y_size) + y) * nprocs) + p
-                    size    = (stack_size / nprocs) & 0xFFFFF000
-                    base    = stack_base + (proc_id * size)
+                    base    = stack_base + (proc_id * stack_size)
 
                     mapping.addVseg( vspace, 'trsp_stack_%d_%d_%d' % (x,y,p), 
-                                     base, size, 'C_WU', vtype = 'BUFFER', 
+                                     base, stack_size, 'C_WU', vtype = 'BUFFER', 
                                      x = x , y = y , pseg = 'RAM',
                                      local = True, big = True )
@@ -96 +93 @@
                                  local = False, big = True )
 
-    # distributed tasks / one task per processor
+    # distribute one thread per processor / main on P[0,0,0]
     for x in xrange (x_size):
         for y in xrange (y_size):
@@ -102 +99 @@
             if ( mapping.clusters[cluster_id].procs ):
                 for p in xrange( nprocs ):
-                    trdid = (((x * y_size) + y) * nprocs) + p
+                    if (x == 0) and (y == 0) and (p == 0) :   # main thread
+                        startid = 1
+                        is_main = True
+                    else :                                    # other threads
+                        startid = 0
+                        is_main = False
 
-                    mapping.addTask( vspace, 'trsp_%d_%d_%d' % (x,y,p),
-                                     trdid, x, y, p,
-                                     'trsp_stack_%d_%d_%d' % (x,y,p),
-                                     'trsp_heap_%d_%d' % (x,y), 0 )
+                    mapping.addThread( vspace,
+                                       'trsp_%d_%d_%d' % (x,y,p),
+                                       is_main,
+                                       x, y, p,
+                                       'trsp_stack_%d_%d_%d' % (x,y,p),
+                                       'trsp_heap_%d_%d' % (x,y),
+                                       startid )
 
     # extend mapping name