Changeset 292

Timestamp:

Feb 14, 2014, 2:38:53 PM (11 years ago)

Author:

cfuguet

Message:

• Introducing XML description file for the tsar_generic_leti platform.

• Modification in the sort application: Introducing VOBJ CONST for sort application containing the number of threads.

Location:

soft/giet_vm

Files:

• mappings/4c_4p_sort_leti.xml (added)
• sort/main.c (modified) (6 diffs)

soft/giet_vm/sort/main.c

@@ -34 +34 @@
 
 #include "stdio.h"
+#include "mapping_info.h"
 #include "hard_config.h"
 #include "barrier.h"
 
-//////////////////////////////////////////////////////////////////////////
-// The NTHREADS constant must be modified depending on the desired number of
-// threads
-
-#define NTHREADS        8
-#define ARRAY_LENGTH    (NTHREADS * 128)
-#define IPT             (ARRAY_LENGTH / NTHREADS) // ITEMS PER THREAD
+#define ARRAY_LENGTH    2048
+#define IPT             (ARRAY_LENGTH / *nb_thread) // ITEMS PER THREAD
 
 ////////////////////////////////////////////////////////////////////////////////
@@ -72 +68 @@
 int array1[ARRAY_LENGTH];
 
-volatile int init_ok = 0;
+int init_ok = 0;
 
 void bubbleSort(
@@ -89 +85 @@
 ///////////////////////////////////////////////////
 // This application support at most 256 processors
-// Number of barriers = log2(NTHREADS)
+// Number of barriers = log2(nb_thread)
 
 giet_barrier_t barrier[8];
@@ -96 +92 @@
 {
     int thread_id = giet_thread_id();
-
+    unsigned int* nb_thread;
     int * src_array;
     int * dst_array;
     int i;
-
-    printf("[ Thread %d ] Initializing vector and barriers...\n\r", thread_id);
+    
+    unsigned int time_start = giet_proctime();
+    unsigned int time_end;   
+
+    if( giet_vobj_get_vbase( "sort" , 
+                             "nb_thread", 
+                             VOBJ_TYPE_CONST, 
+                             (unsigned int*)&nb_thread ) )
+    {
+        printf( "\n[ERROR] in sort task :\n");
+        printf( "          undefined <nb_thread> constant: %d\n", nb_thread);
+        exit();
+    }   
+    
+    task0_printf("[Thread 0 ] Starting sort application with %d threads "
+                 "at cycle %d\n", *nb_thread, time_start);
 
     ///////////////////////////
     // Barriers Initialization
 
-    for (i = 0; i < __builtin_ctz(NTHREADS); i++)
-    {
-        barrier_init(&barrier[i], NTHREADS >> i);
+    if (thread_id == 0)
+    {
+        for (i = 0; i < __builtin_ctz(*nb_thread); i++)
+        {
+            barrier_init(&barrier[i], *nb_thread >> i);
+        }
+
+        init_ok = 1;
+    }
+    else
+    {
+        while(!init_ok);
     }
 
@@ -128 +147 @@
     printf("[ Thread %d ] Finishing Stage 0\n\r", thread_id);
 
-    for (i = 0; i < __builtin_ctz(NTHREADS); i++)
+    for (i = 0; i < __builtin_ctz(*nb_thread); i++)
     {
         asm volatile ("sync");
@@ -183 +202 @@
         }
 
+        time_end = giet_proctime();
+        printf("[ Thread 0 ] Finishing sort application at cycle %d\n"
+               "[ Thread 0 ] Time elapsed = %d\n",
+                time_end, (time_end - time_start) );
+
         if (success)
         {
+
             printf("[ Thread 0 ] Success!!\n\r");
         }