Changeset 271 for soft/giet_vm/sort/main.c

Timestamp:

Jan 17, 2014, 11:49:27 PM (11 years ago)

Author:

cfuguet

Message:

• Bugfix: The ISR_SWITCH index should be NB_PROCS_MAX + local_pid. This is because the first NB_PROCS_MAX indexes on the XICU in each cluster are used for the WAKEUP software interrupts.

• Relocating the memcpy and memset functions into the giet_libs/stdlib.* files.

• Modification of the sort application to used 8 threads instead of
  4. Modifying the mapping files to distribute the 8 threads on the available processors. (Ex. When using 4 processors, each one executes 2 threads)

File:

• soft/giet_vm/sort/main.c (modified) (6 diffs)

soft/giet_vm/sort/main.c

@@ -38 +38 @@
 
 //////////////////////////////////////////////////////////////////////////
-// The NPROCS constant must be modified depending on the desired number of
+// The NTHREADS constant must be modified depending on the desired number of
 // threads
 
-#define NPROCS          4 
-#define ARRAY_LENGTH    (NPROCS * 128)
-#define IPP             (ARRAY_LENGTH / NPROCS) // ITEMS PER PROCESSOR
+#define NTHREADS        8
+#define ARRAY_LENGTH    (NTHREADS * 128)
+#define IPT             (ARRAY_LENGTH / NTHREADS) // ITEMS PER THREAD
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -89 +89 @@
 ///////////////////////////////////////////////////
 // This application support at most 256 processors
-// Number of barriers = log2(NPROCS)
+// Number of barriers = log2(NTHREADS)
 
 giet_barrier_t barrier[8];
@@ -101 +101 @@
     int i;
 
-    task0_printf("[ Thread 0 ] Starting SORT application\n");
+    printf("[ Thread %d ] Initializing vector and barriers...\n\r", thread_id);
 
     ///////////////////////////
     // Barriers Initialization
 
-    for (i = 0; i < __builtin_ctz(NPROCS); i++)
-    {
-        barrier_init(&barrier[i], NPROCS >> i);
+    for (i = 0; i < __builtin_ctz(NTHREADS); i++)
+    {
+        barrier_init(&barrier[i], NTHREADS >> i);
     }
 
@@ -114 +114 @@
     // Array Initialization
 
-    for (i = IPP * thread_id; i < IPP * (thread_id + 1); i++)
+    for (i = IPT * thread_id; i < IPT * (thread_id + 1); i++)
     {
         array0[i] = rand();
@@ -124 +124 @@
     printf("[ Thread %d ] Stage 0: Processor Sorting...\n\r", thread_id);
 
-    bubbleSort(array0, IPP, IPP * thread_id);
+    bubbleSort(array0, IPT, IPT * thread_id);
 
     printf("[ Thread %d ] Finishing Stage 0\n\r", thread_id);
 
-    for (i = 0; i < __builtin_ctz(NPROCS); i++)
+    for (i = 0; i < __builtin_ctz(NTHREADS); i++)
     {
         asm volatile ("sync");
@@ -153 +153 @@
 
         merge(src_array, dst_array
-                , IPP << i
-                , IPP * thread_id
-                , IPP * (thread_id + (1 << i))
-                , IPP * thread_id
+                , IPT << i
+                , IPT * thread_id
+                , IPT * (thread_id + (1 << i))
+                , IPT * thread_id
                 );