[llvm] r350751 - [Inliner] Assert that the computed inline threshold is non-negative.

[Easwaran Raman via llvm-commits]

Author: eraman
Date: Wed Jan  9 11:26:17 2019
New Revision: 350751

URL: http://llvm.org/viewvc/llvm-project?rev=350751&view=rev
Log:
[Inliner] Assert that the computed inline threshold is non-negative.

Reviewers: chandlerc

Subscribers: haicheng, llvm-commits

Differential Revision: https://reviews.llvm.org/D56409

Modified:
    llvm/trunk/lib/Analysis/InlineCost.cpp
    llvm/trunk/test/Transforms/Inline/inline-remark.ll

Modified: llvm/trunk/lib/Analysis/InlineCost.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Analysis/InlineCost.cpp?rev=350751&r1=350750&r2=350751&view=diff
==============================================================================
--- llvm/trunk/lib/Analysis/InlineCost.cpp (original)
+++ llvm/trunk/lib/Analysis/InlineCost.cpp Wed Jan  9 11:26:17 2019
@@ -1731,6 +1731,13 @@ InlineResult CallAnalyzer::analyzeCall(C
   // Update the threshold based on callsite properties
   updateThreshold(CS, F);
 
+  // While Threshold depends on commandline options that can take negative
+  // values, we want to enforce the invariant that the computed threshold and
+  // bonuses are non-negative.
+  assert(Threshold >= 0);
+  assert(SingleBBBonus >= 0);
+  assert(VectorBonus >= 0);
+
   // Speculatively apply all possible bonuses to Threshold. If cost exceeds
   // this Threshold any time, and cost cannot decrease, we can stop processing
   // the rest of the function body.

Modified: llvm/trunk/test/Transforms/Inline/inline-remark.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/Inline/inline-remark.ll?rev=350751&r1=350750&r2=350751&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/Inline/inline-remark.ll (original)
+++ llvm/trunk/test/Transforms/Inline/inline-remark.ll Wed Jan  9 11:26:17 2019
@@ -1,7 +1,9 @@
-; RUN: opt < %s -inline -inline-remark-attribute --inline-threshold=-2 -S | FileCheck %s
+; RUN: opt < %s -inline -inline-remark-attribute --inline-threshold=0 -S | FileCheck %s
 
 ; Test that the inliner adds inline remark attributes to non-inlined callsites.
 
+declare void @ext();
+
 define void @foo() {
   call void @bar(i1 true)
   ret void
@@ -12,6 +14,7 @@ define void @bar(i1 %p) {
 
 bb1:
   call void @foo()
+  call void @ext()
   ret void
 
 bb2:
@@ -43,6 +46,6 @@ define void @test2(i8*) {
   ret void
 }
 
-; CHECK: attributes [[ATTR1]] = { "inline-remark"="(cost=-5, threshold=-6)" }
+; CHECK: attributes [[ATTR1]] = { "inline-remark"="(cost=25, threshold=0)" }
 ; CHECK: attributes [[ATTR2]] = { "inline-remark"="(cost=never): recursive" }
 ; CHECK: attributes [[ATTR3]] = { "inline-remark"="unsupported operand bundle; (cost={{.*}}, threshold={{.*}})" }