X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=include%2Fllvm%2FPassSupport.h;h=ccc79345e0304e9410084aa35c1de60e80c89f99;hb=566fb9fe3ed767be7218fb1608ec6a284067d3b0;hp=454217970cde09a67daaec5d83c8931800d0a088;hpb=081c34b725980f995be9080eaec24cd3dfaaf065;p=oota-llvm.git

diff --git a/include/llvm/PassSupport.h b/include/llvm/PassSupport.h
index 454217970cd..ccc79345e03 100644
--- a/include/llvm/PassSupport.h
+++ b/include/llvm/PassSupport.h
@@ -18,13 +18,14 @@
 //
 //===----------------------------------------------------------------------===//
 
-#ifndef LLVM_PASS_SUPPORT_H
-#define LLVM_PASS_SUPPORT_H
+#ifndef LLVM_PASSSUPPORT_H
+#define LLVM_PASSSUPPORT_H
 
 #include "Pass.h"
-#include "llvm/PassRegistry.h"
 #include "llvm/InitializePasses.h"
-#include "llvm/System/Atomic.h"
+#include "llvm/PassRegistry.h"
+#include "llvm/Support/Atomic.h"
+#include "llvm/Support/Valgrind.h"
 #include <vector>
 
 namespace llvm {
@@ -125,32 +126,39 @@ public:
   }
 
 private:
-  void operator=(const PassInfo &); // do not implement
-  PassInfo(const PassInfo &);       // do not implement
+  void operator=(const PassInfo &) LLVM_DELETED_FUNCTION;
+  PassInfo(const PassInfo &) LLVM_DELETED_FUNCTION;
 };
 
+#define CALL_ONCE_INITIALIZATION(function) \
+  static volatile sys::cas_flag initialized = 0; \
+  sys::cas_flag old_val = sys::CompareAndSwap(&initialized, 1, 0); \
+  if (old_val == 0) { \
+    function(Registry); \
+    sys::MemoryFence(); \
+    TsanIgnoreWritesBegin(); \
+    TsanHappensBefore(&initialized); \
+    initialized = 2; \
+    TsanIgnoreWritesEnd(); \
+  } else { \
+    sys::cas_flag tmp = initialized; \
+    sys::MemoryFence(); \
+    while (tmp != 2) { \
+      tmp = initialized; \
+      sys::MemoryFence(); \
+    } \
+  } \
+  TsanHappensAfter(&initialized);
+
 #define INITIALIZE_PASS(passName, arg, name, cfg, analysis) \
   static void* initialize##passName##PassOnce(PassRegistry &Registry) { \
     PassInfo *PI = new PassInfo(name, arg, & passName ::ID, \
       PassInfo::NormalCtor_t(callDefaultCtor< passName >), cfg, analysis); \
-    Registry.registerPass(*PI); \
+    Registry.registerPass(*PI, true); \
     return PI; \
   } \
   void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
-    static volatile sys::cas_flag initialized = 0; \
-    sys::cas_flag old_val = sys::CompareAndSwap(&initialized, 1, 0); \
-    if (old_val == 0) { \
-      initialize##passName##PassOnce(Registry); \
-      sys::MemoryFence(); \
-      initialized = 2; \
-    } else { \
-      sys::cas_flag tmp = initialized; \
-      sys::MemoryFence(); \
-      while (tmp != 2) { \
-        tmp = initialized; \
-        sys::MemoryFence(); \
-      } \
-    } \
+    CALL_ONCE_INITIALIZATION(initialize##passName##PassOnce) \
   }
 
 #define INITIALIZE_PASS_BEGIN(passName, arg, name, cfg, analysis) \
@@ -164,24 +172,11 @@ private:
 #define INITIALIZE_PASS_END(passName, arg, name, cfg, analysis) \
     PassInfo *PI = new PassInfo(name, arg, & passName ::ID, \
       PassInfo::NormalCtor_t(callDefaultCtor< passName >), cfg, analysis); \
-    Registry.registerPass(*PI); \
+    Registry.registerPass(*PI, true); \
     return PI; \
   } \
   void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
-    static volatile sys::cas_flag initialized = 0; \
-    sys::cas_flag old_val = sys::CompareAndSwap(&initialized, 1, 0); \
-    if (old_val == 0) { \
-      initialize##passName##PassOnce(Registry); \
-      sys::MemoryFence(); \
-      initialized = 2; \
-    } else { \
-      sys::cas_flag tmp = initialized; \
-      sys::MemoryFence(); \
-      while (tmp != 2) { \
-        tmp = initialized; \
-        sys::MemoryFence(); \
-      } \
-    } \
+    CALL_ONCE_INITIALIZATION(initialize##passName##PassOnce) \
   }
 
 template<typename PassName>
