Changeset 345 for soft/giet_vm/sort

Timestamp:

Jun 25, 2014, 2:19:37 PM (11 years ago)

Author:

cfuguet

Message:

giet_vm optimizations:

• Several modifications in GIET_VM in order to support compilation with GCC optimizations (-O2) activated.

• Adding missing volatile in some global variables.

• Using ioread and iowrite utility functions in peripheral drivers which prevent GCC to remove writes or reads in hardware memory mapped registers.

• Code refactoring of stdio printf functions. Now, shr_printf and tty_printf function reuse the same function body. The only difference is that shr_printf wraps printf function call with TTY get lock and release lock.

File:

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

soft/giet_vm/sort/main.c

@@ -58 +58 @@
 int array1[ARRAY_LENGTH];
 
-int init_ok = 0;
+volatile int init_ok = 0;
 
 void bubbleSort(
@@ -95 +95 @@
                          (unsigned int*)&nb_thread );
     
-    task0_printf("\n[ Thread 0 ] Starting sort application with %d threads "
-                 "at cycle %d\n", *nb_thread, time_start);
+    task0_printf("\n[ Thread 0 ] Starting sort application with %u threads "
+                 "at cycle %u\n", *nb_thread, time_start);
 
     ///////////////////////////
@@ -134 +134 @@
     for (i = 0; i < __builtin_ctz(*nb_thread); i++)
     {
-        asm volatile ("sync");
         barrier_wait(&barrier[i]);
 
@@ -171 +170 @@
     //////////////////////////////
     // Verify the resulting array
-
-    if(thread_id == 0)
-    {
-        success = 1;
-
-        for(i=0; i<(ARRAY_LENGTH-1); i++)
-        {
-            if(dst_array[i] > dst_array[i+1])
-            {
-
-                success = 0;
-                failure_index = i;
-                break;
-            }
-        }
-
-        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)
-        {
-            exit("!!! Success !!!");
-        }
-        else
-        {
-            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("!!!  Failure !!!");
-        }
-    }
+    
+    if(thread_id != 0)
+    {
+        exit("error: only thread 0 should get here");
+    }
+
+    success = 1;
+    for(i=0; i<(ARRAY_LENGTH-1); i++)
+    {
+        if(dst_array[i] > dst_array[i+1])
+        {
+
+            success = 0;
+            failure_index = i;
+            break;
+        }
+    }
+
+    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)
+    {
+        exit("!!! Success !!!");
+    }
+    else
+    {
+        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("!!!  Failure !!!");
+    }
+
     exit("Completed");
 }