Address comments

Author: teresajohnson

llvm/lib/Transforms/IPO/MemProfContextDisambiguation.cpp

@@ -181,10 +181,10 @@ static cl::opt<bool> AllowRecursiveContexts(
     "memprof-allow-recursive-contexts", cl::init(true), cl::Hidden,
     cl::desc("Allow cloning of contexts having recursive cycles"));
 
-// Set the minimum absolute count threshold for inlining of indirect calls
-// promoted during cloning.
-static cl::opt<unsigned> ICPInlineMinimumCountThreshold(
-    "memprof-icp-inline-minimum-count-threshold", cl::init(0), cl::Hidden,
+// Set the minimum absolute count threshold for allowing inlining of indirect
+// calls promoted during cloning.
+static cl::opt<unsigned> MemProfICPNoInlineThreshold(
+    "memprof-icp-noinline-threshold", cl::init(2), cl::Hidden,
     cl::desc("Minimum absolute count for promoted target to be inlinable"));
 
 namespace llvm {
@@ -5579,8 +5579,8 @@ void MemProfContextDisambiguation::performICP(
                                  .getCallee());
         }
         DirectCall.setCalledFunction(TargetToUse);
-        if (ICPInlineMinimumCountThreshold &&
-            Candidate.Count < ICPInlineMinimumCountThreshold)
+        if (MemProfICPNoInlineThreshold &&
+            Candidate.Count < MemProfICPNoInlineThreshold)
           DirectCall.setIsNoInline();
         ORE.emit(OptimizationRemark(DEBUG_TYPE, "MemprofCall", CBClone)
                  << ore::NV("Call", CBClone) << " in clone "

llvm/test/ThinLTO/X86/memprof-icp-recursive.ll

@@ -56,9 +56,10 @@
 
 ; RUN: llvm-dis %t.out.2.4.opt.bc -o - | FileCheck %s --check-prefixes=IR,IR-INLINE
 
-;; Next, add a threshold to prevent inlining of small count promoted calls.
+;; Next, add a threshold to prevent inlining of the promoted calls which have
+;; count 2 (the default threshold of 2 means they are inlinable by default).
 ; RUN: llvm-lto2 run %t/main.o %t/foo.o -enable-memprof-context-disambiguation \
-; RUN:	-memprof-icp-inline-minimum-count-threshold=3 \
+; RUN:	-memprof-icp-noinline-threshold=3 \
 ; RUN:	-enable-memprof-indirect-call-support=true \
 ; RUN:  -memprof-allow-recursive-callsites \
 ; RUN:  -supports-hot-cold-new \