Changeset 407 for soft

Timestamp:

Sep 12, 2014, 4:34:19 PM (10 years ago)

Author:

cfuguet

Message:

sort: introducing distributed ptabs in sort.py description file

File:

• soft/giet_vm/sort/sort.py (modified) (5 diffs)

soft/giet_vm/sort/sort.py

@@ -10 +10 @@
 #  This file describes the mapping of the multi-threaded "sort"
 #  application on a multi_clusters, multi-processors architecture.
-#  This include both the mapping of virtual segments on the clusters, 
+#  This include both the mapping of virtual segments on the clusters,
 #  and the mapping of tasks on processors.
 #  This mapping uses 5 platform parameters, (obtained from the "mapping" argument)
@@ -34 +34 @@
     code_base  = 0x10000000
     code_size  = 0x00010000     # 64 Kbytes
-    
+
     data_base  = 0x20000000
     data_size  = 0x00010000     # 64 Kbytes
@@ -41 +41 @@
     ptab_size  = 0x00040000     # 256 Kbytes
 
-    stack_base = 0x40000000 
+    stack_base = 0x40000000
     stack_size = 0x00010000     # 64 Kbytes
 
-    heap_base  = 0x50000000 
+    heap_base  = 0x50000000
     heap_size  = 0x00010000     # 64 Kbytes
 
-    args_base  = 0x60000000 
+    args_base  = 0x60000000
     args_size  = 0x00000004     # 4 bytes
 
     # create Vspace
     vspace = mapping.addVspace( name = 'sort', startname = 'sort_data' )
-    
+
     # non replicated vsegs in cluster[0,0]
-    mapping.addVseg( vspace, 'sort_code', code_base , code_size, 'CXWU', vtype = 'ELF', 
+    mapping.addVseg( vspace, 'sort_code', code_base , code_size, 'CXWU', vtype = 'ELF',
                      x = 0, y = 0, pseg = 'RAM', binpath = 'build/sort/sort.elf' )
 
@@ -60 +60 @@
                      x = 0, y = 0, pseg = 'RAM', binpath = 'build/sort/sort.elf' )
 
-    mapping.addVseg( vspace, 'sort_ptab', ptab_base , ptab_size, 'C_WU', vtype = 'PTAB',
-                     x = 0, y = 0, pseg = 'RAM', align = 13 )
-
     mapping.addVseg( vspace, 'sort_args', args_base , args_size, 'C_WU', vtype = 'CONST',
                      x = 0, y = 0, pseg = 'RAM', init = ntasks )
 
-    # distributed vsegs: one stack per processor/task, one heap per cluster
-    for x_rep in xrange (x_size):
-        for y_rep in xrange (y_size):
-            cluster_offset = ((x_rep << y_width) + y_rep) << 20  # 1 Mbytes per cluster
-            mapping.addVseg( vspace, 'sort_heap_%d_%d' % (x_rep, y_rep), 
-                             heap_base + cluster_offset, heap_size, 'C_WU', 
-                             vtype = 'BUFFER', x = x_rep, y = y_rep, pseg = 'RAM' )
-            
-            for p in xrange( procs_max ):
-                proc_offset = cluster_offset + (p << 18)         # 256 Kbytes per proc
-                mapping.addVseg( vspace, 'sort_stack_%d_%d_%d' % (x_rep, y_rep, p),
-                                 stack_base + proc_offset, stack_size, 'C_WU',
-                                 vtype = 'BUFFER', x = x_rep, y = y_rep, pseg = 'RAM' )
-            
+    # distributed vsegs: one stack per task, one ptab and heap per cluster
+    for c in mapping.clusters:
+        x, y = c.x, c.y
+        cluster_offset = ((x << y_width) + y) << 20  # 1 Mbytes per cluster
+        mapping.addVseg( vspace, 'sort_heap_%d_%d' % (x, y),
+                         heap_base + cluster_offset, heap_size, 'C_WU',
+                         vtype = 'BUFFER', x = x, y = y, pseg = 'RAM' )
+
+        mapping.addVseg( vspace, 'sort_ptab_%d_%d' % (x, y),
+                         ptab_base + cluster_offset, ptab_size, 'C_WU',
+                         vtype = 'PTAB', x = x, y = y, pseg = 'RAM', align = 13 )
+
+        for p in c.procs:
+            l = p.lpid
+            proc_offset = cluster_offset + (l << 18) # 256 Kbytes per proc
+            mapping.addVseg( vspace, 'sort_stack_%d_%d_%d' % (x, y, l),
+                             stack_base + proc_offset, stack_size, 'C_WU',
+                             vtype = 'BUFFER', x = x, y = y, pseg = 'RAM' )
+
     # distributed tasks / one task per processor
-    for x in xrange (x_size):
-        for y in xrange (y_size):
-            for p in xrange( procs_max ):
-
-                trdid = (((x * y_size) + y) * procs_max) + p
-                mapping.addTask( vspace, 'sort_%d_%d_%d' % (x,y,p), trdid, x, y, p,
-                                 'sort_stack_%d_%d_%d' % (x,y,p),
-                                 'sort_heap_%d_%d' % (x,y), 0 )
+    trdid = 0
+    for c in mapping.clusters:
+        x, y = c.x, c.y
+        for p in c.procs:
+            l = p.lpid
+            mapping.addTask( vspace, 'sort_%d_%d_%d' % (x, y, l), trdid, x, y, l,
+                             'sort_stack_%d_%d_%d' % (x, y, l),
+                             'sort_heap_%d_%d' % (x, y), 0 )
+            trdid += 1
 
     # extend mapping name
@@ -95 +98 @@
     return vspace  # useful for test
 
-################################ test ######################################################
+################################ test ###################################################
 
 if __name__ == '__main__':
-    
+
     vspace = sort( Mapping( 'test', 2, 2, 4 ) )
     print vspace.xml()