Revert "[InlineCost] InlineCostAnnotationWriterPass introduced"

This reverts commit 37e06e8f5c6ee39a1d7cbaf7d5f5a3ebfa1b4e15.

diff --git a/llvm/include/llvm/Analysis/InlineCost.h b/llvm/include/llvm/Analysis/InlineCost.h
index c697e01..a1f49d4 100644 (file)
--- a/llvm/include/llvm/Analysis/InlineCost.h
+++ b/llvm/include/llvm/Analysis/InlineCost.h
@@ -269,18 +269,6 @@ Optional<int> getInliningCostEstimate(
 
 /// Minimal filter to detect invalid constructs for inlining.
 InlineResult isInlineViable(Function &Callee);
-
-// This pass is used to annotate instructions during the inline process for
-// debugging and analysis. The main purpose of the pass is to see and test
-// inliner's decisions when creating new optimizations to InlineCost.
-struct InlineCostAnnotationPrinterPass
-    : PassInfoMixin<InlineCostAnnotationPrinterPass> {
-  raw_ostream &OS;
-
-public:
-  explicit InlineCostAnnotationPrinterPass(raw_ostream &OS) : OS(OS) {}
-  PreservedAnalyses run(Function &F, FunctionAnalysisManager &FAM);
-};
 } // namespace llvm
 
 #endif

diff --git a/llvm/lib/Analysis/InlineCost.cpp b/llvm/lib/Analysis/InlineCost.cpp
index fd4e7c7..ba327ca 100644 (file)
--- a/llvm/lib/Analysis/InlineCost.cpp
+++ b/llvm/lib/Analysis/InlineCost.cpp
@@ -2509,40 +2509,3 @@ InlineParams llvm::getInlineParams(unsigned OptLevel, unsigned SizeOptLevel) {
     Params.LocallyHotCallSiteThreshold = LocallyHotCallSiteThreshold;
   return Params;
 }
-
-PreservedAnalyses
-InlineCostAnnotationPrinterPass::run(Function &F,
-                                     FunctionAnalysisManager &FAM) {
-  PrintInstructionComments = true;
-  std::function<AssumptionCache &(Function &)> GetAssumptionCache = [&](
-      Function &F) -> AssumptionCache & {
-    return FAM.getResult<AssumptionAnalysis>(F);
-  };
-  Module *M = F.getParent();
-  ProfileSummaryInfo PSI(*M);
-  DataLayout DL(M);
-  TargetTransformInfo TTI(DL);
-  // FIXME: Redesign the usage of InlineParams to expand the scope of this pass.
-  // In the current implementation, the type of InlineParams doesn't matter as
-  // the pass serves only for verification of inliner's decisions.
-  // We can add a flag which determines InlineParams for this run. Right now,
-  // the default InlineParams are used.
-  const InlineParams Params = llvm::getInlineParams();
-    for (BasicBlock &BB : F) {
-    for (Instruction &I : BB) {
-      if (CallInst *CI = dyn_cast<CallInst>(&I)) {
-        Function *CalledFunction = CI->getCalledFunction();
-        if (!CalledFunction || CalledFunction->isDeclaration())
-          continue;
-        OptimizationRemarkEmitter ORE(CalledFunction);
-        InlineCostCallAnalyzer ICCA(*CalledFunction, *CI, Params, TTI,
-                                    GetAssumptionCache, nullptr, &PSI, &ORE);
-        ICCA.analyze();
-        OS << "      Analyzing call of " << CalledFunction->getName()
-           << "... (caller:" << CI->getCaller()->getName() << ")\n";
-        ICCA.dump();
-      }
-    }
-  }
-  return PreservedAnalyses::all();
-}
\ No newline at end of file

