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

Timestamp:

Mar 26, 2014, 6:44:44 PM (11 years ago)

Author:

alain

Message:

Introducing a major release, to suppoort the tsar_generic_leti platform
and the various (external or internal) peripherals configurations.
The map.xml format has been modified, in order to support the new
vci_iopic componentand a new policy for peripherals initialisation.
The IRQs are nom described in the XICU and IOPIC components
(and not anymore in the processors).
To enforce this major change, the map.xml file signature changed:
The signature value must be: 0xDACE2014

This new release has been tested on the tsar_generic_leti platform
for the following mappings:

• 4c_4p_sort_leti
• 4c_4p_sort_leti_ext
• 4c_4p_transpose_leti
• 4c_4p_transpose_leti_ext
• 4c_1p_four_leti_ext

File:

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

soft/giet_vm/sort/main.c

@@ -1 +1 @@
 ///////////////////////////////////////////////////////////////////////////////
-// File :
-//      
-//      main.c
-//
-// Date :
-//      
-//      November 2013
-//
-// Author :
-//
-//      Cesar Fuguet Tortolero <cesar.fuguet-tortolero@lip6.fr>
+// File   :  main.c
+// Date   :  November 2013
+// Author :  Cesar Fuguet Tortolero <cesar.fuguet-tortolero@lip6.fr>
 //
 // Description :
@@ -38 +30 @@
 #include "barrier.h"
 
-#define ARRAY_LENGTH    2048
+#define ARRAY_LENGTH    512 
 #define IPT             (ARRAY_LENGTH / *nb_thread) // ITEMS PER THREAD
 
@@ -47 +39 @@
 #define VERBOSE         1
 
-///////////////////////////////////////////////////////////////////////
+////////////////////////////////////////////////////////////////////////////////
 // Define printf according to verbosity option and number of available
 // TTY
 
 #if (VERBOSE == 1)
-#   define printf(...)     giet_tty_printf(__VA_ARGS__)
-#   define puts(...)       giet_tty_puts(__VA_ARGS__)
+#   define printf(...)     giet_shr_printf(__VA_ARGS__)
 #else       // VERBOSE == 0
 #   define printf(...)
-#   define puts(...)
 #endif
 
-#define task0_printf(...) if(thread_id == 0) giet_tty_printf(__VA_ARGS__)
+#define task0_printf(...) if(thread_id == 0) giet_shr_printf(__VA_ARGS__)
 
 #define exit    giet_exit
@@ -89 +79 @@
 giet_barrier_t barrier[8];
 
+//////////////////////////////////////////
 __attribute__ ((constructor)) void sort()
 {
@@ -100 +91 @@
     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();
-    }   
+    giet_vobj_get_vbase( "sort" , 
+                         "nb_thread", 
+                         (unsigned int*)&nb_thread );
     
-    task0_printf("[Thread 0 ] Starting sort application with %d threads "
+    task0_printf("\n[ Thread 0 ] Starting sort application with %d threads "
                  "at cycle %d\n", *nb_thread, time_start);
 
@@ -141 +126 @@
     // Parallel sort of array elements
 
-    printf("[ Thread %d ] Stage 0: Processor Sorting...\n\r", thread_id);
+    printf("[ Thread %d ] Stage 0: Sorting...\n\r", thread_id);
 
     bubbleSort(array0, IPT, IPT * thread_id);
@@ -154 +139 @@
         if((thread_id % (2 << i)) != 0)
         {
-            printf("[ Thread %d ] Quits\n\r", thread_id);
-            exit();
-        }
-
-        printf("[ Thread %d ] Stage %d: Starting...\n\r", thread_id, i+1);
+            printf("[ Thread %d ] Quit\n\r", thread_id );
+            exit("Completed");
+        }
+
+        printf("[ Thread %d ] Stage %d: Sorting...\n\r", thread_id, i+1);
 
         if((i % 2) == 0)
@@ -203 +188 @@
 
         time_end = giet_proctime();
+
         printf("[ Thread 0 ] Finishing sort application at cycle %d\n"
                "[ Thread 0 ] Time elapsed = %d\n",
@@ -209 +195 @@
         if (success)
         {
-
-            printf("[ Thread 0 ] Success!!\n\r");
+            exit("!!! Success !!!");
         }
         else
         {
-            printf("[ Thread 0 ] Failure!! Incorrect element: %d\n\r", failure_index);
-
-
+            printf("[ Thread 0 ] Failure!! Incorrect element: %d\n\r", 
+                   failure_index);
             for(i=0; i<ARRAY_LENGTH; i++)
             {
                 printf("array[%d] = %d\n", i, dst_array[i]);
             }
-        }
-    }
-
-    exit();
+            exit("!!!  Failure !!!");
+        }
+    }
+    exit("Completed");
 }
 
-void bubbleSort(
-        int * array,
-        unsigned int length,
-        unsigned int init_pos)
+////////////////////////////////////
+void bubbleSort( int *        array,
+                 unsigned int length,
+                 unsigned int init_pos )
 {
     int i;
@@ -250 +234 @@
 }
 
+/////////////
 void merge(
         int * array,