Skip to content

[KeyInstr][JumpThreading] Remap atoms duping bb with cond br on phi into pred #133488

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
May 7, 2025
Merged

[KeyInstr][JumpThreading] Remap atoms duping bb with cond br on phi into pred #133488

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
47404a2
[KeyInstr][JumpThreading] Remap atoms duping bb with cond br on phi i…
OCHyams Mar 25, 2025
3c02939
whitespace
OCHyams May 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions llvm/lib/Transforms/Scalar/JumpThreading.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2699,6 +2699,9 @@ bool JumpThreadingPass::duplicateCondBranchOnPHIIntoPred(
// PredBB block. Evaluate PHI nodes in BB.
ValueToValueMapTy ValueMapping;

// Remember the position before the inserted instructions.
auto RItBeforeInsertPt = std::next(OldPredBranch->getReverseIterator());

BasicBlock::iterator BI = BB->begin();
for (; PHINode *PN = dyn_cast<PHINode>(BI); ++BI)
ValueMapping[PN] = PN->getIncomingValueForBlock(PredBB);
Expand All @@ -2718,6 +2721,8 @@ bool JumpThreadingPass::duplicateCondBranchOnPHIIntoPred(

// Remap debug variable operands.
remapDebugVariable(ValueMapping, New);
if (const DebugLoc &DL = New->getDebugLoc())
mapAtomInstance(DL, ValueMapping);

// If this instruction can be simplified after the operands are updated,
// just use the simplified value instead. This frequently happens due to
Expand Down Expand Up @@ -2756,6 +2761,10 @@ bool JumpThreadingPass::duplicateCondBranchOnPHIIntoPred(
addPHINodeEntriesForMappedBlock(BBBranch->getSuccessor(1), BB, PredBB,
ValueMapping);

// KeyInstructions: Remap the cloned instructions' atoms only.
remapSourceAtoms(ValueMapping, std::prev(RItBeforeInsertPt)->getIterator(),
OldPredBranch->getIterator());

updateSSA(BB, PredBB, ValueMapping);

// PredBB no longer jumps to BB, remove entries in the PHI node for the edge
Expand Down
87 changes: 87 additions & 0 deletions llvm/test/DebugInfo/KeyInstructions/Generic/jump-threading-dup-cond-br-on-phi-into-pred.ll
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
; RUN: opt %s --passes=jump-threading -S -o - -S | FileCheck %s

;; +-> T1 -+
;; | v +-> T2
;; Entry -+ Merge -+
;; | ^ +-> F2
;; +-> F1 -+
;;
;; Duplicate Merge into T1 then fold Merge into its only pred F1 (taking its name).
;;
;; +-> T1 -----> T2
;; | \ ^
;; | \ /
;; | \ /
;; Entry -+ +----+
;; | / v
;; +--> Merge -> F2
;;
;; Check the duplicated (into T1) instructions' atoms are remapped.

; CHECK: T1:
; CHECK-NEXT: %v1 = call i32 @f1()
; CHECK-NEXT: %cond3 = icmp eq i32 %v1, 412
; CHECK-NEXT: %C1 = add i32 %v1, 1, !dbg [[G3R2:!.*]]
; CHECK-NEXT: store i32 %C1, ptr %p, align 4, !dbg [[G3R1:!.*]]

; CHECK: Merge:
; CHECK-NEXT: %v2 = call i32 @f2()
; CHECK-NEXT: store i32 1, ptr %p, align 4, !dbg [[G1R1:!.*]]
; CHECK-NEXT: %C = add i32 %v2, 1, !dbg [[G2R2:!.*]]
; CHECK-NEXT: store i32 %C, ptr %p, align 4, !dbg [[G2R1:!.*]]

; CHECK: [[G3R2]] = !DILocation({{.*}}, atomGroup: 3, atomRank: 2)
; CHECK: [[G3R1]] = !DILocation({{.*}}, atomGroup: 3, atomRank: 1)
; CHECK: [[G1R1]] = !DILocation({{.*}}, atomGroup: 1, atomRank: 1)
; CHECK: [[G2R2]] = !DILocation({{.*}}, atomGroup: 2, atomRank: 2)
; CHECK: [[G2R1]] = !DILocation({{.*}}, atomGroup: 2, atomRank: 1)

define i32 @test5(i1 %cond, i1 %cond2, ptr %p) !dbg !5 {
br i1 %cond, label %T1, label %F1

T1: ; preds = %0
%v1 = call i32 @f1()
%cond3 = icmp eq i32 %v1, 412
br label %Merge

F1: ; preds = %0
%v2 = call i32 @f2()
store i32 1, ptr %p, align 4, !dbg !8
br label %Merge

Merge: ; preds = %F1, %T1
%A = phi i1 [ %cond3, %T1 ], [ %cond2, %F1 ]
%B = phi i32 [ %v1, %T1 ], [ %v2, %F1 ]
%C = add i32 %B, 1, !dbg !9
store i32 %C, ptr %p, align 4, !dbg !10
br i1 %A, label %T2, label %F2

T2: ; preds = %Merge
call void @f3()
ret i32 %B

F2: ; preds = %Merge
ret i32 %B
}

declare i32 @f1()

declare i32 @f2()

declare void @f3()

!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: "test5", linkageName: "test5", scope: null, file: !1, line: 1, type: !6, scopeLine: 1, spFlags: DISPFlagDefinition | DISPFlagOptimized, unit: !0)
!6 = !DISubroutineType(types: !7)
!7 = !{}
!8 = !DILocation(line: 1, column: 1, scope: !5, atomGroup: 1, atomRank: 1)
!9 = !DILocation(line: 2, column: 1, scope: !5, atomGroup: 2, atomRank: 2)
!10 = !DILocation(line: 2, column: 1, scope: !5, atomGroup: 2, atomRank: 1)
Loading