Changeset 805 for soft

Timestamp:

Mar 15, 2016, 6:35:28 PM (8 years ago)

Author:

meunier

Message:

• Adding the parallel version of rosenfeld

Location:

soft/giet_vm/applications/rosenfeld

Files:

• Makefile (modified) (2 diffs)
• include/mca.h (added)
• include/mca_matrix_dist.h (added)
• include/mca_rosenfeld.h (added)
• include/mca_test.h (added)
• nrc2/src/nrio1.c (modified) (1 diff)
• nrc2/src/nrio2.c (modified) (5 diffs)
• nrc2/src/nrset1.c (modified) (1 diff)
• rosenfeld.py (modified) (4 diffs)
• src-par (added)
• src-par/bmpNR.c (added)
• src-par/ecc_common.c (added)
• src-par/mca.c (added)
• src-par/mca_main.c (added)
• src-par/mca_matrix_dist.c (added)
• src-par/mca_rosenfeld.c (added)
• src-par/mca_test.c (added)
• src-par/mt19937.c (added)
• src-par/palette.c (added)
• src-par/util.c (added)
• src/ecc_main_rosenfeld_sa.c (modified) (1 diff)

soft/giet_vm/applications/rosenfeld/Makefile

@@ -1 +1 @@
 
 # -- Paths ----------
-SRC_PATH = src
+SRC_PATH = src-par
 OBJ_PATH = obj
 EXE_PATH = bin
@@ -42 +42 @@
 
 
-CFLAGSW := -Wredundant-decls -Wdisabled-optimization -Winline -Wpointer-arith -Wsign-compare -Wendif-labels -Wno-unused-function
+CFLAGSW := -Wredundant-decls -Wdisabled-optimization -Winline -Wpointer-arith -Wsign-compare -Wendif-labels -Wno-unused-function -Wno-unused-variable
 
 # -- Flags ----------

soft/giet_vm/applications/rosenfeld/nrc2/src/nrio1.c

@@ -323 +323 @@
   for(i=nl; i<=nh; i++) {
     printf(format, i);
-  }
-  printf("\n");
-
-  for(i=nl; i<=nh; i++) {
-    printf(format, v[i]);
+    printf(" ");
+  }
+  printf("\n");
+
+  for(i=nl; i<=nh; i++) {
+    printf(format, v[i]);
+    printf(" ");
   }
   printf("\n");

soft/giet_vm/applications/rosenfeld/nrc2/src/nrio2.c

@@ -734 +734 @@
     int i, j;
     
