Remove EarlyCSE hack for OmpSs-2. Add our PassManager

Closes llvm#77

Author: mikaoP

clang/lib/CodeGen/BackendUtil.cpp

@@ -185,10 +185,6 @@ class PassManagerBuilderWrapper : public PassManagerBuilder {
 };
 }
 
-static void addOmpSsPass(const PassManagerBuilder &Builder, PassManagerBase &PM) {
-  PM.add(createOmpSsPass());
-}
-
 static void addObjCARCAPElimPass(const PassManagerBuilder &Builder, PassManagerBase &PM) {
   if (Builder.OptLevel > 0)
     PM.add(createObjCARCAPElimPass());
@@ -619,13 +615,6 @@ void EmitAssemblyHelper::CreatePasses(legacy::PassManager &MPM,
   if (TM)
     TM->adjustPassManager(PMBuilder);
 
-  if (LangOpts.OmpSs) {
-    PMBuilder.addExtension(PassManagerBuilder::EP_ModuleOptimizerEarly,
-                           addOmpSsPass);
-    PMBuilder.addExtension(PassManagerBuilder::EP_EnabledOnOptLevel0,
-                           addOmpSsPass);
-  }
-
   if (CodeGenOpts.DebugInfoForProfiling ||
       !CodeGenOpts.SampleProfileFile.empty())
     PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible,
@@ -863,6 +852,16 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action,
   if (TM)
     TheModule->setDataLayout(TM->createDataLayout());
 
+  legacy::PassManager EarlyPerModulePasses;
+  // TODO: Do we need this?
+  EarlyPerModulePasses.add(
+    createTargetTransformInfoWrapperPass(getTargetIRAnalysis()));
+
+  if (LangOpts.OmpSs) {
+    if (!CodeGenOpts.DisableLLVMPasses)
+      EarlyPerModulePasses.add(createOmpSsPass());
+  }
+
   legacy::PassManager PerModulePasses;
   PerModulePasses.add(
       createTargetTransformInfoWrapperPass(getTargetIRAnalysis()));
@@ -936,6 +935,12 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action,
   // Run passes. For now we do all passes at once, but eventually we
   // would like to have the option of streaming code generation.
 
+  {
+    PrettyStackTraceString CrashInfo("Early per-module transformation");
+    llvm::TimeTraceScope TimeScope("EarlyPerModulePasses");
+    EarlyPerModulePasses.run(*TheModule);
+  }
+
   {
     PrettyStackTraceString CrashInfo("Per-function optimization");
     llvm::TimeTraceScope TimeScope("PerFunctionPasses");

llvm/lib/Transforms/Scalar/EarlyCSE.cpp

@@ -33,13 +33,11 @@
 #include "llvm/IR/DataLayout.h"
 #include "llvm/IR/Dominators.h"
 #include "llvm/IR/Function.h"
-#include "llvm/IR/InstIterator.h"
 #include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/Instruction.h"
 #include "llvm/IR/Instructions.h"
 #include "llvm/IR/IntrinsicInst.h"
 #include "llvm/IR/Intrinsics.h"
-#include "llvm/IR/IntrinsicsOmpSs.h"
 #include "llvm/IR/LLVMContext.h"
 #include "llvm/IR/PassManager.h"
 #include "llvm/IR/PatternMatch.h"
@@ -1410,16 +1408,6 @@ class EarlyCSELegacyCommonPass : public FunctionPass {
     if (skipFunction(F))
       return false;
 
-    // OmpSs-2: for now skip functions that have oss intrinsics
-    for (Instruction &Inst : instructions(F)) {
-      if (match(&Inst, m_Intrinsic<Intrinsic::directive_region_entry>()))
-        return false;
-      if (match(&Inst, m_Intrinsic<Intrinsic::directive_region_exit>()))
-        return false;
-      if (match(&Inst, m_Intrinsic<Intrinsic::directive_marker>()))
-        return false;
-    }
-
     auto &TLI = getAnalysis<TargetLibraryInfoWrapperPass>().getTLI(F);
     auto &TTI = getAnalysis<TargetTransformInfoWrapperPass>().getTTI(F);
     auto &DT = getAnalysis<DominatorTreeWrapperPass>().getDomTree();