Changeset 345 for soft/giet_vm/router/main.c

Timestamp:

Jun 25, 2014, 2:19:37 PM (10 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/router/main.c (modified) (7 diffs)

soft/giet_vm/router/main.c

@@ -3 +3 @@
 #include "mapping_info.h"
 #include "hard_config.h"
+
+#if NB_TTY_CHANNELS == 1
+#  define printf(...) giet_shr_printf(__VA_ARGS__)
+#else
+#  define printf(...) giet_tty_printf(__VA_ARGS__)
+#endif
 
 #define NMAX 50
@@ -20 +26 @@
     unsigned int    y          = cluster_xy & ((1<<Y_WIDTH)-1);
 
-    giet_tty_printf( "*** Starting task producer on processor[%d,%d,%d] at cycle %d\n\n", 
-                      x, y, lpid, giet_proctime() );
+    printf( "*** Starting task producer on processor[%d,%d,%d] at cycle %d\n\n", 
+             x, y, lpid, giet_proctime() );
 
     giet_vobj_get_vbase( "router" , 
@@ -32 +38 @@
         buf = n;
         mwmr_write( mwmr, &buf , 1 );
-        giet_tty_printf( "transmitted value : %d\n", buf);
+        printf( "transmitted value : %d\n", buf);
     }
 
@@ -52 +58 @@
     unsigned int    y          = cluster_xy & ((1<<Y_WIDTH)-1);
 
-    giet_tty_printf( "*** Starting task consumer on processor[%d,%d,%d] at cycle %d\n\n", 
-                      x, y, lpid, giet_proctime() );
+    printf( "*** Starting task consumer on processor[%d,%d,%d] at cycle %d\n\n", 
+             x, y, lpid, giet_proctime() );
 
     giet_vobj_get_vbase( "router" , 
@@ -63 +69 @@
     { 
         mwmr_read( mwmr, &buf , 1 );
-        giet_tty_printf( "received token %d / value = %d\n", n  , buf);
+        printf( "received token %d / value = %d\n", n  , buf);
     }
 
@@ -85 +91 @@
     unsigned int    y          = cluster_xy & ((1<<Y_WIDTH)-1);
 
-    giet_tty_printf( "*** Starting task router on processor[%d,%d,%d] at cycle %d\n\n", 
-                      x, y, lpid, giet_proctime() );
+    printf( "*** Starting task router on processor[%d,%d,%d] at cycle %d\n\n", 
+             x, y, lpid, giet_proctime() );
 
     giet_vobj_get_vbase( "router" , 
@@ -101 +107 @@
         tempo = giet_rand() >> 6;
         for ( n = 0 ; n < tempo ; n++ ) asm volatile ("");
-        giet_tty_printf( "token value : %d / temporisation = %d\n", buf, tempo);
+        printf( "token value : %d / temporisation = %d\n", buf, tempo);
         mwmr_write( mwmr_out, &buf , 1 );
     }