summaryrefslogtreecommitdiffstats
path: root/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm10-Enable-the-call-site-info-only-for-g-optimizations.patch
diff options
context:
space:
mode:
Diffstat (limited to 'dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm10-Enable-the-call-site-info-only-for-g-optimizations.patch')
-rw-r--r--dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm10-Enable-the-call-site-info-only-for-g-optimizations.patch550
1 files changed, 0 insertions, 550 deletions
diff --git a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm10-Enable-the-call-site-info-only-for-g-optimizations.patch b/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm10-Enable-the-call-site-info-only-for-g-optimizations.patch
deleted file mode 100644
index 2e3872dc..00000000
--- a/dynamic-layers/clang-layer/recipes-devtools/clang/files/llvm10-Enable-the-call-site-info-only-for-g-optimizations.patch
+++ /dev/null
@@ -1,550 +0,0 @@
1From 447cb2e1b2f0d8bdcfd8a0b39f47d28de50b5d82 Mon Sep 17 00:00:00 2001
2From: Djordje Todorovic <djordje.todorovic@syrmia.com>
3Date: Mon, 9 Mar 2020 11:02:35 +0100
4Subject: [PATCH] Enable the call site info only for -g + optimizations
5
6Emit call site info only in the case of '-g' + 'O>0' level.
7
8Differential Revision: https://reviews.llvm.org/D75175
9
10Upstream-Status: Backport [https://github.com/llvm/llvm-project/commit/c15c68abdc6f1afece637bdedba808676191a8e6]
11Signed-off-by: Anuj Mittal <anuj.mittal@intel.com>
12---
13 clang/include/clang/Basic/CodeGenOptions.def | 2 ++
14 clang/lib/CodeGen/BackendUtil.cpp | 1 +
15 clang/lib/Frontend/CompilerInvocation.cpp | 4 +++-
16 llvm/include/llvm/CodeGen/CommandFlags.inc | 7 +++++++
17 llvm/include/llvm/Target/TargetOptions.h | 7 ++++++-
18 llvm/lib/CodeGen/MIRParser/MIRParser.cpp | 4 ++--
19 llvm/lib/CodeGen/MachineFunction.cpp | 2 +-
20 llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp | 2 +-
21 llvm/lib/Target/AArch64/AArch64ISelLowering.cpp | 2 +-
22 llvm/lib/Target/ARM/ARMISelLowering.cpp | 2 +-
23 llvm/lib/Target/X86/X86ISelLowering.cpp | 2 +-
24 llvm/test/CodeGen/MIR/Hexagon/bundled-call-site-info.mir | 2 +-
25 llvm/test/CodeGen/X86/call-site-info-output.ll | 4 ++--
26 llvm/test/DebugInfo/AArch64/call-site-info-output.ll | 2 +-
27 llvm/test/DebugInfo/ARM/call-site-info-output.ll | 2 +-
28 .../MIR/AArch64/dbgcall-site-interpret-movzxi.mir | 2 +-
29 .../DebugInfo/MIR/AArch64/dbgcall-site-interpretation.mir | 2 +-
30 llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-orr-moves.mir | 2 +-
31 .../test/DebugInfo/MIR/AArch64/implicit-def-dead-scope.mir | 2 +-
32 .../test/DebugInfo/MIR/ARM/dbgcall-site-interpretation.mir | 2 +-
33 .../DebugInfo/MIR/ARM/dbgcall-site-propagated-value.mir | 2 +-
34 llvm/test/DebugInfo/MIR/ARM/if-coverter-call-site-info.mir | 2 +-
35 .../MIR/Hexagon/dbgcall-site-instr-before-bundled-call.mir | 2 +-
36 .../MIR/Hexagon/live-debug-values-bundled-entry-values.mir | 2 +-
37 llvm/test/DebugInfo/MIR/SystemZ/call-site-lzer.mir | 2 +-
38 llvm/test/DebugInfo/MIR/X86/DW_OP_entry_value.mir | 2 +-
39 llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir | 2 +-
40 .../test/DebugInfo/MIR/X86/dbgcall-site-copy-super-sub.mir | 2 +-
41 .../test/DebugInfo/MIR/X86/dbgcall-site-interpretation.mir | 2 +-
42 .../DebugInfo/MIR/X86/dbgcall-site-lea-interpretation.mir | 2 +-
43 llvm/test/DebugInfo/MIR/X86/dbgcall-site-reference.mir | 2 +-
44 .../DebugInfo/MIR/X86/dbgcall-site-two-fwd-reg-defs.mir | 2 +-
45 llvm/test/DebugInfo/MIR/X86/dbginfo-entryvals.mir | 2 +-
46 llvm/test/DebugInfo/MIR/X86/debug-call-site-param.mir | 4 ++--
47 .../DebugInfo/MIR/X86/entry-value-of-modified-param.mir | 2 +-
48 llvm/test/DebugInfo/MIR/X86/entry-values-diamond-bbs.mir | 2 +-
49 .../DebugInfo/MIR/X86/propagate-entry-value-cross-bbs.mir | 2 +-
50 .../test/DebugInfo/MIR/X86/unreachable-block-call-site.mir | 2 +-
51 llvm/test/DebugInfo/X86/dbgcall-site-64-bit-imms.ll | 2 +-
52 llvm/test/DebugInfo/X86/dbgcall-site-zero-valued-imms.ll | 2 +-
53 .../tools/llvm-dwarfdump/X86/stats-dbg-callsite-info.ll | 2 +-
54 41 files changed, 58 insertions(+), 41 deletions(-)
55
56diff --git a/clang/include/clang/Basic/CodeGenOptions.def b/clang/include/clang/Basic/CodeGenOptions.def
57index 1ecae98b13b1..6a6a9465273f 100644
58--- a/clang/include/clang/Basic/CodeGenOptions.def
59+++ b/clang/include/clang/Basic/CodeGenOptions.def
60@@ -64,6 +64,8 @@ CODEGENOPT(DebugPassManager, 1, 0) ///< Prints debug information for the new
61 ///< pass manager.
62 CODEGENOPT(DisableRedZone , 1, 0) ///< Set when -mno-red-zone is enabled.
63 CODEGENOPT(EnableDebugEntryValues, 1, 0) ///< Emit call site parameter dbg info
64+CODEGENOPT(EmitCallSiteInfo, 1, 0) ///< Emit call site info only in the case of
65+ ///< '-g' + 'O>0' level.
66 CODEGENOPT(IndirectTlsSegRefs, 1, 0) ///< Set when -mno-tls-direct-seg-refs
67 ///< is specified.
68 CODEGENOPT(DisableTailCalls , 1, 0) ///< Do not emit tail calls.
69diff --git a/clang/lib/CodeGen/BackendUtil.cpp b/clang/lib/CodeGen/BackendUtil.cpp
70index db8fd4166d7a..db09f9b641fe 100644
71--- a/clang/lib/CodeGen/BackendUtil.cpp
72+++ b/clang/lib/CodeGen/BackendUtil.cpp
73@@ -482,6 +482,7 @@ static void initTargetOptions(llvm::TargetOptions &Options,
74 Options.EmitAddrsig = CodeGenOpts.Addrsig;
75 Options.EnableDebugEntryValues = CodeGenOpts.EnableDebugEntryValues;
76 Options.ForceDwarfFrameSection = CodeGenOpts.ForceDwarfFrameSection;
77+ Options.EmitCallSiteInfo = CodeGenOpts.EmitCallSiteInfo;
78
79 Options.MCOptions.SplitDwarfFile = CodeGenOpts.SplitDwarfFile;
80 Options.MCOptions.MCRelaxAll = CodeGenOpts.RelaxAll;
81diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
82index 18fa06bf3c6d..2e73dcbdebe4 100644
83--- a/clang/lib/Frontend/CompilerInvocation.cpp
84+++ b/clang/lib/Frontend/CompilerInvocation.cpp
85@@ -789,8 +789,10 @@ static bool ParseCodeGenArgs(CodeGenOptions &Opts, ArgList &Args, InputKind IK,
86
87 llvm::Triple T(TargetOpts.Triple);
88 if (Opts.OptimizationLevel > 0 && Opts.hasReducedDebugInfo() &&
89- llvm::is_contained(DebugEntryValueArchs, T.getArch()))
90+ llvm::is_contained(DebugEntryValueArchs, T.getArch())) {
91 Opts.EnableDebugEntryValues = Args.hasArg(OPT_femit_debug_entry_values);
92+ Opts.EmitCallSiteInfo = true;
93+ }
94
95 Opts.DisableO0ImplyOptNone = Args.hasArg(OPT_disable_O0_optnone);
96 Opts.DisableRedZone = Args.hasArg(OPT_disable_red_zone);
97diff --git a/llvm/include/llvm/CodeGen/CommandFlags.inc b/llvm/include/llvm/CodeGen/CommandFlags.inc
98index 6475a5b19edb..36073fe9cc98 100644
99--- a/llvm/include/llvm/CodeGen/CommandFlags.inc
100+++ b/llvm/include/llvm/CodeGen/CommandFlags.inc
101@@ -286,6 +286,12 @@ static cl::opt<bool>
102 EnableAddrsig("addrsig", cl::desc("Emit an address-significance table"),
103 cl::init(false));
104
105+static cl::opt<bool> EmitCallSiteInfo(
106+ "emit-call-site-info",
107+ cl::desc(
108+ "Emit call site debug information, if debug information is enabled."),
109+ cl::init(false));
110+
111 static cl::opt<bool>
112 EnableDebugEntryValues("debug-entry-values",
113 cl::desc("Emit debug info about parameter's entry values"),
114@@ -349,6 +355,7 @@ static TargetOptions InitTargetOptionsFromCodeGenFlags() {
115 Options.ExceptionModel = ExceptionModel;
116 Options.EmitStackSizeSection = EnableStackSizeSection;
117 Options.EmitAddrsig = EnableAddrsig;
118+ Options.EmitCallSiteInfo = EmitCallSiteInfo;
119 Options.EnableDebugEntryValues = EnableDebugEntryValues;
120 Options.ForceDwarfFrameSection = ForceDwarfFrameSection;
121
122diff --git a/llvm/include/llvm/Target/TargetOptions.h b/llvm/include/llvm/Target/TargetOptions.h
123index d27c7b0178f0..9378e290bed1 100644
124--- a/llvm/include/llvm/Target/TargetOptions.h
125+++ b/llvm/include/llvm/Target/TargetOptions.h
126@@ -134,7 +134,8 @@ namespace llvm {
127 EmulatedTLS(false), ExplicitEmulatedTLS(false), EnableIPRA(false),
128 EmitStackSizeSection(false), EnableMachineOutliner(false),
129 SupportsDefaultOutlining(false), EmitAddrsig(false),
130- EnableDebugEntryValues(false), ForceDwarfFrameSection(false) {}
131+ EmitCallSiteInfo(false), EnableDebugEntryValues(false),
132+ ForceDwarfFrameSection(false) {}
133
134 /// PrintMachineCode - This flag is enabled when the -print-machineinstrs
135 /// option is specified on the command line, and should enable debugging
136@@ -281,6 +282,10 @@ namespace llvm {
137 /// to selectively generate basic block sections.
138 std::shared_ptr<MemoryBuffer> BBSectionsFuncListBuf;
139
140+ /// The flag enables call site info production. It is used only for debug
141+ /// info, and it is restricted only to optimized code. This can be used for
142+ /// something else, so that should be controlled in the frontend.
143+ unsigned EmitCallSiteInfo : 1;
144 /// Emit debug info about parameter's entry values.
145 unsigned EnableDebugEntryValues : 1;
146
147diff --git a/llvm/lib/CodeGen/MIRParser/MIRParser.cpp b/llvm/lib/CodeGen/MIRParser/MIRParser.cpp
148index 10157c746b46..f955bdc6186a 100644
149--- a/llvm/lib/CodeGen/MIRParser/MIRParser.cpp
150+++ b/llvm/lib/CodeGen/MIRParser/MIRParser.cpp
151@@ -381,11 +381,11 @@ bool MIRParserImpl::initializeCallSiteInfo(
152 CSInfo.emplace_back(Reg, ArgRegPair.ArgNo);
153 }
154
155- if (TM.Options.EnableDebugEntryValues)
156+ if (TM.Options.EmitCallSiteInfo)
157 MF.addCallArgsForwardingRegs(&*CallI, std::move(CSInfo));
158 }
159
160- if (YamlMF.CallSitesInfo.size() && !TM.Options.EnableDebugEntryValues)
161+ if (YamlMF.CallSitesInfo.size() && !TM.Options.EmitCallSiteInfo)
162 return error(Twine("Call site info provided but not used"));
163 return false;
164 }
165diff --git a/llvm/lib/CodeGen/MachineFunction.cpp b/llvm/lib/CodeGen/MachineFunction.cpp
166index 4612690644fe..c3795b7ed314 100644
167--- a/llvm/lib/CodeGen/MachineFunction.cpp
168+++ b/llvm/lib/CodeGen/MachineFunction.cpp
169@@ -855,7 +855,7 @@ MachineFunction::CallSiteInfoMap::iterator
170 MachineFunction::getCallSiteInfo(const MachineInstr *MI) {
171 assert(MI->isCall() && "Call site info refers only to call instructions!");
172
173- if (!Target.Options.EnableDebugEntryValues)
174+ if (!Target.Options.EmitCallSiteInfo)
175 return CallSitesInfo.end();
176 return CallSitesInfo.find(MI);
177 }
178diff --git a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
179index 0e4d783e3505..52099f24aca5 100644
180--- a/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
181+++ b/llvm/lib/CodeGen/SelectionDAG/ScheduleDAGSDNodes.cpp
182@@ -863,7 +863,7 @@ EmitSchedule(MachineBasicBlock::iterator &InsertPos) {
183 MI = &*std::next(Before);
184 }
185
186- if (MI->isCall() && DAG->getTarget().Options.EnableDebugEntryValues)
187+ if (MI->isCall() && DAG->getTarget().Options.EmitCallSiteInfo)
188 MF.addCallArgsForwardingRegs(MI, DAG->getSDCallSiteInfo(Node));
189
190 return MI;
191diff --git a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
192index 23f05eaad944..63ff3031a5e8 100644
193--- a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
194+++ b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
195@@ -4132,7 +4132,7 @@ AArch64TargetLowering::LowerCall(CallLoweringInfo &CLI,
196 RegsToPass.emplace_back(VA.getLocReg(), Arg);
197 RegsUsed.insert(VA.getLocReg());
198 const TargetOptions &Options = DAG.getTarget().Options;
199- if (Options.EnableDebugEntryValues)
200+ if (Options.EmitCallSiteInfo)
201 CSInfo.emplace_back(VA.getLocReg(), i);
202 }
203 } else {
204diff --git a/llvm/lib/Target/ARM/ARMISelLowering.cpp b/llvm/lib/Target/ARM/ARMISelLowering.cpp
205index 9f504b1eaa42..5589ba34a2ac 100644
206--- a/llvm/lib/Target/ARM/ARMISelLowering.cpp
207+++ b/llvm/lib/Target/ARM/ARMISelLowering.cpp
208@@ -2222,7 +2222,7 @@ ARMTargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
209 isThisReturn = true;
210 }
211 const TargetOptions &Options = DAG.getTarget().Options;
212- if (Options.EnableDebugEntryValues)
213+ if (Options.EmitCallSiteInfo)
214 CSInfo.emplace_back(VA.getLocReg(), i);
215 RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg));
216 } else if (isByVal) {
217diff --git a/llvm/lib/Target/X86/X86ISelLowering.cpp b/llvm/lib/Target/X86/X86ISelLowering.cpp
218index d5de94aeb8a2..4808bdf6ddc2 100644
219--- a/llvm/lib/Target/X86/X86ISelLowering.cpp
220+++ b/llvm/lib/Target/X86/X86ISelLowering.cpp
221@@ -4030,7 +4030,7 @@ X86TargetLowering::LowerCall(TargetLowering::CallLoweringInfo &CLI,
222 } else if (VA.isRegLoc()) {
223 RegsToPass.push_back(std::make_pair(VA.getLocReg(), Arg));
224 const TargetOptions &Options = DAG.getTarget().Options;
225- if (Options.EnableDebugEntryValues)
226+ if (Options.EmitCallSiteInfo)
227 CSInfo.emplace_back(VA.getLocReg(), I);
228 if (isVarArg && IsWin64) {
229 // Win64 ABI requires argument XMM reg to be copied to the corresponding
230diff --git a/llvm/test/CodeGen/MIR/Hexagon/bundled-call-site-info.mir b/llvm/test/CodeGen/MIR/Hexagon/bundled-call-site-info.mir
231index 5ffa0293a2e1..fec542223fc9 100644
232--- a/llvm/test/CodeGen/MIR/Hexagon/bundled-call-site-info.mir
233+++ b/llvm/test/CodeGen/MIR/Hexagon/bundled-call-site-info.mir
234@@ -1,4 +1,4 @@
235-# RUN: llc -debug-entry-values -run-pass=none -verify-machineinstrs -o - %s | FileCheck %s
236+# RUN: llc -emit-call-site-info -debug-entry-values -run-pass=none -verify-machineinstrs -o - %s | FileCheck %s
237
238 # Verify that it is possible to read and write MIR where a callSites entry
239 # points to a call residing in a bundle. The offset should point to the call
240diff --git a/llvm/test/CodeGen/X86/call-site-info-output.ll b/llvm/test/CodeGen/X86/call-site-info-output.ll
241index 4b1e236aadfe..a0438f0c2b98 100644
242--- a/llvm/test/CodeGen/X86/call-site-info-output.ll
243+++ b/llvm/test/CodeGen/X86/call-site-info-output.ll
244@@ -1,6 +1,6 @@
245 ; Test call site info MIR printer and parser.Parser assertions and machine
246 ; verifier will check the rest;
247-; RUN: llc -debug-entry-values %s -stop-before=finalize-isel -o %t.mir
248+; RUN: llc -emit-call-site-info -debug-entry-values %s -stop-before=finalize-isel -o %t.mir
249 ; RUN: cat %t.mir | FileCheck %s
250 ; CHECK: name: fn2
251 ; CHECK: callSites:
252@@ -10,7 +10,7 @@
253 ; CHECK-NEXT: arg: 0, reg: '$edi'
254 ; CHECK-NEXT: arg: 1, reg: '$esi'
255 ; CHECK-NEXT: arg: 2, reg: '$edx'
256-; RUN: llc -debug-entry-values %t.mir -run-pass=finalize-isel -o -| FileCheck %s --check-prefix=PARSER
257+; RUN: llc -emit-call-site-info -debug-entry-values %t.mir -run-pass=finalize-isel -o -| FileCheck %s --check-prefix=PARSER
258 ; Verify that we are able to parse output mir and that we are getting the same result.
259 ; PARSER: name: fn2
260 ; PARSER: callSites:
261diff --git a/llvm/test/DebugInfo/AArch64/call-site-info-output.ll b/llvm/test/DebugInfo/AArch64/call-site-info-output.ll
262index d52d6962f3c4..17d9f7f18762 100644
263--- a/llvm/test/DebugInfo/AArch64/call-site-info-output.ll
264+++ b/llvm/test/DebugInfo/AArch64/call-site-info-output.ll
265@@ -1,4 +1,4 @@
266-; RUN: llc -mtriple aarch64-linux-gnu -debug-entry-values %s -o - -stop-before=finalize-isel | FileCheck %s
267+; RUN: llc -emit-call-site-info -mtriple aarch64-linux-gnu -debug-entry-values %s -o - -stop-before=finalize-isel | FileCheck %s
268 ; Verify that Selection DAG knows how to recognize simple function parameter forwarding registers.
269 ; Produced from:
270 ; extern int fn1(int,int,int);
271diff --git a/llvm/test/DebugInfo/ARM/call-site-info-output.ll b/llvm/test/DebugInfo/ARM/call-site-info-output.ll
272index 9255a7d57dde..ed726dfe753f 100644
273--- a/llvm/test/DebugInfo/ARM/call-site-info-output.ll
274+++ b/llvm/test/DebugInfo/ARM/call-site-info-output.ll
275@@ -1,4 +1,4 @@
276-; RUN: llc -mtriple arm-linux-gnu -debug-entry-values %s -o - -stop-before=finalize-isel | FileCheck %s
277+; RUN: llc -emit-call-site-info -mtriple arm-linux-gnu -debug-entry-values %s -o - -stop-before=finalize-isel | FileCheck %s
278 ; Verify that Selection DAG knows how to recognize simple function parameter forwarding registers.
279 ; Produced from:
280 ; extern int fn1(int,int,int);
281diff --git a/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-interpret-movzxi.mir b/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-interpret-movzxi.mir
282index dc7561ca6400..057779a90721 100644
283--- a/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-interpret-movzxi.mir
284+++ b/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-interpret-movzxi.mir
285@@ -1,4 +1,4 @@
286-# RUN: llc -mtriple aarch64-linux-gnu -debug-entry-values -start-after=machineverifier -filetype=obj %s -o -| llvm-dwarfdump -| FileCheck %s
287+# RUN: llc -emit-call-site-info -mtriple aarch64-linux-gnu -debug-entry-values -start-after=machineverifier -filetype=obj %s -o -| llvm-dwarfdump -| FileCheck %s
288 #
289 # Based on the following C reproducer:
290 #
291diff --git a/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-interpretation.mir b/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-interpretation.mir
292index 0371ccef603e..d925bc395878 100644
293--- a/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-interpretation.mir
294+++ b/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-interpretation.mir
295@@ -1,4 +1,4 @@
296-# RUN: llc -mtriple aarch64-linux-gnu -debug-entry-values -start-after=machineverifier -filetype=obj %s -o -| llvm-dwarfdump -| FileCheck %s
297+# RUN: llc -emit-call-site-info -mtriple aarch64-linux-gnu -debug-entry-values -start-after=machineverifier -filetype=obj %s -o -| llvm-dwarfdump -| FileCheck %s
298 # Following code is used for producing this test case. Note that
299 # some of argument loading instruction are modified in order to
300 # cover certain cases.
301diff --git a/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-orr-moves.mir b/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-orr-moves.mir
302index 916a14022ba5..4a87dad3b9b5 100644
303--- a/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-orr-moves.mir
304+++ b/llvm/test/DebugInfo/MIR/AArch64/dbgcall-site-orr-moves.mir
305@@ -1,4 +1,4 @@
306-# RUN: llc -debug-entry-values -start-after=livedebugvalues -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
307+# RUN: llc -emit-call-site-info -debug-entry-values -start-after=livedebugvalues -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
308
309 # Based on the following C reproducer:
310 #
311diff --git a/llvm/test/DebugInfo/MIR/AArch64/implicit-def-dead-scope.mir b/llvm/test/DebugInfo/MIR/AArch64/implicit-def-dead-scope.mir
312index fbf9b3454689..d85f2d25391d 100644
313--- a/llvm/test/DebugInfo/MIR/AArch64/implicit-def-dead-scope.mir
314+++ b/llvm/test/DebugInfo/MIR/AArch64/implicit-def-dead-scope.mir
315@@ -1,4 +1,4 @@
316-# RUN: llc -start-after=livedebugvalues -filetype=obj -o - %s \
317+# RUN: llc -emit-call-site-info -start-after=livedebugvalues -filetype=obj -o - %s \
318 # RUN: | llvm-dwarfdump -v - | FileCheck %s
319
320 # This tests for a crash in DwarfDebug's singular DBG_VALUE range promotion when
321diff --git a/llvm/test/DebugInfo/MIR/ARM/dbgcall-site-interpretation.mir b/llvm/test/DebugInfo/MIR/ARM/dbgcall-site-interpretation.mir
322index ce8dc97f0e72..0ae4e6ec485c 100644
323--- a/llvm/test/DebugInfo/MIR/ARM/dbgcall-site-interpretation.mir
324+++ b/llvm/test/DebugInfo/MIR/ARM/dbgcall-site-interpretation.mir
325@@ -1,4 +1,4 @@
326-# RUN: llc -mtriple=arm-linux-gnueabi -debug-entry-values -filetype=obj -start-after=machineverifier %s -o -| llvm-dwarfdump -| FileCheck %s
327+# RUN: llc -emit-call-site-info -mtriple=arm-linux-gnueabi -debug-entry-values -filetype=obj -start-after=machineverifier %s -o -| llvm-dwarfdump -| FileCheck %s
328 # Following code is used for producing this test case. Note that
329 # some of argument loading instruction are modified in order to
330 # cover certain cases.
331diff --git a/llvm/test/DebugInfo/MIR/ARM/dbgcall-site-propagated-value.mir b/llvm/test/DebugInfo/MIR/ARM/dbgcall-site-propagated-value.mir
332index 9001c8ba8eea..5b84d9e9627f 100644
333--- a/llvm/test/DebugInfo/MIR/ARM/dbgcall-site-propagated-value.mir
334+++ b/llvm/test/DebugInfo/MIR/ARM/dbgcall-site-propagated-value.mir
335@@ -1,4 +1,4 @@
336-# RUN: llc -debug-entry-values -run-pass=livedebugvalues -o - %s | FileCheck %s
337+# RUN: llc -emit-call-site-info -debug-entry-values -run-pass=livedebugvalues -o - %s | FileCheck %s
338
339 # Based on the following C reproducer:
340 #
341diff --git a/llvm/test/DebugInfo/MIR/ARM/if-coverter-call-site-info.mir b/llvm/test/DebugInfo/MIR/ARM/if-coverter-call-site-info.mir
342index aa7b54c1e5bb..11e9c4c90836 100644
343--- a/llvm/test/DebugInfo/MIR/ARM/if-coverter-call-site-info.mir
344+++ b/llvm/test/DebugInfo/MIR/ARM/if-coverter-call-site-info.mir
345@@ -1,4 +1,4 @@
346-# RUN: llc -mtriple=arm-linux-gnu -debug-entry-values -run-pass if-converter %s -o -| FileCheck %s
347+# RUN: llc -emit-call-site-info -mtriple=arm-linux-gnu -debug-entry-values -run-pass if-converter %s -o -| FileCheck %s
348
349 # Vefify that the call site info will be updated after the optimization.
350 # This test case would previously trigger an assertion when
351diff --git a/llvm/test/DebugInfo/MIR/Hexagon/dbgcall-site-instr-before-bundled-call.mir b/llvm/test/DebugInfo/MIR/Hexagon/dbgcall-site-instr-before-bundled-call.mir
352index 8ae628af2c09..3ae23d4189bf 100644
353--- a/llvm/test/DebugInfo/MIR/Hexagon/dbgcall-site-instr-before-bundled-call.mir
354+++ b/llvm/test/DebugInfo/MIR/Hexagon/dbgcall-site-instr-before-bundled-call.mir
355@@ -1,4 +1,4 @@
356-# RUN: llc -mtriple hexagon -debug-entry-values -start-after=machineverifier -filetype=obj %s -o - | llvm-dwarfdump - | FileCheck %s
357+# RUN: llc -mtriple hexagon -emit-call-site-info -debug-entry-values -start-after=machineverifier -filetype=obj %s -o - | llvm-dwarfdump - | FileCheck %s
358
359 # Based on the following C reproducer:
360 #
361diff --git a/llvm/test/DebugInfo/MIR/Hexagon/live-debug-values-bundled-entry-values.mir b/llvm/test/DebugInfo/MIR/Hexagon/live-debug-values-bundled-entry-values.mir
362index ff0a539dd15d..8bb0b3202acd 100644
363--- a/llvm/test/DebugInfo/MIR/Hexagon/live-debug-values-bundled-entry-values.mir
364+++ b/llvm/test/DebugInfo/MIR/Hexagon/live-debug-values-bundled-entry-values.mir
365@@ -1,4 +1,4 @@
366-# RUN: llc -debug-entry-values -run-pass=livedebugvalues -o - %s | FileCheck %s
367+# RUN: llc -emit-call-site-info -debug-entry-values -run-pass=livedebugvalues -o - %s | FileCheck %s
368
369 # Verify that the entry values for the input parameters are inserted after the
370 # bundles which contains the registers' clobbering instructions (the calls to
371diff --git a/llvm/test/DebugInfo/MIR/SystemZ/call-site-lzer.mir b/llvm/test/DebugInfo/MIR/SystemZ/call-site-lzer.mir
372index 8a4e8b5632c2..3cf41467f7f9 100644
373--- a/llvm/test/DebugInfo/MIR/SystemZ/call-site-lzer.mir
374+++ b/llvm/test/DebugInfo/MIR/SystemZ/call-site-lzer.mir
375@@ -1,4 +1,4 @@
376-# RUN: llc -debug-entry-values -start-after=livedebugvalues -o - %s | FileCheck %s
377+# RUN: llc -emit-call-site-info -debug-entry-values -start-after=livedebugvalues -o - %s | FileCheck %s
378
379 # This test would previously trigger an assertion when trying to describe the
380 # call site value for callee()'s float parameter.
381diff --git a/llvm/test/DebugInfo/MIR/X86/DW_OP_entry_value.mir b/llvm/test/DebugInfo/MIR/X86/DW_OP_entry_value.mir
382index e6fe5d2de878..4e5a07321d42 100644
383--- a/llvm/test/DebugInfo/MIR/X86/DW_OP_entry_value.mir
384+++ b/llvm/test/DebugInfo/MIR/X86/DW_OP_entry_value.mir
385@@ -1,4 +1,4 @@
386-# RUN: llc -debug-entry-values -start-before=livedebugvalues -mtriple=x86_64-apple-darwin -o %t %s -filetype=obj
387+# RUN: llc -emit-call-site-info -debug-entry-values -start-before=livedebugvalues -mtriple=x86_64-apple-darwin -o %t %s -filetype=obj
388 # RUN: llvm-dwarfdump %t | FileCheck %s
389 #
390 # int global;
391diff --git a/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir b/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir
392index c32a1155d038..edeef2c7aed4 100644
393--- a/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir
394+++ b/llvm/test/DebugInfo/MIR/X86/dbg-call-site-spilled-arg.mir
395@@ -1,6 +1,6 @@
396 # Check that llvm can describe a call site parameter which resides in a spill slot.
397 #
398-# RUN: llc -debug-entry-values -start-after=machineverifier -filetype=obj %s -o - | llvm-dwarfdump - | FileCheck %s
399+# RUN: llc -emit-call-site-info -debug-entry-values -start-after=machineverifier -filetype=obj %s -o - | llvm-dwarfdump - | FileCheck %s
400 #
401 # Command:
402 # $ ~/src/builds/llvm-project-master-RA/bin/clang -g -Xclang -femit-debug-entry-values -O2 -c -o spill.o spill.cc -mllvm -stop-before=machineverifier -o spill.mir
403diff --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-copy-super-sub.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-copy-super-sub.mir
404index a2d51a203512..01a2b887a60b 100644
405--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-copy-super-sub.mir
406+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-copy-super-sub.mir
407@@ -1,4 +1,4 @@
408-# RUN: llc -debug-entry-values -start-after=livedebugvalues -filetype=obj %s -o -| llvm-dwarfdump -| FileCheck %s
409+# RUN: llc -emit-call-site-info -debug-entry-values -start-after=livedebugvalues -filetype=obj %s -o -| llvm-dwarfdump -| FileCheck %s
410
411 # Based on the following reproducer:
412 #
413diff --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-interpretation.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-interpretation.mir
414index f9e9459f1abd..104bc0146798 100644
415--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-interpretation.mir
416+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-interpretation.mir
417@@ -1,4 +1,4 @@
418-# RUN: llc -debug-entry-values -start-after=machineverifier -filetype=obj %s -o -| llvm-dwarfdump -| FileCheck %s
419+# RUN: llc -emit-call-site-info -debug-entry-values -start-after=machineverifier -filetype=obj %s -o -| llvm-dwarfdump -| FileCheck %s
420 #
421 # CHECK: DW_TAG_GNU_call_site
422 # CHECK-NEXT: DW_AT_abstract_origin {{.*}} "foo"
423diff --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-lea-interpretation.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-lea-interpretation.mir
424index 1bb70f6d4530..4d88fa9aab74 100644
425--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-lea-interpretation.mir
426+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-lea-interpretation.mir
427@@ -1,4 +1,4 @@
428-# RUN: llc -debug-entry-values -start-after=machineverifier -filetype=obj %s -o -| llvm-dwarfdump -| FileCheck %s
429+# RUN: llc -emit-call-site-info -debug-entry-values -start-after=machineverifier -filetype=obj %s -o -| llvm-dwarfdump -| FileCheck %s
430 # CHECK: DW_TAG_GNU_call_site
431 # CHECK-NEXT: DW_AT_abstract_origin {{.*}} "foo")
432 # CHECK-NEXT: DW_AT_low_pc {{.*}}
433diff --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reference.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reference.mir
434index 235787573f51..81af598ba194 100644
435--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reference.mir
436+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-reference.mir
437@@ -1,4 +1,4 @@
438-# RUN: llc -debug-entry-values -start-before=livedebugvalues -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
439+# RUN: llc -emit-call-site-info -debug-entry-values -start-before=livedebugvalues -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
440
441 # Based on the following C++ code:
442 # struct A { A(A &) {} };
443diff --git a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-two-fwd-reg-defs.mir b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-two-fwd-reg-defs.mir
444index db0934c595c3..46adedd1be44 100644
445--- a/llvm/test/DebugInfo/MIR/X86/dbgcall-site-two-fwd-reg-defs.mir
446+++ b/llvm/test/DebugInfo/MIR/X86/dbgcall-site-two-fwd-reg-defs.mir
447@@ -1,4 +1,4 @@
448-# RUN: llc -O1 -debug-entry-values -start-after=livedebugvalues -filetype=obj %s -o - | llvm-dwarfdump - | FileCheck %s
449+# RUN: llc -O1 -emit-call-site-info -debug-entry-values -start-after=livedebugvalues -filetype=obj %s -o - | llvm-dwarfdump - | FileCheck %s
450
451 # Based on the following C reproducer:
452 #
453diff --git a/llvm/test/DebugInfo/MIR/X86/dbginfo-entryvals.mir b/llvm/test/DebugInfo/MIR/X86/dbginfo-entryvals.mir
454index 5d203029936e..1d7b64f169d1 100644
455--- a/llvm/test/DebugInfo/MIR/X86/dbginfo-entryvals.mir
456+++ b/llvm/test/DebugInfo/MIR/X86/dbginfo-entryvals.mir
457@@ -1,4 +1,4 @@
458-# RUN: llc -debug-entry-values -run-pass=livedebugvalues -march=x86-64 -o - %s | FileCheck %s
459+# RUN: llc -emit-call-site-info -debug-entry-values -run-pass=livedebugvalues -march=x86-64 -o - %s | FileCheck %s
460 #
461 #extern void fn2(int);
462 #
463diff --git a/llvm/test/DebugInfo/MIR/X86/debug-call-site-param.mir b/llvm/test/DebugInfo/MIR/X86/debug-call-site-param.mir
464index e79be66cd4e3..c39bc4db50be 100644
465--- a/llvm/test/DebugInfo/MIR/X86/debug-call-site-param.mir
466+++ b/llvm/test/DebugInfo/MIR/X86/debug-call-site-param.mir
467@@ -2,8 +2,8 @@
468 # When the debugger tuning is set to gdb, use GNU opcodes.
469 # For lldb, use the standard DWARF5 opcodes.
470
471-# RUN: llc -debug-entry-values -debugger-tune=gdb -filetype=obj -mtriple=x86_64-unknown-unknown -start-after=machineverifier -o - %s | llvm-dwarfdump - | FileCheck %s -check-prefixes=CHECK-GNU
472-# RUN: llc -debug-entry-values -debugger-tune=lldb -filetype=obj -mtriple=x86_64-unknown-unknown -start-after=machineverifier -o - %s | llvm-dwarfdump - | FileCheck %s -check-prefixes=CHECK-DWARF5
473+# RUN: llc -emit-call-site-info -debug-entry-values -debugger-tune=gdb -filetype=obj -mtriple=x86_64-unknown-unknown -start-after=machineverifier -o - %s | llvm-dwarfdump - | FileCheck %s -check-prefixes=CHECK-GNU
474+# RUN: llc -emit-call-site-info -debug-entry-values -debugger-tune=lldb -filetype=obj -mtriple=x86_64-unknown-unknown -start-after=machineverifier -o - %s | llvm-dwarfdump - | FileCheck %s -check-prefixes=CHECK-DWARF5
475 #
476 # extern void foo(int *a, int b, int c, int d, int e, int f);
477 # extern int getVal();
478diff --git a/llvm/test/DebugInfo/MIR/X86/entry-value-of-modified-param.mir b/llvm/test/DebugInfo/MIR/X86/entry-value-of-modified-param.mir
479index 8d121c3a30b9..c7f15aaaa562 100644
480--- a/llvm/test/DebugInfo/MIR/X86/entry-value-of-modified-param.mir
481+++ b/llvm/test/DebugInfo/MIR/X86/entry-value-of-modified-param.mir
482@@ -1,4 +1,4 @@
483-# RUN: llc -debug-entry-values -run-pass=livedebugvalues -march=x86-64 -o - %s | FileCheck %s
484+# RUN: llc -emit-call-site-info -debug-entry-values -run-pass=livedebugvalues -march=x86-64 -o - %s | FileCheck %s
485 #
486 #extern void fn1 (int, int, int);
487 #
488diff --git a/llvm/test/DebugInfo/MIR/X86/entry-values-diamond-bbs.mir b/llvm/test/DebugInfo/MIR/X86/entry-values-diamond-bbs.mir
489index 2396daada876..aa8fdd7afd47 100644
490--- a/llvm/test/DebugInfo/MIR/X86/entry-values-diamond-bbs.mir
491+++ b/llvm/test/DebugInfo/MIR/X86/entry-values-diamond-bbs.mir
492@@ -1,4 +1,4 @@
493-# RUN: llc -debug-entry-values -run-pass=livedebugvalues -march=x86-64 -o - %s | FileCheck %s
494+# RUN: llc -emit-call-site-info -debug-entry-values -run-pass=livedebugvalues -march=x86-64 -o - %s | FileCheck %s
495 #
496 # The test case was artificially adjusted, in order to make proper diamond basic
497 # block structure relevant to the debug entry values propagation.
498diff --git a/llvm/test/DebugInfo/MIR/X86/propagate-entry-value-cross-bbs.mir b/llvm/test/DebugInfo/MIR/X86/propagate-entry-value-cross-bbs.mir
499index 86b1cddaa462..c5af863954bf 100644
500--- a/llvm/test/DebugInfo/MIR/X86/propagate-entry-value-cross-bbs.mir
501+++ b/llvm/test/DebugInfo/MIR/X86/propagate-entry-value-cross-bbs.mir
502@@ -1,4 +1,4 @@
503-# RUN: llc -debug-entry-values -run-pass=livedebugvalues -march=x86-64 -o - %s | FileCheck %s
504+# RUN: llc -emit-call-site-info -debug-entry-values -run-pass=livedebugvalues -march=x86-64 -o - %s | FileCheck %s
505 #
506 #extern void fn1 (int, int, int);
507 #__attribute__((noinline))
508diff --git a/llvm/test/DebugInfo/MIR/X86/unreachable-block-call-site.mir b/llvm/test/DebugInfo/MIR/X86/unreachable-block-call-site.mir
509index d282d796f6d7..ea9c12b5a192 100644
510--- a/llvm/test/DebugInfo/MIR/X86/unreachable-block-call-site.mir
511+++ b/llvm/test/DebugInfo/MIR/X86/unreachable-block-call-site.mir
512@@ -1,4 +1,4 @@
513-# RUN: llc -mtriple=x86_64-pc-linux -debug-entry-values -run-pass=unreachable-mbb-elimination -o - %s | FileCheck %s
514+# RUN: llc -mtriple=x86_64-pc-linux -emit-call-site-info -debug-entry-values -run-pass=unreachable-mbb-elimination -o - %s | FileCheck %s
515
516 # Verify that the call site information for the call residing in the eliminated
517 # block is removed. This test case would previously trigger an assertion when
518diff --git a/llvm/test/DebugInfo/X86/dbgcall-site-64-bit-imms.ll b/llvm/test/DebugInfo/X86/dbgcall-site-64-bit-imms.ll
519index b698f1cdbfe8..b8cd9574cc63 100644
520--- a/llvm/test/DebugInfo/X86/dbgcall-site-64-bit-imms.ll
521+++ b/llvm/test/DebugInfo/X86/dbgcall-site-64-bit-imms.ll
522@@ -1,4 +1,4 @@
523-; RUN: llc -O1 -debug-entry-values -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
524+; RUN: llc -O1 -emit-call-site-info -debug-entry-values -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
525
526 ; Verify that the 64-bit call site immediates are not truncated.
527 ;
528diff --git a/llvm/test/DebugInfo/X86/dbgcall-site-zero-valued-imms.ll b/llvm/test/DebugInfo/X86/dbgcall-site-zero-valued-imms.ll
529index 9fe67f82a2b4..5d37774f55d6 100644
530--- a/llvm/test/DebugInfo/X86/dbgcall-site-zero-valued-imms.ll
531+++ b/llvm/test/DebugInfo/X86/dbgcall-site-zero-valued-imms.ll
532@@ -1,4 +1,4 @@
533-; RUN: llc -O3 -debug-entry-values -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
534+; RUN: llc -O3 -emit-call-site-info -debug-entry-values -filetype=obj -o - %s | llvm-dwarfdump - | FileCheck %s
535
536 target datalayout = "e-m:e-i64:64-f80:128-n8:16:32:64-S128"
537 target triple = "x86_64-unknown-linux-gnu"
538diff --git a/llvm/test/tools/llvm-dwarfdump/X86/stats-dbg-callsite-info.ll b/llvm/test/tools/llvm-dwarfdump/X86/stats-dbg-callsite-info.ll
539index c304e9d768a5..d126757398ff 100644
540--- a/llvm/test/tools/llvm-dwarfdump/X86/stats-dbg-callsite-info.ll
541+++ b/llvm/test/tools/llvm-dwarfdump/X86/stats-dbg-callsite-info.ll
542@@ -1,4 +1,4 @@
543-; RUN: llc -debug-entry-values %s -o - -filetype=obj \
544+; RUN: llc -emit-call-site-info -debug-entry-values %s -o - -filetype=obj \
545 ; RUN: | llvm-dwarfdump -statistics - | FileCheck %s
546 ;
547 ; The LLVM IR file was generated on this source code by using
548--
5492.33.1
550
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-05-05 19:20:53 +0000