Changeset 799 for soft

Timestamp:

Mar 14, 2016, 3:11:45 PM (9 years ago)

Author:

alain

Message:

Introducing a port of ocean application without macros.

Location:

soft/giet_vm/applications/ocean

Files:

• Makefile (deleted)
• Makefile.config.giet (deleted)
• Makefile.config.natif (deleted)
• Makefile.giet (deleted)
• Makefile.natif (deleted)
• decs.H (deleted)
• decs.h (added)
• giet_utils.C (deleted)
• giet_utils.H (deleted)
• global.C (deleted)
• jacobcalc.C (deleted)
• jacobcalc.c (added)
• jacobcalc2.C (deleted)
• jacobcalc2.c (added)
• laplacalc.C (deleted)
• laplacalc.c (added)
• linkup.C (deleted)
• linkup.c (added)
• main.C (deleted)
• main.c (added)
• multi.C (deleted)
• multi.c (added)
• null_macros (deleted)
• ocean (deleted)
• ocean.ld (modified) (1 diff)
• ocean.py (modified) (4 diffs)
• slave1.C (deleted)
• slave1.c (added)
• slave2.C (deleted)
• slave2.c (added)
• subblock.C (deleted)
• subblock.c (added)

soft/giet_vm/applications/ocean/ocean.ld

@@ -37 +37 @@
         *(.scommon)
     }
-    . = seg_ldata_base;
-    seg_ldata :
-    {
-        . = ALIGN(0x40);
-        *(seg_ldata)
-    }
 }
 

soft/giet_vm/applications/ocean/ocean.py

@@ -42 +42 @@
     data_size  = 0x00020000     # 128 Kbytes (non replicated)
     
-    ldata_base = 0x20200000     # 16 Ko (per cluster)
-    ldata_size = 0x00004000
-
     stack_base = 0x40000000 
-    stack_size = 0x00200000     # 2 Mbytes (per cluster)
+    stack_size = 0x00010000     # 64 Kbytes (per thread)
 
     heap_base  = 0x60000000
-    heap_size  = 0x08000000     # 128 Mbytes (per cluster) 
+    heap_size  = 0x02000000     # 32 Mbytes (per cluster) 
 
     # create vspace
-    vspace = mapping.addVspace( name = 'ocean', startname = 'ocean_data' )
+    vspace = mapping.addVspace( name = 'ocean', startname = 'ocean_data' , active = True )
     
     # data vseg : shared (only in cluster[0,0])
@@ -79 +76 @@
                 for p in xrange( nprocs ):
                     proc_id = (((x * y_size) + y) * nprocs) + p
-                    size    = (stack_size / nprocs) & 0xFFFFF000
-                    base    = stack_base + (proc_id * size)
+                    size    = stack_size - 4096 
+                    base    = stack_base + (proc_id * stack_size)
 
                     mapping.addVseg( vspace, 'ocean_stack_%d_%d_%d' % (x,y,p), 
                                      base, size, 'C_WU', vtype = 'BUFFER', 
                                      x = x , y = y , pseg = 'RAM',
-                                     local = True, big = True )
+                                     local = True )
 
     # heap vsegs: distributed non local (all heap vsegs can be accessed by all tasks)
@@ -99 +96 @@
                                  local = False, big = True )
 
-    # Local data vsegs: local (one copy in each cluster)
-    for x in xrange (x_size):
-        for y in xrange (y_size):
-            cluster_id = (x * y_size) + y
-            if ( mapping.clusters[cluster_id].procs ):
-
-                mapping.addVseg( vspace, 'ocean_ldata_%d_%d' % (x,y), ldata_base, ldata_size, 
-                                 'C_WU', vtype = 'BUFFER', x = x, y = y, pseg = 'RAM',
-                                 local = 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):
@@ -115 +102 @@
             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 :
-                        startid=0
-                    else :
+                    if x == 0 and y == 0 and p == 0 :    # main
                         startid = 1
+                        is_main = True
+                    else :                               # slaves
+                        startid = 0
+                        is_main = False
                     
-                    mapping.addTask( vspace, 'ocean_%d_%d_%d' % (x,y,p),
-                                     trdid, x, y, p,
-                                     'ocean_stack_%d_%d_%d' % (x,y,p),
-                                     'ocean_heap_%d_%d' % (x,y), startid )
+                    mapping.addThread( vspace, 
+                                       'ocean_%d_%d_%d' % (x,y,p),
+                                       is_main,
+                                       x, y, p,
+                                       'ocean_stack_%d_%d_%d' % (x,y,p),
+                                       'ocean_heap_%d_%d' % (x,y), 
+                                       startid )
 
     # extend mapping name