Changeset 805 for soft/giet_vm/applications/rosenfeld/rosenfeld.py

Timestamp:

Mar 15, 2016, 6:35:28 PM (8 years ago)

Author:

meunier

Message:

• Adding the parallel version of rosenfeld

File:

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

soft/giet_vm/applications/rosenfeld/rosenfeld.py

@@ -25 +25 @@
 
 #########################
-def extend( mapping ):
+def extend(mapping):
 
     x_size    = mapping.x_size
@@ -59 +59 @@
         for y in xrange (y_size):
             cluster_id = (x * y_size) + y
-            if ( mapping.clusters[cluster_id].procs ):
+            if (mapping.clusters[cluster_id].procs):
 
                 mapping.addVseg( vspace, 'rosen_code_%d_%d' %(x,y), 
@@ -71 +71 @@
         for y in xrange (y_size):
             cluster_id = (x * y_size) + y
-            if ( mapping.clusters[cluster_id].procs ):
-                for p in xrange( nprocs ):
+            if (mapping.clusters[cluster_id].procs):
+                for p in xrange(nprocs):
                     proc_id = (((x * y_size) + y) * nprocs) + p
                     size    = (stack_size / nprocs) & 0xFFFFF000
@@ -86 +86 @@
         for y in xrange (y_size):
             cluster_id = (x * y_size) + y
-            if ( mapping.clusters[cluster_id].procs ):
-                size  = heap_size
-                base  = heap_base + (cluster_id * size)
+            if (mapping.clusters[cluster_id].procs):
+                size = heap_size
+                base = heap_base + (cluster_id * size)
 
-                mapping.addVseg( vspace, 'rosen_heap_%d_%d' % (x,y), base, size, 
-                                 'C_WU', vtype = 'HEAP', x = x, y = y, pseg = 'RAM',
-                                 local = False, big = True )
+                mapping.addVseg(vspace, 'rosen_heap_%d_%d' % (x, y), base, size, 
+                                'C_WU', vtype = 'HEAP', 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):
-    #        cluster_id = (x * y_size) + y
-    #        if ( mapping.clusters[cluster_id].procs ):
-    #            for p in xrange( nprocs ):
-    #                trdid = (((x * y_size) + y) * nprocs) + p
+    for x in xrange (x_size):
+        for y in xrange (y_size):
+            cluster_id = (x * y_size) + y
+            if (mapping.clusters[cluster_id].procs):
+                for p in xrange(nprocs):
+                    trdid = (((x * y_size) + y) * nprocs) + p
+                    if trdid == 0:
+                        startid = 0
+                        is_main = 1
+                    else:
+                        startid = 1
+                        is_main = 0
+                    #startid = trdid == 0 and 0 or 1
+                    #is_main = startid == 0
 
-    #                mapping.addTask( vspace, 'rosen_%d_%d_%d' % (x,y,p),
-    #                                 trdid, x, y, p,
-    #                                 'rosen_stack_%d_%d_%d' % (x,y,p),
-    #                                 'rosen_heap_%d_%d' % (x,y), 0 )
-    mapping.addThread( vspace, 'main', True, 0, 0, 0,
-                       'rosen_stack_0_0_0',
-                       'rosen_heap_0_0',
-                       0 )                      # index in start_vector
+                    mapping.addThread(vspace, 'rosen_%d_%d_%d' % (x, y, p),
+                                    is_main, x, y, p,
+                                    'rosen_stack_%d_%d_%d' % (x,y,p),
+                                    'rosen_heap_%d_%d' % (x,y), startid)