Skip to content

[DFAJumpThreading] Don't thread switch without multiple successors #71060

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.

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 1 commit into from
Nov 2, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
6 changes: 6 additions & 0 deletions llvm/lib/Transforms/Scalar/DFAJumpThreading.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -728,6 +728,10 @@ struct TransformDFA {
CodeMetrics Metrics;
SwitchInst *Switch = SwitchPaths->getSwitchInst();

// Don't thread switch without multiple successors.
if (Switch->getNumSuccessors() <= 1)
return false;

// Note that DuplicateBlockMap is not being used as intended here. It is
// just being used to ensure (BB, State) pairs are only counted once.
DuplicateBlockMap DuplicateMap;
Expand Down Expand Up @@ -805,6 +809,8 @@ struct TransformDFA {
// using binary search, hence the LogBase2().
unsigned CondBranches =
APInt(32, Switch->getNumSuccessors()).ceilLogBase2();
assert(CondBranches > 0 &&
"The threaded switch must have multiple branches");
DuplicationCost = Metrics.NumInsts / CondBranches;
} else {
// Compared with jump tables, the DFA optimizer removes an indirect branch
Expand Down
43 changes: 43 additions & 0 deletions llvm/test/Transforms/DFAJumpThreading/single_succ_switch.ll
Original file line number Diff line number Diff line change
@@ -0,0 +1,43 @@
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 3
; RUN: opt -S -passes=dfa-jump-threading %s | FileCheck %s

define void @pr60254() {
; CHECK-LABEL: define void @pr60254() {
; CHECK-NEXT: entry_1:
; CHECK-NEXT: br label [[BB_2:%.*]]
; CHECK: bb_2:
; CHECK-NEXT: [[PTR_I32_25_0:%.*]] = phi i32 [ 0, [[BB_4:%.*]] ], [ 0, [[BB_2]] ], [ 0, [[ENTRY_1:%.*]] ]
; CHECK-NEXT: switch i32 [[PTR_I32_25_0]], label [[BB_2]] [
; CHECK-NEXT: ]
; CHECK: bb_4:
; CHECK-NEXT: br label [[BB_2]]
;
entry_1:
br label %bb_2

bb_2: ; preds = %bb_4, %bb_2, %entry_1
%ptr_i32_25.0 = phi i32 [ 0, %bb_4 ], [ 0, %bb_2 ], [ 0, %entry_1 ]
switch i32 %ptr_i32_25.0, label %bb_2 [
]

bb_4: ; No predecessors!
br label %bb_2
}

define void @pr56882() {
; CHECK-LABEL: define void @pr56882() {
; CHECK-NEXT: entry_1:
; CHECK-NEXT: br label [[BB_2:%.*]]
; CHECK: bb_2:
; CHECK-NEXT: [[PTR_I64_16_0:%.*]] = phi i64 [ -1317805584074026212, [[ENTRY_1:%.*]] ], [ -158622699357888703, [[BB_2]] ]
; CHECK-NEXT: switch i64 [[PTR_I64_16_0]], label [[BB_2]] [
; CHECK-NEXT: ]
;
entry_1:
br label %bb_2

bb_2: ; preds = %bb_2, %entry_1
%ptr_i64_16.0 = phi i64 [ -1317805584074026212, %entry_1 ], [ -158622699357888703, %bb_2 ]
switch i64 %ptr_i64_16.0, label %bb_2 [
]
}