https://github.com/OCHyams created
https://github.com/llvm/llvm-project/pull/133493
None
>From 7926adb4d3bb05f3d033dfb88868aa0d6c9b475a Mon Sep 17 00:00:00 2001
From: Orlando Cazalet-Hyams <orlando.hy...@sony.com>
Date: Wed, 26 Mar 2025 17:39:08 +0000
Subject: [PATCH] [KeyInstr] Remap cloned PHIs in BreakCriticalEdges
---
.../Transforms/Utils/BreakCriticalEdges.cpp | 3 ++
.../X86/cgp-break-critical-edge.ll | 52 +++++++++++++++++++
.../KeyInstructions/X86/lit.local.cfg | 2 +
3 files changed, 57 insertions(+)
create mode 100644
llvm/test/DebugInfo/KeyInstructions/X86/cgp-break-critical-edge.ll
create mode 100644 llvm/test/DebugInfo/KeyInstructions/X86/lit.local.cfg
diff --git a/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
b/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
index 4d9d9e1fec48d..3a1aa5cfab191 100644
--- a/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
+++ b/llvm/lib/Transforms/Utils/BreakCriticalEdges.cpp
@@ -397,6 +397,9 @@ bool llvm::SplitIndirectBrCriticalEdges(Function &F,
// preds.
ValueToValueMapTy VMap;
BasicBlock *DirectSucc = CloneBasicBlock(Target, VMap, ".clone", &F);
+ if (!VMap.AtomMap.empty())
+ for (Instruction &I : *DirectSucc)
+ RemapSourceAtom(&I, VMap);
BlockFrequency BlockFreqForDirectSucc;
for (BasicBlock *Pred : OtherPreds) {
diff --git a/llvm/test/DebugInfo/KeyInstructions/X86/cgp-break-critical-edge.ll
b/llvm/test/DebugInfo/KeyInstructions/X86/cgp-break-critical-edge.ll
new file mode 100644
index 0000000000000..e46b5c1ef6936
--- /dev/null
+++ b/llvm/test/DebugInfo/KeyInstructions/X86/cgp-break-critical-edge.ll
@@ -0,0 +1,52 @@
+; RUN: opt -passes='require<profile-summary>,function(codegenprepare)' -S
-mtriple=x86_64 < %s \
+; RUN: | FileCheck %s
+
+;; Check debug locations are propagated onto new PHIs.
+
+; CHECK: .split:
+; CHECK-NEXT: %merge = phi i32 [ poison, %while.body ], [ %dest.sroa.clone,
%while.body.clone ], !dbg [[G1R1:!.*]]
+
+; CHECK: while.body.clone:
+; CHECK-NEXT: %dest.sroa.clone = phi i32 [ %1, %.split ], [ poison, %if.else
], !dbg [[G2R1:!.*]]
+
+; CHECK: [[G1R1]] = !DILocation(line: 1, column: 1, scope: !5, atomGroup: 1,
atomRank: 1)
+; CHECK: [[G2R1]] = !DILocation(line: 1, column: 1, scope: !5, atomGroup: 2,
atomRank: 1)
+
+define void @test(i1 %c) !dbg !5 {
+entry:
+ br label %if.else
+
+if.else: ; preds = %if.else1, %entry
+ br i1 %c, label %while.body, label %preheader
+
+preheader: ; preds = %if.else
+ br label %if.else1
+
+if.then: ; preds = %if.else1
+ unreachable
+
+while.body: ; preds = %if.else1,
%while.body, %if.else
+ %dest.sroa = phi i32 [ %1, %while.body ], [ poison, %if.else1 ], [ poison,
%if.else ], !dbg !12
+ %0 = inttoptr i32 %dest.sroa to ptr
+ %incdec.ptr = getelementptr inbounds i8, ptr %0, i32 -1
+ %1 = ptrtoint ptr %incdec.ptr to i32
+ store i8 0, ptr %incdec.ptr, align 1
+ br label %while.body
+
+if.else1: ; preds = %if.else1,
%preheader
+ indirectbr ptr poison, [label %if.then, label %while.body, label %if.else,
label %if.else1]
+}
+
+!llvm.dbg.cu = !{!0}
+!llvm.debugify = !{!2, !3}
+!llvm.module.flags = !{!4}
+
+!0 = distinct !DICompileUnit(language: DW_LANG_C, file: !1, producer:
"debugify", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug)
+!1 = !DIFile(filename: "test.ll", directory: "/")
+!2 = !{i32 11}
+!3 = !{i32 0}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = distinct !DISubprogram(name: "test", linkageName: "test", scope: null,
file: !1, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition |
DISPFlagOptimized, unit: !0)
+!6 = !DISubroutineType(types: !7)
+!7 = !{}
+!12 = !DILocation(line: 1, column: 1, scope: !5, atomGroup: 1, atomRank: 1)
diff --git a/llvm/test/DebugInfo/KeyInstructions/X86/lit.local.cfg
b/llvm/test/DebugInfo/KeyInstructions/X86/lit.local.cfg
new file mode 100644
index 0000000000000..42bf50dcc13c3
--- /dev/null
+++ b/llvm/test/DebugInfo/KeyInstructions/X86/lit.local.cfg
@@ -0,0 +1,2 @@
+if not "X86" in config.root.targets:
+ config.unsupported = True
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
