Skip to content

Commit 5995e4b

Browse files
[MemProf] Disable memprof ICP support by default (#112940)
A failure showed up after this was committed, rather than revert simply disable this new support to simplify investigation and further testing.
1 parent a01d7df commit 5995e4b

File tree

2 files changed

+8
-3
lines changed

2 files changed

+8
-3
lines changed

llvm/lib/Analysis/ModuleSummaryAnalysis.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static cl::opt<std::string> ModuleSummaryDotFile(
8282
cl::desc("File to emit dot graph of new summary into"));
8383

8484
static cl::opt<bool> EnableMemProfIndirectCallSupport(
85-
"enable-memprof-indirect-call-support", cl::init(true), cl::Hidden,
85+
"enable-memprof-indirect-call-support", cl::init(false), cl::Hidden,
8686
cl::desc(
8787
"Enable MemProf support for summarizing and cloning indirect calls"));
8888

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,9 @@
6969

7070
; RUN: split-file %s %t
7171

72-
; RUN: opt -thinlto-bc %t/main.ll >%t/main.o
73-
; RUN: opt -thinlto-bc %t/foo.ll >%t/foo.o
72+
;; For now explicitly turn on this handling, which is off by default.
73+
; RUN: opt -thinlto-bc %t/main.ll -enable-memprof-indirect-call-support=true >%t/main.o
74+
; RUN: opt -thinlto-bc %t/foo.ll -enable-memprof-indirect-call-support=true >%t/foo.o
7475

7576
;; Check that we get the synthesized callsite records. There should be 2, one
7677
;; for each profiled target in the VP metadata. They will have the same stackIds
@@ -82,9 +83,12 @@
8283
;; -enable-memprof-indirect-call-support flag is false.
8384
; RUN: opt -thinlto-bc %t/foo.ll -enable-memprof-indirect-call-support=false >%t/foo.noicp.o
8485
; RUN: llvm-dis %t/foo.noicp.o -o - | FileCheck %s --implicit-check-not "stackIds: (16345663650247127235)"
86+
;; Currently this should be off by default as well.
87+
; RUN: opt -thinlto-bc %t/foo.ll -o - | llvm-dis -o - | FileCheck %s --implicit-check-not "stackIds: (16345663650247127235)"
8588

8689
;; First perform in-process ThinLTO
8790
; RUN: llvm-lto2 run %t/main.o %t/foo.o -enable-memprof-context-disambiguation \
91+
; RUN: -enable-memprof-indirect-call-support=true \
8892
; RUN: -supports-hot-cold-new \
8993
; RUN: -r=%t/foo.o,_Z3fooR2B0j,plx \
9094
; RUN: -r=%t/foo.o,_Z3xyzR2B0j, \
@@ -138,6 +142,7 @@
138142

139143
;; Run ThinLTO backend
140144
; RUN: opt -import-all-index -passes=function-import,memprof-context-disambiguation,inline \
145+
; RUN: -enable-memprof-indirect-call-support=true \
141146
; RUN: -summary-file=%t/foo.o.thinlto.bc -memprof-import-summary=%t/foo.o.thinlto.bc \
142147
; RUN: -enable-import-metadata -stats -pass-remarks=. \
143148
; RUN: %t/foo.o -S 2>&1 | FileCheck %s --check-prefix=IR \

0 commit comments

Comments
 (0)