@@ -262,24 +257,11 @@ struct RegisterAnalysisGroup : public RegisterAGBase {
   static void* initialize##agName##AnalysisGroupOnce(PassRegistry &Registry) { \
     initialize##defaultPass##Pass(Registry); \
     PassInfo *AI = new PassInfo(name, & agName :: ID); \
-    Registry.registerAnalysisGroup(& agName ::ID, 0, *AI, false); \
+    Registry.registerAnalysisGroup(& agName ::ID, 0, *AI, false, true); \
     return AI; \
   } \
   void llvm::initialize##agName##AnalysisGroup(PassRegistry &Registry) { \
-    static volatile sys::cas_flag initialized = 0; \
-    sys::cas_flag old_val = sys::CompareAndSwap(&initialized, 1, 0); \
-    if (old_val == 0) { \
-      initialize##agName##AnalysisGroupOnce(Registry); \
-      sys::MemoryFence(); \
-      initialized = 2; \
-    } else { \
-      sys::cas_flag tmp = initialized; \
-      sys::MemoryFence(); \
-      while (tmp != 2) { \
-        tmp = initialized; \
-        sys::MemoryFence(); \
-      } \
-    } \
+    CALL_ONCE_INITIALIZATION(initialize##agName##AnalysisGroupOnce) \
   }
 
 
@@ -288,27 +270,15 @@ struct RegisterAnalysisGroup : public RegisterAGBase {
     if (!def) initialize##agName##AnalysisGroup(Registry); \
     PassInfo *PI = new PassInfo(name, arg, & passName ::ID, \
       PassInfo::NormalCtor_t(callDefaultCtor< passName >), cfg, analysis); \
-    Registry.registerPass(*PI); \
+    Registry.registerPass(*PI, true); \
     \
     PassInfo *AI = new PassInfo(name, & agName :: ID); \
-    Registry.registerAnalysisGroup(& agName ::ID, & passName ::ID, *AI, def); \
+    Registry.registerAnalysisGroup(& agName ::ID, & passName ::ID, \
+                                   *AI, def, true); \
     return AI; \
   } \
   void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
-    static volatile sys::cas_flag initialized = 0; \
-    sys::cas_flag old_val = sys::CompareAndSwap(&initialized, 1, 0); \
-    if (old_val == 0) { \
-      initialize##passName##PassOnce(Registry); \
-      sys::MemoryFence(); \
-      initialized = 2; \
-    } else { \
-      sys::cas_flag tmp = initialized; \
-      sys::MemoryFence(); \
-      while (tmp != 2) { \
-        tmp = initialized; \
-        sys::MemoryFence(); \
-      } \
-    } \
+    CALL_ONCE_INITIALIZATION(initialize##passName##PassOnce) \
   }
 
 
@@ -319,27 +289,15 @@ struct RegisterAnalysisGroup : public RegisterAGBase {
 #define INITIALIZE_AG_PASS_END(passName, agName, arg, n, cfg, analysis, def) \
     PassInfo *PI = new PassInfo(n, arg, & passName ::ID, \
       PassInfo::NormalCtor_t(callDefaultCtor< passName >), cfg, analysis); \
-    Registry.registerPass(*PI); \
+    Registry.registerPass(*PI, true); \
     \
     PassInfo *AI = new PassInfo(n, & agName :: ID); \
-    Registry.registerAnalysisGroup(& agName ::ID, & passName ::ID, *AI, def); \
+    Registry.registerAnalysisGroup(& agName ::ID, & passName ::ID, \
+                                   *AI, def, true); \
     return AI; \
   } \
   void llvm::initialize##passName##Pass(PassRegistry &Registry) { \
-    static volatile sys::cas_flag initialized = 0; \
-    sys::cas_flag old_val = sys::CompareAndSwap(&initialized, 1, 0); \
-    if (old_val == 0) { \
-      initialize##passName##PassOnce(Registry); \
-      sys::MemoryFence(); \
-      initialized = 2; \
-    } else { \
-      sys::cas_flag tmp = initialized; \
-      sys::MemoryFence(); \
-      while (tmp != 2) { \
-        tmp = initialized; \
-        sys::MemoryFence(); \
-      } \
-    } \
+    CALL_ONCE_INITIALIZATION(initialize##passName##PassOnce) \
   }
 
 //===---------------------------------------------------------------------------
@@ -347,7 +305,7 @@ struct RegisterAnalysisGroup : public RegisterAGBase {
 /// clients that are interested in which passes get registered and unregistered
 /// at runtime (which can be because of the RegisterPass constructors being run
 /// as the program starts up, or may be because a shared object just got
-/// loaded).  Deriving from the PassRegistationListener class automatically
+/// loaded).  Deriving from the PassRegistrationListener class automatically
 /// registers your object to receive callbacks indicating when passes are loaded
 /// and removed.
 ///