Changeset 822 for soft/giet_vm/applications/rosenfeld/include/config.h

Timestamp:

Jun 1, 2016, 10:25:43 AM (8 years ago)

Author:

meunier

Message:

In rosenfeld:

• Updated nrio0, nrio1, nrio2, nrio1f, nrio2f, nrio1x, nrbool1, nrbool2 and nralloc1 in the nrc2 lib in order to use macro-typed functions
• Updated the simulation script to include performance evaluation with random images, and a script to generate graphs
• Updated the clock.h to use 64-bit integers, which potentially breaks the printing on the giet

File:

• soft/giet_vm/applications/rosenfeld/include/config.h (modified) (3 diffs)

soft/giet_vm/applications/rosenfeld/include/config.h

@@ +1 @@
+
+#ifndef __CONFIG_H_
+#define __CONFIG_H_
 
 #define SLOW 0
@@ -4 +7 @@
 #define FAST 1
 #define PYR_BARRIERS 0
-#define PARMERGE 1
+#define PARMERGE 0
+#define ARSP 0
 
 #if FAST && SLOW
@@ -14 +18 @@
 #endif
 
-#if PARMERGE && (!FEATURES || !FAST)
-#error "PARMERGE is only supported for the FAST version with FEATURES enabled"
+
+#if FAST
+    #if   !FEATURES && !PARMERGE && !ARSP
+        #define vuse2_Rosenfeld(e, f,    T, D, alpha, F) vuse2_Rosenfeld_Dist(e, f,    T, D, alpha)
+        #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F) vuse3_Rosenfeld_Dist(e, f, g, T, D, alpha)
+    #elif !FEATURES && !PARMERGE &&  ARSP
+        #define vuse2_Rosenfeld(e, f,    T, D, alpha, F) vuse2_Arsp_Rosenfeld_Dist(e, f,    T, D, alpha)
+        #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F) vuse3_Arsp_Rosenfeld_Dist(e, f, g, T, D, alpha)
+        #error "Configuration Not implemented"
+    #elif !FEATURES &&  PARMERGE && !ARSP
+        #define vuse2_Rosenfeld(e, f,    T, D, alpha, F) vuse2_Parallel_Rosenfeld_Dist(e, f,    T, D, alpha, F)
+        #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F) vuse3_Parallel_Rosenfeld_Dist(e, f, g, T, D, alpha, F)
+        #error "Configuration Not implemented"
+    #elif !FEATURES &&  PARMERGE &&  ARSP
+        #define vuse2_Rosenfeld(e, f,    T, D, alpha, F) vuse2_Parallel_Arsp_Rosenfeld_Dist(e, f,    T, D, alpha, F)
+        #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F) vuse3_Parallel_Arsp_Rosenfeld_Dist(e, f, g, T, D, alpha, F)
+    #elif  FEATURES && !PARMERGE && !ARSP
+        #define vuse2_Rosenfeld(e, f,    T, D, alpha, F) vuse2_Features_Rosenfeld_Dist(e, f,    T, D, alpha, F)
+        #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F) vuse3_Features_Rosenfeld_Dist(e, f, g, T, D, alpha, F)
+    #elif  FEATURES && !PARMERGE &&  ARSP
+        #define vuse2_Rosenfeld(e, f,    T, D, alpha, F) vuse2_Features_Arsp_Rosenfeld_Dist(e, f,    T, D, alpha, F)
+        #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F) vuse3_Features_Arsp_Rosenfeld_Dist(e, f, g, T, D, alpha, F)
+        #error "Configuration Not implemented"
+    #elif  FEATURES &&  PARMERGE && !ARSP
+        #define vuse2_Rosenfeld(e, f,    T, D, alpha, F) vuse2_Parallel_Features_Rosenfeld_Dist(e, f,    T, D, alpha, F)
+        #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F) vuse3_Parallel_Features_Rosenfeld_Dist(e, f, g, T, D, alpha, F)
+    #elif  FEATURES &&  PARMERGE && ARSP
+        #define vuse2_Rosenfeld(e, f,    T, D, alpha, F) vuse2_Parallel_Features_Arsp_Rosenfeld_Dist(e, f,    T, D, alpha, F)
+        #define vuse3_Rosenfeld(e, f, g, T, D, alpha, F) vuse3_Parallel_Features_Arsp_Rosenfeld_Dist(e, f, g, T, D, alpha, F)
+        #error "Configuration Not implemented"
+    #endif
 #endif
 
+#if SLOW
+    #if FEATURES
+        #define SetRoot_Rosenfeld(D, r, eps, alpha, F) SetRoot_Features_Rosenfeld_Dist(D, r, eps, alpha, F)
+    #else
+        #define SetRoot_Rosenfeld(D, r, eps, alpha, F) SetRoot_Rosenfeld_Dist(D, r, eps, alpha)
+    #endif
+    #if PARMERGE
+        #error "Configuration SLOW and PARMERGE Not implemented"
+    #endif
+    #if ARSP
+        #error "Configuration SLOW and ARSP Not implemented"
+    #endif
+#endif
+
+// Verbose level
+// 0 : No trace at all
+// 1 : Traces compatible with execution times measurements,
+//     in particular, there must not be any traces in the
+//     "compute" sections
+// 2 : Standard level
+// 3 : Maximum (debug) level
+#define MCA_VERBOSE_LEVEL 2
+
+#endif // __CONFIG_H__
+
+