Disable standard llvm passes in CMFE

Disable standard llvm passes in CMFE

Author: IDmitryy

lib/CodeGen/BackendUtil.cpp

@@ -377,11 +377,6 @@ static void addSymbolRewriterPass(const CodeGenOptions &Opts,
   MPM->add(createRewriteSymbolsPass(DL));
 }
 
-static void addCMSimdCFLoweringPass(const PassManagerBuilder &Builder,
-                                    legacy::PassManagerBase &PM) {
-  PM.add(createCMSimdCFLoweringPass());
-}
-
 static CodeGenOpt::Level getCGOptLevel(const CodeGenOptions &CodeGenOpts) {
   switch (CodeGenOpts.OptimizationLevel) {
   default:
@@ -584,10 +579,6 @@ void EmitAssemblyHelper::CreatePasses(legacy::PassManager &MPM,
     PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible,
                            addAddDiscriminatorsPass);
 
-  if (LangOpts.MdfCM)
-    PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible,
-                           addCMSimdCFLoweringPass);
-
   // In ObjC ARC mode, add the main ARC optimization passes.
   if (LangOpts.ObjCAutoRefCount) {
     PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible,
@@ -808,6 +799,12 @@ void EmitAssemblyHelper::EmitAssembly(BackendAction Action,
   if (TM)
     TheModule->setDataLayout(TM->createDataLayout());
 
+  // TODO: This is a temporary change, these passes will have 
+  // to be taken out in the CMFE library 
+  legacy::PassManager CMFEModulePasses;
+  if (LangOpts.MdfCM)
+    CMFEModulePasses.add(createCMSimdCFLoweringPass());
+
   legacy::PassManager PerModulePasses;
   PerModulePasses.add(
       createTargetTransformInfoWrapperPass(getTargetIRAnalysis()));
@@ -898,6 +895,11 @@ 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("CMFE passes");
+    CMFEModulePasses.run(*TheModule);
+  }
+
   {
     PrettyStackTraceString CrashInfo("Per-function optimization");
 

lib/FrontendWrapper/FrontendWrapper.cpp

@@ -550,8 +550,7 @@ IntelCMClangFECompile(const Intel::CM::ClangFE::IInputArgs *InArgs) {
   DiagnosticSubsystem DS(*error_stream);
 
   auto CStrCompOpts = wrapper::getCompOpts<const char *>(InArgs);
-  // TODO: consider moving O0 enforcement to AdaptorCM
-  CStrCompOpts.push_back("-O0");
+  CStrCompOpts.push_back("-disable-llvm-passes");
 
   // Facilities to pass extra -cc1 options for debug purposes.
   // Options are expected to be separated by ';'.