[PATCH] D21568: Invoke simplifycfg and sroa before instcombine.

[Dehao Chen via llvm-commits]

danielcdh updated this revision to Diff 61455.
danielcdh added a comment.

Change the function name to assert that this function should only be called for sample profiler.


http://reviews.llvm.org/D21568

Files:
  lib/CodeGen/BackendUtil.cpp
  test/CodeGen/pgo-sample.c

Index: test/CodeGen/pgo-sample.c
===================================================================
--- test/CodeGen/pgo-sample.c
+++ test/CodeGen/pgo-sample.c
@@ -2,5 +2,8 @@
 //
 // Ensure Pass PGOInstrumentationGenPass is invoked.
 // RUN: %clang_cc1 -O2 -fprofile-sample-use=%S/Inputs/pgo-sample.prof %s -mllvm -debug-pass=Structure -emit-llvm -o - 2>&1 | FileCheck %s
+// CHECK: Simplify the CFG
+// CHECK: SROA
+// CHECK: Combine redundant instructions
 // CHECK: Remove unused exception handling info
 // CHECK: Sample profile pass
Index: lib/CodeGen/BackendUtil.cpp
===================================================================
--- lib/CodeGen/BackendUtil.cpp
+++ lib/CodeGen/BackendUtil.cpp
@@ -178,8 +178,10 @@
   PM.add(createAddDiscriminatorsPass());
 }
 
-static void addInstructionCombiningPass(const PassManagerBuilder &Builder,
-                                        legacy::PassManagerBase &PM) {
+static void addInstructionCombiningPassBeforeSampleProfilee(
+    const PassManagerBuilder &Builder, legacy::PassManagerBase &PM) {
+  PM.add(createCFGSimplificationPass());
+  PM.add(createSROAPass());
   PM.add(createInstructionCombiningPass());
 }
 
@@ -491,7 +493,7 @@
     MPM->add(createPruneEHPass());
     MPM->add(createSampleProfileLoaderPass(CodeGenOpts.SampleProfileFile));
     PMBuilder.addExtension(PassManagerBuilder::EP_EarlyAsPossible,
-                           addInstructionCombiningPass);
+                           addInstructionCombiningPassBeforeSampleProfiler);
   }
 
   PMBuilder.populateFunctionPassManager(*FPM);


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D21568.61455.patch
Type: text/x-patch
Size: 1569 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20160621/6d022152/attachment.bin>