Changeset 821 for soft/giet_vm/applications/rosenfeld/include/mca.h

Timestamp:

May 6, 2016, 3:06:29 PM (8 years ago)

Author:

meunier

Message:

• Added several versions of rosenfeld: { SLOW, FAST } x { FEATURES, NO_FEATURES }
• Added native linux compilation support
• Added a script to check results natively
• Started to refactor nrc code

File:

• soft/giet_vm/applications/rosenfeld/include/mca.h (modified) (4 diffs)

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

@@ -14 +14 @@
 #define __MCA_H__
 
-#include <user_lock.h>
+#include "ecc_features.h"
+
+#include "nrc_os_config.h"
+
+#if TARGET_OS == GIETVM
+    #include <user_lock.h>
+    #include <user_barrier.h>
+#elif TARGET_OS == LINUX
+    #include <pthread.h>
+#endif
 
 
-#ifdef __cplusplus
-#ifdef VERBOSE_PRAGMA
-#pragma message ("C++")
-#endif
-extern "C" {
-#endif
+// QM : using mutex lock instead of mutexlock,
+// because apparently mutexlocks cause a bug in valgrind
+// (solved but the installed version is not recent enough)
+// cf. https://bugs.kde.org/show_bug.cgi?id=336435
+pthread_mutex_t print_lock;
 
-user_lock_t print_lock;
-
-#define MCA_VERBOSE0(X) ({         \
-        lock_acquire(&print_lock); \
-        X;                         \
-        lock_release(&print_lock); \
+#define MCA_VERBOSE0(X) ({                 \
+        pthread_mutex_lock(&print_lock);   \
+        X;                                 \
+        pthread_mutex_unlock(&print_lock); \
         })
-#define MCA_VERBOSE1(X) ({         \
-        lock_acquire(&print_lock); \
-        X;                         \
-        lock_release(&print_lock); \
+#define MCA_VERBOSE1(X) ({                 \
+        pthread_mutex_lock(&print_lock);   \
+        X;                                 \
+        pthread_mutex_unlock(&print_lock); \
+        })
+#define MCA_DISPLAY0(X) ({                 \
+        pthread_mutex_lock(&print_lock);   \
+        X;                                 \
+        pthread_mutex_unlock(&print_lock); \
+        })
+#define MCA_DISPLAY1(X) ({                 \
+        pthread_mutex_lock(&print_lock);   \
+        X;                                 \
+        pthread_mutex_unlock(&print_lock); \
         })
 
 
-//#define MCA_VERBOSE2(X) X
-#define MCA_VERBOSE2(X) 
+#define MCA_VERBOSE2(X)
+/*
+#define MCA_VERBOSE2(X) ({                 \
+        pthread_mutex_lock(&print_lock);   \
+        X;                                 \
+        pthread_mutex_unlock(&print_lock); \
+        })
+*/
+
+#define MCA_DISPLAY2(X) 
 
 
@@ -56 +80 @@
     
     uint32 e0, e1; // indice pour chaque bande
-    uint32 ne; // indice max d'etiquettes utilise par bande
+    uint32 ne;     // indice max d'etiquettes utilise par bande
 
-    int alpha; // puissance de 2 >= a la taille d'un bloc
-    //uint32 *I;
-    uint32  *T; // table d'quivalence table (Rosenfeld) ou d'indices (Warp)
-    uint32 **D; // distributed table (instanciee dans chaque worker)
+    int alpha;     // puissance de 2 >= a la taille d'un bloc
+    uint32  * T;   // table d'quivalence table (Rosenfeld) ou d'indices (Warp)
+    uint32 ** D;   // distributed table (instanciee dans chaque worker)
     
-    //RegionStats *Stats;
+    RegionStats * stats;
+    RegionStats ** F;
     
     struct sMCA * mca;   // pointeur vers le maitre (pour les esclaves)
     struct sMCA ** mcas; // tableau de pointeurs vers les workers
+
+    // For pyramidal barriers
+    int nb_level;
+    pthread_barrier_t * barriers;
 } MCA;
-    
+ 
 void MCA_Error(char * msg);
 
@@ -77 +105 @@
 void MCA_Set_ImageL(MCA * mca, uint32 ** E);
 
-void   MCA_Set_Size(MCA * mca, int width, int height);
-void   MCA_Set_NP(MCA * mca, int np);
+void MCA_Set_Size(MCA * mca, int width, int height);
+void MCA_Set_NP(MCA * mca, int np);
 
 uint32 MCA_CalcMaxLabels(int connection, uint32 height, uint32 width);
@@ -99 +127 @@
 void MCA_Warp(MCA * mca);
 
-#ifdef __cplusplus
-}
-#endif
 
 #endif // __MCA_H__