Changeset 718 for soft

Timestamp:

Oct 9, 2015, 3:51:21 PM (9 years ago)

Author:

alain

Message:

Modify sort application to use the pthreads API.

Location:

soft/giet_vm/applications

Files:

• convol/convol.c (modified) (2 diffs)
• sort/Makefile (modified) (1 diff)
• sort/main.c (deleted)
• sort/sort.c (added)
• sort/sort.py (modified) (6 diffs)

soft/giet_vm/applications/convol/convol.c

@@ -727 +727 @@
     unsigned int nthreads   = nclusters * nprocs;     
 
+    // get a shared TTY
+    giet_tty_alloc( 1 );
+    lock_init( &tty_lock );
+
+    // get FBF size
+    unsigned int  width;
+    unsigned int  height;
+    giet_fbf_size( &width , &height );
+
     // parameters checking 
+    if ( (width != NP) || (height != NL) )
+        giet_pthread_exit( "[CONVOL ERROR] FBF size must be NP * NL\n");
     if ((nprocs != 1) && (nprocs != 2) && (nprocs != 4) && (nprocs != 8))
         giet_pthread_exit( "[CONVOL ERROR] NB_PROCS_MAX must be 1, 2, 4 or 8\n");
@@ -743 +754 @@
         giet_pthread_exit( "[CONVOL ERROR] X_SIZE*Y_SIZE must be a divider of NP");
 
-    // get a shared TTY
-    giet_tty_alloc( 1 );
-    lock_init( &tty_lock );
-
+    // get FBF ownership
+    giet_fbf_alloc();
+ 
     // initializes the distributed heap[x,y]
     for ( cx = 0 ; cx < x_size ; cx++ )

soft/giet_vm/applications/sort/Makefile

@@ -2 +2 @@
 APP_NAME = sort
 
-OBJS = main.o
+OBJS = sort.o
 
 LIBS = -L../../build/libs -luser

soft/giet_vm/applications/sort/sort.py

@@ -11 +11 @@
 #  application on a multi_clusters, multi-processors architecture.
 #  This include both the mapping of virtual segments on the clusters,
-#  and the mapping of tasks on processors.
+#  and the mapping of threads on processors.
 #  This mapping uses 5 platform parameters, (obtained from the "mapping" argument)
 #  - x_size    : number of clusters in a row
@@ -29 +29 @@
     y_width   = mapping.y_width
 
-    ntasks    = x_size * y_size * nprocs
+    nthreads    = x_size * y_size * nprocs
 
     # define vsegs base & size
@@ -64 +64 @@
                                  local = True )
 
-    # stacks vsegs : local (one stack per task)
+    # stacks vsegs : local (one stack per thread)
     for x in xrange (x_size):
         for y in xrange (y_size):
@@ -79 +79 @@
                                      local = True, big = True )
 
-    # heap vsegs : distributed but non local (all tasks can access all heap vsegs)
+    # heap vsegs : distributed but non local (all threads can access all heap vsegs)
     for x in xrange (x_size):
         for y in xrange (y_size):
@@ -91 +91 @@
                                  local = False, big = True )
 
-    # distributed tasks / one task per processor
+    # distributed threads / one thread per processor
     for x in xrange (x_size):
         for y in xrange (y_size):
@@ -97 +97 @@
             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) :   # main thread
+                        startid = 1
+                        is_main = True
+                    else :                                    # other threads
+                        startid = 0
+                        is_main = False
 
-                    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 )
+                    mapping.addThread( vspace, 
+                                       'sort_%d_%d_%d' % (x,y,p),
+                                       is_main,
+                                       x, y, p,
+                                       'sort_stack_%d_%d_%d' % (x,y,p),
+                                       'sort_heap_%d_%d' % (x,y),
+                                       startid )
 
     # extend mapping name