diff --git a/llvm/lib/Passes/PassRegistry.def b/llvm/lib/Passes/PassRegistry.def
index 06fcdcd..dc037ff 100644 (file)
--- a/llvm/lib/Passes/PassRegistry.def
+++ b/llvm/lib/Passes/PassRegistry.def
@@ -233,7 +233,6 @@ FUNCTION_PASS("print<domtree>", DominatorTreePrinterPass(dbgs()))
 FUNCTION_PASS("print<postdomtree>", PostDominatorTreePrinterPass(dbgs()))
 FUNCTION_PASS("print<demanded-bits>", DemandedBitsPrinterPass(dbgs()))
 FUNCTION_PASS("print<domfrontier>", DominanceFrontierPrinterPass(dbgs()))
-FUNCTION_PASS("print<inline-cost>", InlineCostAnnotationPrinterPass(dbgs()))
 FUNCTION_PASS("print<loops>", LoopPrinterPass(dbgs()))
 FUNCTION_PASS("print<memoryssa>", MemorySSAPrinterPass(dbgs()))
 FUNCTION_PASS("print<phi-values>", PhiValuesPrinterPass(dbgs()))

diff --git a/llvm/test/Transforms/Inline/debuginline-cost-delta.ll b/llvm/test/Transforms/Inline/debuginline-cost-delta.ll
index 2e6a8f4..2ef604d 100644 (file)
--- a/llvm/test/Transforms/Inline/debuginline-cost-delta.ll
+++ b/llvm/test/Transforms/Inline/debuginline-cost-delta.ll
@@ -1,16 +1,32 @@
-; RUN: opt < %s -passes="print<inline-cost>" 2>&1 | FileCheck %s
+; Require asserts for -debug-only
+; REQUIRES: asserts
+
+; RUN: opt < %s -inline -debug-only=inline-cost -disable-output -print-instruction-comments 2>&1 | FileCheck %s
 
 ; CHECK:       Analyzing call of callee1... (caller:foo)
