Changeset 384

Timestamp:

Aug 7, 2014, 12:28:23 PM (10 years ago)

Author:

alain

Message:

Update the convol application to use the new malloc.h and barrier.h libraries.

Location:

soft/giet_vm/convol

Files:

• convol.py (modified) (5 diffs)
• main.c (modified) (2 diffs)

soft/giet_vm/convol/convol.py

@@ -56 +56 @@
     for x in xrange (x_size):
         for y in xrange (y_size):
-            
             size       = code_size
             base       = code_base 
@@ -67 +66 @@
     for x in xrange (x_size):
         for y in xrange (y_size):
-            
             cluster_id = (x * y_size) + y
             size       = heap_size / (x_size * y_size)
@@ -79 +77 @@
         for y in xrange (y_size):
             for p in xrange( procs_max ):
-
                 proc_id = (((x * y_size) + y) * procs_max) + p
                 size    = stack_size / (x_size * y_size * procs_max)
@@ -90 +87 @@
     for x in xrange (x_size):
         for y in xrange (y_size):
-            
             size       = ptab_size
             base       = ptab_base
@@ -102 +98 @@
         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,

soft/giet_vm/convol/main.c

@@ -11 +11 @@
 #include "stdlib.h"
 #include "barrier.h"
-#include "remote_malloc.h"
+#include "malloc.h"
 
 #define USE_SBT_BARRIER            1
@@ -183 +183 @@
 #endif
 
-        GA[cluster_id] = remote_malloc( (FRAME_SIZE/nclusters)   , 9 , x , y );
-        GB[cluster_id] = remote_malloc( (FRAME_SIZE/nclusters)*2 , 9 , x , y );
-        GC[cluster_id] = remote_malloc( (FRAME_SIZE/nclusters)*2 , 9 , x , y );
-        GD[cluster_id] = remote_malloc( (FRAME_SIZE/nclusters)*2 , 9 , x , y );
-        GZ[cluster_id] = remote_malloc( (FRAME_SIZE/nclusters)/2 , 9 , x , y );
+        GA[cluster_id] = remote_malloc( (FRAME_SIZE/nclusters)   , x , y );
+        GB[cluster_id] = remote_malloc( (FRAME_SIZE/nclusters)*2 , x , y );
+        GC[cluster_id] = remote_malloc( (FRAME_SIZE/nclusters)*2 , x , y );
+        GD[cluster_id] = remote_malloc( (FRAME_SIZE/nclusters)*2 , x , y );
+        GZ[cluster_id] = remote_malloc( (FRAME_SIZE/nclusters)/2 , x , y );
         
 #if VERBOSE