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

Timestamp:

Jul 13, 2017, 11:01:58 AM (7 years ago)

Author:

meunier

Message:

• Mise à jour NR2 et Rosenfeld

File:

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

soft/giet_vm/applications/rosenfeld/rosenfeld.py

@@ -41 +41 @@
 
     # QM warning: if less than 8M per cluster (i.e. 2M per thread), small pages are required
-    stack_base = 0x40000000 
+    stack_base = 0x30000000 
     stack_size = 0x00080000     # 512K (per cluster) => 128K per thread
     #stack_size = 0x00400000     # 4M (per cluster) => 1M per thread
 
-    heap_base  = 0x60000000 
+    heap_base  = 0x40000000 
     #heap_size  = 0x00800000     # 8 Mbytes (per cluster) 
-    heap_size  = 0x10000000     # 256 Mbytes (total) 
+    heap_size  = 0x10000000     # 256 Mbytes (default) 
 
     # create vspace
@@ -91 +91 @@
             if (mapping.clusters[cluster_id].procs):
                 nclusters = x_size * y_size
-                if x == 0 and y == 0:
-                    size = heap_size / 2
+                if x == 0 and y == 0 and x_size * y_size == 1:
+                    # only one cluster: takes all heap
                     base = heap_base
+                    size = 0x20000000 # 512 Mo
+                elif x_size * y_size == 4:
+                    # 4 clusters: 128 Mo to all clusters
+                    size = 0x08000000 # 128 Mo
+                    base = heap_base + ((y * x_size) + x) * size
+                elif x_size * y_size == 16:
+                    # 16 clusters: 64 Mo to cluster 0, 32 to others
+                    if x == 0 and y == 0:
+                        base = heap_base
+                        size = 0x04000000 # 64 Mo
+                    else:
+                        size = 0x02000000 # 32 Mo
+                        base = heap_base + 0x04000000 + ((y * x_size) + x - 1) * size
                 else:
                     size = heap_size / (2 * nclusters)