-; CHECK-NEXT: define i32 @callee1(i32 %x) {
-; CHECK-NEXT: cost before = {{.*}}, cost after = {{.*}}, threshold before = {{.*}}, threshold after = {{.*}}, cost delta = {{.*}}
-; CHECK-NEXT:   %x1 = add i32 %x, 1
-; CHECK-NEXT: cost before = {{.*}}, cost after = {{.*}}, threshold before = {{.*}}, threshold after = {{.*}}, cost delta = {{.*}}
-; CHECK-NEXT:   %x2 = add i32 %x1, 1
-; CHECK-NEXT: cost before = {{.*}}, cost after = {{.*}}, threshold before = {{.*}}, threshold after = {{.*}}, cost delta = {{.*}}
-; CHECK-NEXT:   %x3 = add i32 %x2, 1
-; CHECK-NEXT: cost before = {{.*}}, cost after = {{.*}}, threshold before = {{.*}}, threshold after = {{.*}}, cost delta = {{.*}}
-; CHECK-NEXT:   ret i32 %x3
-; CHECK-NEXT: }
+; CHECK: define i32 @callee1(i32 %x) {
+; CHECK: ; cost before = {{.*}}, cost after = {{.*}}, threshold before = {{.*}}, threshold after = {{.*}}, cost delta = 5
+; CHECK:   %x1 = add i32 %x, 1
+; CHECK: ; cost before = {{.*}}, cost after = {{.*}}, threshold before = {{.*}}, threshold after = {{.*}}, cost delta = 5
+; CHECK:   %x2 = add i32 %x1, 1
+; CHECK: ; cost before = {{.*}}, cost after = {{.*}}, threshold before = {{.*}}, threshold after = {{.*}}, cost delta = 5
+; CHECK:   %x3 = add i32 %x2, 1
+; CHECK: ; cost before = {{.*}}, cost after = {{.*}}, threshold before = {{.*}}, threshold after = {{.*}}, cost delta = 0
+; CHECK:   ret i32 %x3
+; CHECK: }
+; CHECK:      NumConstantArgs: 0
+; CHECK:      NumConstantOffsetPtrArgs: 0
+; CHECK:      NumAllocaArgs: 0
+; CHECK:      NumConstantPtrCmps: 0
+; CHECK:      NumConstantPtrDiffs: 0
+; CHECK:      NumInstructionsSimplified: 1
+; CHECK:      NumInstructions: 4
+; CHECK:      SROACostSavings: 0
+; CHECK:      SROACostSavingsLost: 0
+; CHECK:      LoadEliminationCost: 0
+; CHECK:      ContainsNoDuplicateCall: 0
+; CHECK:      Cost: {{.*}}
+; CHECK:      Threshold: {{.*}}
 
 define i32 @foo(i32 %y) {
   %x = call i32 @callee1(i32 %y)

diff --git a/llvm/test/Transforms/Inline/inline-cost-annotation-pass.ll b/llvm/test/Transforms/Inline/inline-cost-annotation-pass.ll
deleted file mode 100644 (file)
index 73b8a0b..0000000
--- a/llvm/test/Transforms/Inline/inline-cost-annotation-pass.ll
+++ /dev/null
@@ -1,32 +0,0 @@
-; RUN: opt < %s -passes="print<inline-cost>" 2>&1 | FileCheck %s
-
-; CHECK:       Analyzing call of foo... (caller:main)
-; CHECK: define i8 addrspace(1)** @foo() {
-; CHECK:  cost before = {{.*}}, cost after = {{.*}}, threshold before = {{.*}}, threshold after = {{.*}}, cost delta = {{.*}}
-; CHECK:  %1 = inttoptr i64 754974720 to i8 addrspace(1)**
-; CHECK:  cost before = {{.*}}, cost after = {{.*}}, threshold before = {{.*}}, threshold after = {{.*}}, cost delta = {{.*}}
-; CHECK:  ret i8 addrspace(1)** %1
-; CHECK: }
-; CHECK:       NumConstantArgs: {{.*}}
-; CHECK:       NumConstantOffsetPtrArgs: {{.*}}
-; CHECK:       NumAllocaArgs: {{.*}}
-; CHECK:       NumConstantPtrCmps: {{.*}}
-; CHECK:       NumConstantPtrDiffs: {{.*}}
-; CHECK:       NumInstructionsSimplified: {{.*}}
-; CHECK:       NumInstructions: {{.*}}
-; CHECK:       SROACostSavings: {{.*}}
-; CHECK:       SROACostSavingsLost: {{.*}}
-; CHECK:       LoadEliminationCost: {{.*}}
-; CHECK:       ContainsNoDuplicateCall: {{.*}}
-; CHECK:       Cost: {{.*}}
-; CHECK:       Threshold: {{.*}}
-
-define i8 addrspace(1)** @foo() {
-  %1 = inttoptr i64 754974720 to i8 addrspace(1)**
-  ret i8 addrspace(1)** %1
-}
-
-define i8 addrspace(1)** @main() {
-  %1 = call i8 addrspace(1)** @foo()
-  ret i8 addrspace(1)** %1
-}

diff --git a/llvm/test/Transforms/Inline/print-instructions-deltas-unfinished.ll b/llvm/test/Transforms/Inline/print-instructions-deltas-unfinished.ll
new file mode 100644 (file)
index 0000000..70e223c
--- /dev/null
+++ b/llvm/test/Transforms/Inline/print-instructions-deltas-unfinished.ll
@@ -0,0 +1,22 @@
+; Require asserts for -debug-only
+; REQUIRES: asserts
+
+; This test ensures that the hadling of instructions which were not analyzed by
+; '-print-instruction-deltas' flag due to the early exit was done correctly.
+
+; RUN: opt < %s -inline -debug-only=inline-cost -disable-output -print-instruction-comments -inline-threshold=0 2>&1 | FileCheck %s
+
+; CHECK: No analysis for the instruction
+; CHECK:   ret void
+
+declare void @callee1()
+
+define void @bar() {
+  call void @callee1()
+  ret void
+}
+
+define void @foo() {
+  call void @bar()
+  ret void
+}