https://github.com/OCHyams updated
https://github.com/llvm/llvm-project/pull/133490
>From a612a99e2b5540c7fca93dd4dd3fcc07cc1cc9fd Mon Sep 17 00:00:00 2001
From: Orlando Cazalet-Hyams <orlando.hy...@sony.com>
Date: Wed, 26 Mar 2025 16:03:41 +0000
Subject: [PATCH 1/3] [KeyInstr][LoopRotate] Remap atoms of duplicated
instructions
---
.../Transforms/Utils/LoopRotationUtils.cpp | 3 +
.../KeyInstructions/Generic/loop-rotate.ll | 79 +++++++++++++++++++
2 files changed, 82 insertions(+)
create mode 100644 llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
diff --git a/llvm/lib/Transforms/Utils/LoopRotationUtils.cpp
b/llvm/lib/Transforms/Utils/LoopRotationUtils.cpp
index c5c4968ef4dcc..73d074029d810 100644
--- a/llvm/lib/Transforms/Utils/LoopRotationUtils.cpp
+++ b/llvm/lib/Transforms/Utils/LoopRotationUtils.cpp
@@ -657,6 +657,9 @@ bool LoopRotate::rotateLoop(Loop *L, bool SimplifiedLatch) {
// Otherwise, create a duplicate of the instruction.
Instruction *C = Inst->clone();
+ if (const DebugLoc &DL = C->getDebugLoc())
+ mapAtomInstance(DL, ValueMap);
+
C->insertBefore(LoopEntryBranch->getIterator());
++NumInstrsDuplicated;
diff --git a/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
b/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
new file mode 100644
index 0000000000000..2a075b7e0f993
--- /dev/null
+++ b/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
@@ -0,0 +1,79 @@
+; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
UTC_ARGS: --version 5
+; RUN: opt --passes=loop-rotate %s -S -o - | FileCheck %s
+
+;; Check the duplicated store and br get remapped atoms.
+
+@glob = global i32 0
+
+define void @test1() #0 !dbg !5 {
+; CHECK-LABEL: define void @test1(
+; CHECK-SAME: ) #[[ATTR0:[0-9]+]] !dbg [[DBG5:![0-9]+]] {
+; CHECK-NEXT: [[ENTRY:.*]]:
+; CHECK-NEXT: [[ARRAY:%.*]] = alloca [20 x i32], align 16
+; CHECK-NEXT: store i32 0, ptr @glob, align 16, !dbg [[DBG8:![0-9]+]]
+; CHECK-NEXT: br label %[[FOR_BODY:.*]], !dbg [[DBG9:![0-9]+]]
+; CHECK: [[FOR_BODY]]:
+; CHECK-NEXT: [[I_01:%.*]] = phi i32 [ 0, %[[ENTRY]] ], [ [[INC:%.*]],
%[[FOR_BODY]] ]
+; CHECK-NEXT: [[INC]] = add nsw i32 [[I_01]], 1
+; CHECK-NEXT: store i32 0, ptr [[ARRAY]], align 16
+; CHECK-NEXT: store i32 [[INC]], ptr @glob, align 16, !dbg [[DBG10:![0-9]+]]
+; CHECK-NEXT: [[CMP:%.*]] = icmp slt i32 [[INC]], 100, !dbg
[[DBG11:![0-9]+]]
+; CHECK-NEXT: br i1 [[CMP]], label %[[FOR_BODY]], label %[[FOR_END:.*]],
!dbg [[DBG12:![0-9]+]]
+; CHECK: [[FOR_END]]:
+; CHECK-NEXT: [[ARRAYIDX_LCSSA:%.*]] = phi ptr [ [[ARRAY]], %[[FOR_BODY]] ]
+; CHECK-NEXT: call void @g(ptr [[ARRAYIDX_LCSSA]])
+; CHECK-NEXT: ret void
+;
+entry:
+ %array = alloca [20 x i32], align 16
+ br label %for.cond
+
+for.cond: ; preds = %for.body, %entry
+ %i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
+ store i32 %i.0, ptr @glob, align 16, !dbg !11
+ %cmp = icmp slt i32 %i.0, 100, !dbg !12
+ br i1 %cmp, label %for.body, label %for.end, !dbg !13
+
+for.body: ; preds = %for.cond
+ %inc = add nsw i32 %i.0, 1
+ store i32 0, ptr %array, align 16
+ br label %for.cond
+
+for.end: ; preds = %for.cond
+ %arrayidx.lcssa = phi ptr [ %array, %for.cond ]
+ call void @g(ptr %arrayidx.lcssa)
+ ret void
+}
+
+declare void @g(ptr)
+
+attributes #0 = { nounwind ssp }
+attributes #1 = { noduplicate }
+
+!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 12}
+!3 = !{i32 0}
+!4 = !{i32 2, !"Debug Info Version", i32 3}
+!5 = distinct !DISubprogram(name: "test1", linkageName: "test1", scope: null,
file: !1, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition |
DISPFlagOptimized, unit: !0)
+!6 = !DISubroutineType(types: !7)
+!7 = !{}
+!11 = !DILocation(line: 4, column: 1, scope: !5, atomGroup: 1, atomRank: 1)
+!12 = !DILocation(line: 5, column: 1, scope: !5, atomGroup: 2, atomRank: 2)
+!13 = !DILocation(line: 6, column: 1, scope: !5, atomGroup: 2, atomRank: 1)
+;.
+; CHECK: [[META0:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C,
file: [[META1:![0-9]+]], producer: "debugify", isOptimized: true,
runtimeVersion: 0, emissionKind: FullDebug)
+; CHECK: [[META1]] = !DIFile(filename: "test.ll", directory: {{.*}})
+; CHECK: [[DBG5]] = distinct !DISubprogram(name: "test1", linkageName:
"test1", scope: null, file: [[META1]], line: 1, type: [[META6:![0-9]+]],
scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: [[META0]])
+; CHECK: [[META6]] = !DISubroutineType(types: [[META7:![0-9]+]])
+; CHECK: [[META7]] = !{}
+; CHECK: [[DBG8]] = !DILocation(line: 4, column: 1, scope: [[DBG5]],
atomGroup: 3, atomRank: 1)
+; CHECK: [[DBG9]] = !DILocation(line: 6, column: 1, scope: [[DBG5]],
atomGroup: 4, atomRank: 1)
+; CHECK: [[DBG10]] = !DILocation(line: 4, column: 1, scope: [[DBG5]],
atomGroup: 1, atomRank: 1)
+; CHECK: [[DBG11]] = !DILocation(line: 5, column: 1, scope: [[DBG5]],
atomGroup: 2, atomRank: 2)
+; CHECK: [[DBG12]] = !DILocation(line: 6, column: 1, scope: [[DBG5]],
atomGroup: 2, atomRank: 1)
+;.
>From ca990f7427293128662b0ec969e63f9986d6d445 Mon Sep 17 00:00:00 2001
From: Orlando Cazalet-Hyams <orlando.hy...@sony.com>
Date: Wed, 7 May 2025 16:59:15 +0100
Subject: [PATCH 2/3] add better comment to test
---
.../KeyInstructions/Generic/loop-rotate.ll | 16 +++++++++++++++-
1 file changed, 15 insertions(+), 1 deletion(-)
diff --git a/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
b/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
index 2a075b7e0f993..a993212250e56 100644
--- a/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
+++ b/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
@@ -1,7 +1,21 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
UTC_ARGS: --version 5
; RUN: opt --passes=loop-rotate %s -S -o - | FileCheck %s
-;; Check the duplicated store and br get remapped atoms.
+;; Rotate:
+;; +------------------> for.end.
+;; |
+;; entry -> for.cond -> for.body
+;; ^ |
+;; +-----------+
+;;
+;; Into:
+;;
+;; +------> for.end.
+;; |
+;; entry (+ for.cond`0) -> for.body (+ for.cond) -+
+;; ^ |
+;; +-------------------+
+;; Check for.cond's duplicated store and br have their source atoms remapped.
@glob = global i32 0
>From 6af09f74bee2a49012e4c042b3b9e04ddca3a8ad Mon Sep 17 00:00:00 2001
From: Orlando Cazalet-Hyams <orlando.hy...@sony.com>
Date: Wed, 7 May 2025 17:06:55 +0100
Subject: [PATCH 3/3] don't use UTC
---
.../KeyInstructions/Generic/loop-rotate.ll | 55 ++++++-------------
1 file changed, 18 insertions(+), 37 deletions(-)
diff --git a/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
b/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
index a993212250e56..6da7146b5b07a 100644
--- a/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
+++ b/llvm/test/DebugInfo/KeyInstructions/Generic/loop-rotate.ll
@@ -1,4 +1,3 @@
-; NOTE: Assertions have been autogenerated by utils/update_test_checks.py
UTC_ARGS: --version 5
; RUN: opt --passes=loop-rotate %s -S -o - | FileCheck %s
;; Rotate:
@@ -17,36 +16,33 @@
;; +-------------------+
;; Check for.cond's duplicated store and br have their source atoms remapped.
+; CHECK: entry:
+; CHECK: store i32 0, ptr @glob, align 16, !dbg [[G3R1:![0-9]+]]
+; CHECK: br label %for.body, !dbg [[G4R1:![0-9]+]]
+;
+; CHECK: for.body:
+; CHECK: store i32 {{.*}}, ptr @glob, align 16, !dbg [[G1R1:![0-9]+]]
+; CHECK: [[CMP:%.*]] = icmp slt i32 {{.*}}, 100, !dbg [[G2R2:![0-9]+]]
+; CHECK: br i1 [[CMP]], label %for.body, label %for.end, !dbg
[[G2R1:![0-9]+]]
+;
+; CHECK: [[G3R1]] = !DILocation(line: 4{{.*}}, atomGroup: 3, atomRank: 1)
+; CHECK: [[G4R1]] = !DILocation(line: 6{{.*}}, atomGroup: 4, atomRank: 1)
+; CHECK: [[G1R1]] = !DILocation(line: 4{{.*}}, atomGroup: 1, atomRank: 1)
+; CHECK: [[G2R2]] = !DILocation(line: 5{{.*}}, atomGroup: 2, atomRank: 2)
+; CHECK: [[G2R1]] = !DILocation(line: 6{{.*}}, atomGroup: 2, atomRank: 1)
+
@glob = global i32 0
define void @test1() #0 !dbg !5 {
-; CHECK-LABEL: define void @test1(
-; CHECK-SAME: ) #[[ATTR0:[0-9]+]] !dbg [[DBG5:![0-9]+]] {
-; CHECK-NEXT: [[ENTRY:.*]]:
-; CHECK-NEXT: [[ARRAY:%.*]] = alloca [20 x i32], align 16
-; CHECK-NEXT: store i32 0, ptr @glob, align 16, !dbg [[DBG8:![0-9]+]]
-; CHECK-NEXT: br label %[[FOR_BODY:.*]], !dbg [[DBG9:![0-9]+]]
-; CHECK: [[FOR_BODY]]:
-; CHECK-NEXT: [[I_01:%.*]] = phi i32 [ 0, %[[ENTRY]] ], [ [[INC:%.*]],
%[[FOR_BODY]] ]
-; CHECK-NEXT: [[INC]] = add nsw i32 [[I_01]], 1
-; CHECK-NEXT: store i32 0, ptr [[ARRAY]], align 16
-; CHECK-NEXT: store i32 [[INC]], ptr @glob, align 16, !dbg [[DBG10:![0-9]+]]
-; CHECK-NEXT: [[CMP:%.*]] = icmp slt i32 [[INC]], 100, !dbg
[[DBG11:![0-9]+]]
-; CHECK-NEXT: br i1 [[CMP]], label %[[FOR_BODY]], label %[[FOR_END:.*]],
!dbg [[DBG12:![0-9]+]]
-; CHECK: [[FOR_END]]:
-; CHECK-NEXT: [[ARRAYIDX_LCSSA:%.*]] = phi ptr [ [[ARRAY]], %[[FOR_BODY]] ]
-; CHECK-NEXT: call void @g(ptr [[ARRAYIDX_LCSSA]])
-; CHECK-NEXT: ret void
-;
entry:
%array = alloca [20 x i32], align 16
br label %for.cond
for.cond: ; preds = %for.body, %entry
%i.0 = phi i32 [ 0, %entry ], [ %inc, %for.body ]
- store i32 %i.0, ptr @glob, align 16, !dbg !11
- %cmp = icmp slt i32 %i.0, 100, !dbg !12
- br i1 %cmp, label %for.body, label %for.end, !dbg !13
+ store i32 %i.0, ptr @glob, align 16, !dbg !DILocation(line: 4,
scope: !5, atomGroup: 1, atomRank: 1)
+ %cmp = icmp slt i32 %i.0, 100, !dbg !DILocation(line: 5,
scope: !5, atomGroup: 2, atomRank: 2)
+ br i1 %cmp, label %for.body, label %for.end, !dbg !DILocation(line: 6,
scope: !5, atomGroup: 2, atomRank: 1)
for.body: ; preds = %for.cond
%inc = add nsw i32 %i.0, 1
@@ -76,18 +72,3 @@ attributes #1 = { noduplicate }
!5 = distinct !DISubprogram(name: "test1", linkageName: "test1", scope: null,
file: !1, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition |
DISPFlagOptimized, unit: !0)
!6 = !DISubroutineType(types: !7)
!7 = !{}
-!11 = !DILocation(line: 4, column: 1, scope: !5, atomGroup: 1, atomRank: 1)
-!12 = !DILocation(line: 5, column: 1, scope: !5, atomGroup: 2, atomRank: 2)
-!13 = !DILocation(line: 6, column: 1, scope: !5, atomGroup: 2, atomRank: 1)
-;.
-; CHECK: [[META0:![0-9]+]] = distinct !DICompileUnit(language: DW_LANG_C,
file: [[META1:![0-9]+]], producer: "debugify", isOptimized: true,
runtimeVersion: 0, emissionKind: FullDebug)
-; CHECK: [[META1]] = !DIFile(filename: "test.ll", directory: {{.*}})
-; CHECK: [[DBG5]] = distinct !DISubprogram(name: "test1", linkageName:
"test1", scope: null, file: [[META1]], line: 1, type: [[META6:![0-9]+]],
scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: [[META0]])
-; CHECK: [[META6]] = !DISubroutineType(types: [[META7:![0-9]+]])
-; CHECK: [[META7]] = !{}
-; CHECK: [[DBG8]] = !DILocation(line: 4, column: 1, scope: [[DBG5]],
atomGroup: 3, atomRank: 1)
-; CHECK: [[DBG9]] = !DILocation(line: 6, column: 1, scope: [[DBG5]],
atomGroup: 4, atomRank: 1)
-; CHECK: [[DBG10]] = !DILocation(line: 4, column: 1, scope: [[DBG5]],
atomGroup: 1, atomRank: 1)
-; CHECK: [[DBG11]] = !DILocation(line: 5, column: 1, scope: [[DBG5]],
atomGroup: 2, atomRank: 2)
-; CHECK: [[DBG12]] = !DILocation(line: 6, column: 1, scope: [[DBG5]],
atomGroup: 2, atomRank: 1)
-;.
_______________________________________________
llvm-branch-commits mailing list
llvm-branch-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