+    char * format;
+    char * str;
+    
+    select_display_positive_parameters(iformat, &format, &str);
+    
+    if (name != NULL) {
+        printf("%s\n", name);
+    }
+    
+    // @QM have to hack this function for the giet
+    for (i = i0; i <= i1; i++) {
+        for (j = j0; j <= j1; j++) {
+            if (m[i][j]) {
+                // For the giet
+                int a = m[i][j];
+                int len = 0;
+                if (a == 0) {
+                    len = 1;
+                }
+                else {
+                    while (a != 0) {
+                        a = a / 10;
+                        len++;
+                    }
+                }
+                for (int k = len; k < iformat; k++) {
+                    printf(" ");
+                }
+                printf("%d", m[i][j]);
+            }
+            else {
+                printf("%s", str);
+            }
+        }
+        printf("\n");
+    }    
+}
+
+
+// --------------------------------------------------------------------------------------------------
+void display_si16matrix_positive(sint16 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
+// --------------------------------------------------------------------------------------------------
+{
+    int i, j;
+    
     char *format, *str;
     
@@ -752 +797 @@
 }
 // --------------------------------------------------------------------------------------------------
-void display_si16matrix_positive(sint16 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
+void display_ui16matrix_positive(uint16 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
 // --------------------------------------------------------------------------------------------------
 {
     int i, j;
-    
     char *format, *str;
     
@@ -775 +819 @@
 }
 // --------------------------------------------------------------------------------------------------
-void display_ui16matrix_positive(uint16 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
+void display_si32matrix_positive(sint32 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
 // --------------------------------------------------------------------------------------------------
 {
@@ -797 +841 @@
 }
 // --------------------------------------------------------------------------------------------------
-void display_si32matrix_positive(sint32 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
+void display_ui32matrix_positive(uint32 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
 // --------------------------------------------------------------------------------------------------
 {
     int i, j;
-    char *format, *str;
+    char * format;
+    char * str;
     
     select_display_positive_parameters(iformat, &format, &str);
     
-    if(name != NULL) printf(name);
-    
-    for(i=i0; i<=i1; i++) {
-        for(j=j0; j<=j1; j++) {
-            if(m[i][j]) {
-                printf(format, m[i][j]);
-            } else {
+    if (name != NULL) {
+        printf("%s\n", name);
+    }
+    
+    // @QM have to hack this function for the giet
+    for (i = i0; i <= i1; i++) {
+        for (j = j0; j <= j1; j++) {
+            if (m[i][j] != 0) {
+                int a = m[i][j];
+                int len = 0;
+                if (a == 0) {
+                    len = 1;
+                }
+                else {
+                    while (a != 0) {
+                        a = a / 10;
+                        len++;
+                    }
+                }
+                for (int k = len; k < iformat; k++) {
+                    printf(" ");
+                }
+                printf("%d", m[i][j]);
+            }
+            else {
                 printf("%s", str);
             }
@@ -817 +880 @@
         printf("\n");
     }    
-}
-// --------------------------------------------------------------------------------------------------
-void display_ui32matrix_positive(uint32 **m, int i0, int i1, int j0, int j1, int iformat, char *name)
-// --------------------------------------------------------------------------------------------------
-{
-    int i, j;
-    char *format, *str;
-    
-    select_display_positive_parameters(iformat, &format, &str);
-    
-    if(name != NULL) printf(name);
-    
-    for(i=i0; i<=i1; i++) {
-        for(j=j0; j<=j1; j++) {
-            if(m[i][j]) {
-                printf(format, m[i][j]);
-            } else {
-                printf("%s", str);
-            }
-        }
-        printf("\n");
-    }    
+
 }
 // --------------------------------------------------------------------------------------------------

soft/giet_vm/applications/rosenfeld/nrc2/src/nrset1.c

@@ -497 +497 @@
 /* --------------------------------------------------------------------- */
 {
-        int i;
-        char c[1];
-        for(i=nl; i<=nh; i++) {
-
-                *c = *str++;
-                if(isdigit(*c))
+    // @QM
+        int i;
+        char c[2];
+    c[1] = '\0';
+        for (i = nl; i <= nh; i++) {
+                c[0] = *str++;
+                if (isdigit(c[0])) {
                         v[i] = (uint8) atoi(c);
-                else
+        }
+                else {
                         v[i] = (uint8) 0;
+        }
         }
 }

soft/giet_vm/applications/rosenfeld/rosenfeld.py

@@ -25 +25 @@
 
 #########################
-def extend( mapping ):
+def extend(mapping):
 
     x_size    = mapping.x_size
@@ -59 +59 @@
         for y in xrange (y_size):
             cluster_id = (x * y_size) + y
-            if ( mapping.clusters[cluster_id].procs ):
+            if (mapping.clusters[cluster_id].procs):
 
                 mapping.addVseg( vspace, 'rosen_code_%d_%d' %(x,y), 
@@ -71 +71 @@
         for y in xrange (y_size):
             cluster_id = (x * y_size) + y
-            if ( mapping.clusters[cluster_id].procs ):
-                for p in xrange( nprocs ):
+            if (mapping.clusters[cluster_id].procs):
+                for p in xrange(nprocs):
                     proc_id = (((x * y_size) + y) * nprocs) + p
                     size    = (stack_size / nprocs) & 0xFFFFF000
@@ -86 +86 @@
         for y in xrange (y_size):
             cluster_id = (x * y_size) + y
-            if ( mapping.clusters[cluster_id].procs ):
-                size  = heap_size
-                base  = heap_base + (cluster_id * size)
+            if (mapping.clusters[cluster_id].procs):
+                size = heap_size
+                base = heap_base + (cluster_id * size)
 
-                mapping.addVseg( vspace, 'rosen_heap_%d_%d' % (x,y), base, size, 
-                                 'C_WU', vtype = 'HEAP', x = x, y = y, pseg = 'RAM',
-                                 local = False, big = True )
+                mapping.addVseg(vspace, 'rosen_heap_%d_%d' % (x, y), base, size, 
+                                'C_WU', vtype = 'HEAP', x = x, y = y, pseg = 'RAM',
+                                local = False, big = True )
 
     # distributed tasks / one task per processor
-    #for x in xrange (x_size):
-    #    for y in xrange (y_size):
-    #        cluster_id = (x * y_size) + y
-    #        if ( mapping.clusters[cluster_id].procs ):
-    #            for p in xrange( nprocs ):
-    #                trdid = (((x * y_size) + y) * nprocs) + p
+    for x in xrange (x_size):
+        for y in xrange (y_size):
+            cluster_id = (x * y_size) + y
+            if (mapping.clusters[cluster_id].procs):
+                for p in xrange(nprocs):
+                    trdid = (((x * y_size) + y) * nprocs) + p
+                    if trdid == 0:
+                        startid = 0
+                        is_main = 1
+                    else:
+                        startid = 1
+                        is_main = 0
+                    #startid = trdid == 0 and 0 or 1
+                    #is_main = startid == 0
 
-    #                mapping.addTask( vspace, 'rosen_%d_%d_%d' % (x,y,p),
-    #                                 trdid, x, y, p,
-    #                                 'rosen_stack_%d_%d_%d' % (x,y,p),
-    #                                 'rosen_heap_%d_%d' % (x,y), 0 )
-    mapping.addThread( vspace, 'main', True, 0, 0, 0,
-                       'rosen_stack_0_0_0',
-                       'rosen_heap_0_0',
-                       0 )                      # index in start_vector
+                    mapping.addThread(vspace, 'rosen_%d_%d_%d' % (x, y, p),
+                                    is_main, x, y, p,
+                                    'rosen_stack_%d_%d_%d' % (x,y,p),
+                                    'rosen_heap_%d_%d' % (x,y), startid)
 
 

soft/giet_vm/applications/rosenfeld/src/ecc_main_rosenfeld_sa.c

@@ -120 +120 @@
     N = ui32vector(0, nemax);
     
-    S = ui32vector(0, 2*nermax);
+    S = ui32vector(0, 2 * nermax);
     
     initT(T, nemax);