Skip to content

Commit d85073e

Browse files
LucasSteLucasSte
committed
[SOL] Run simplifyswitch pass for SBF (#153)
1 parent 3947707 commit d85073e

File tree

4 files changed

+121
-1
lines changed

4 files changed

+121
-1
lines changed

‎llvm/lib/Target/SBF/SBFTargetMachine.cpp

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,9 @@ void SBFTargetMachine::registerPassBuilderCallbacks(PassBuilder &PB) {
118118
});
119119
PB.registerPeepholeEPCallback([=](FunctionPassManager &FPM,
120120
OptimizationLevel Level) {
121-
FPM.addPass(SimplifyCFGPass(SimplifyCFGOptions().hoistCommonInsts(true)));
121+
FPM.addPass(SimplifyCFGPass(
122+
SimplifyCFGOptions().hoistCommonInsts(true).convertSwitchToLookupTable(
123+
true)));
122124
});
123125
}
124126

‎llvm/lib/Target/SBF/SBFTargetTransformInfo.h

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,16 @@ class SBFTTIImpl : public BasicTTIImplBase<SBFTTIImpl> {
4444
return TTI::TCC_Basic;
4545
}
4646

47+
bool shouldBuildLookupTables() const {
48+
return true;
49+
}
50+
51+
bool shouldBuildRelLookupTables() const {
52+
// Relational lookup tables are not working for SBF, since the offset
53+
// calculation is not implemented.
54+
return false;
55+
}
56+
4757
InstructionCost getCmpSelInstrCost(unsigned Opcode, Type *ValTy, Type *CondTy,
4858
CmpInst::Predicate VecPred,
4959
TTI::TargetCostKind CostKind,

‎llvm/test/CodeGen/SBF/simplify_switch.ll

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,60 @@
1+
; RUN: opt -march=sbf -O2 -S < %s | FileCheck %s
2+
3+
target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128"
4+
5+
@alloc_a095982df5ef6fa38482490385e9df9c = private unnamed_addr constant <{ [11 x i8] }> <{ [11 x i8] c"Invalid num" }>, align 1
6+
@alloc_a85d045283da191190505c6c52c35e47 = private unnamed_addr constant <{ ptr, [8 x i8] }> <{ ptr @alloc_a095982df5ef6fa38482490385e9df9c, [8 x i8] c"\0B\00\00\00\00\00\00\00" }>, align 8
7+
@alloc_f5ffd2fd1476bab43ad89fb40c72d0c5 = private unnamed_addr constant <{ [10 x i8] }> <{ [10 x i8] c"src/lib.rs" }>, align 1
8+
@alloc_2c31b023ec05614e5709d58aa57c990b = private unnamed_addr constant <{ ptr, [16 x i8] }> <{ ptr @alloc_f5ffd2fd1476bab43ad89fb40c72d0c5, [16 x i8] c"\0A\00\00\00\00\00\00\00\0E\00\00\00\12\00\00\00" }>, align 8
9+
10+
@do_that = unnamed_addr alias i8 (i64), ptr @"_ZN68_$LT$rust_test..MyEnum$u20$as$u20$core..convert..From$LT$u64$GT$$GT$4from17hd15e70d09a9b53c5E"
11+
12+
; <rust_test::MyEnum as core::convert::From<u64>>::from
13+
; Function Attrs: nounwind
14+
define hidden noundef range(i8 0, 3) i8 @"_ZN68_$LT$rust_test..MyEnum$u20$as$u20$core..convert..From$LT$u64$GT$$GT$4from17hd15e70d09a9b53c5E"(i64 noundef %num) unnamed_addr {
15+
start:
16+
%_3 = alloca [48 x i8], align 8
17+
switch i64 %num, label %bb1 [
18+
i64 1, label %bb5
19+
i64 2, label %bb3
20+
i64 3, label %bb2
21+
]
22+
23+
; Verifies we are simplifying the switch. In this case, we should expect the index to be '%num - 1'
24+
; CHECK-NOT: switch i64 %num
25+
; CHECK: %switch.tableidx = add i64 %num, -1
26+
; CHECK: %0 = icmp ult i64 %switch.tableidx, 3
27+
; CHECK: br i1 %0, label %switch.lookup, label %bb1
28+
29+
bb1: ; preds = %start
30+
call void @llvm.lifetime.start.p0(i64 48, ptr nonnull %_3)
31+
store ptr @alloc_a85d045283da191190505c6c52c35e47, ptr %_3, align 8
32+
%0 = getelementptr inbounds i8, ptr %_3, i64 8
33+
store i64 1, ptr %0, align 8
34+
%1 = getelementptr inbounds i8, ptr %_3, i64 32
35+
store ptr null, ptr %1, align 8
36+
%2 = getelementptr inbounds i8, ptr %_3, i64 16
37+
store ptr inttoptr (i64 8 to ptr), ptr %2, align 8
38+
%3 = getelementptr inbounds i8, ptr %_3, i64 24
39+
store i64 0, ptr %3, align 8
40+
; call core::panicking::panic_fmt
41+
call void @_ZN4core9panicking9panic_fmt17ha4a6c4ba8141afc1E(ptr noalias nocapture noundef nonnull readonly align 8 dereferenceable(48) %_3, ptr noalias noundef nonnull readonly align 8 dereferenceable(24) @alloc_2c31b023ec05614e5709d58aa57c990b)
42+
unreachable
43+
44+
bb3: ; preds = %start
45+
br label %bb5
46+
47+
bb2: ; preds = %start
48+
br label %bb5
49+
50+
bb5: ; preds = %start, %bb2, %bb3
51+
%_0.sroa.0.0 = phi i8 [ 2, %bb2 ], [ 1, %bb3 ], [ 0, %start ]
52+
ret i8 %_0.sroa.0.0
53+
}
54+
55+
; core::panicking::panic_fmt
56+
; Function Attrs: cold noinline noreturn nounwind
57+
declare void @_ZN4core9panicking9panic_fmt17ha4a6c4ba8141afc1E(ptr noalias nocapture noundef readonly align 8 dereferenceable(48), ptr noalias noundef readonly align 8 dereferenceable(24)) unnamed_addr
58+
59+
; Function Attrs: mustprogress nocallback nofree nosync nounwind willreturn memory(argmem: readwrite)
60+
declare void @llvm.lifetime.start.p0(i64 immarg, ptr nocapture)

‎llvm/test/CodeGen/SBF/simplify_switch_2.ll

Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
; RUN: opt -O2 -S < %s | FileCheck %s
2+
3+
; ModuleID = 'rust_test.ae01a02caa2566bf-cgu.0'
4+
source_filename = "rust_test.ae01a02caa2566bf-cgu.0"
5+
target datalayout = "e-m:e-p:64:64-i64:64-n32:64-S128"
6+
target triple = "sbf"
7+
8+
@alloc_e813fda33c33e38665803c55f01a1a57 = private unnamed_addr constant <{ [3 x i8] }> <{ [3 x i8] c"One" }>, align 1
9+
@alloc_da1d77dfe6c47b0702ad778dd22ebff8 = private unnamed_addr constant <{ [3 x i8] }> <{ [3 x i8] c"Two" }>, align 1
10+
@alloc_460442126579dd15a4cc4f66a722a171 = private unnamed_addr constant <{ [5 x i8] }> <{ [5 x i8] c"Three" }>, align 1
11+
12+
; We do not want the relative lookup table to be here
13+
; CHECK-NOT: private unnamed_addr constant [3 x i32] [i32 trunc (i64 sub (i64 ptrtoint
14+
; CHECK: private unnamed_addr constant [3 x ptr]
15+
16+
; Function Attrs: mustprogress nofree norecurse nosync nounwind willreturn memory(none)
17+
define { ptr, i64 } @do_this(i8 noundef range(i8 0, 3) %0) unnamed_addr #0 {
18+
start:
19+
switch i8 %0, label %default.unreachable [
20+
i8 0, label %bb1
21+
i8 1, label %bb4
22+
i8 2, label %bb3
23+
]
24+
25+
default.unreachable: ; preds = %start
26+
unreachable
27+
28+
bb4: ; preds = %start
29+
br label %bb1
30+
31+
bb3: ; preds = %start
32+
br label %bb1
33+
34+
bb1: ; preds = %start, %bb3, %bb4
35+
%_0.sroa.0.0 = phi ptr [ @alloc_460442126579dd15a4cc4f66a722a171, %bb3 ], [ @alloc_da1d77dfe6c47b0702ad778dd22ebff8, %bb4 ], [ @alloc_e813fda33c33e38665803c55f01a1a57, %start ]
36+
%_0.sroa.4.0 = phi i64 [ 5, %bb3 ], [ 3, %bb4 ], [ 3, %start ]
37+
%1 = insertvalue { ptr, i64 } poison, ptr %_0.sroa.0.0, 0
38+
%2 = insertvalue { ptr, i64 } %1, i64 %_0.sroa.4.0, 1
39+
ret { ptr, i64 } %2
40+
}
41+
42+
attributes #0 = { mustprogress nofree norecurse nosync nounwind willreturn memory(none) "target-cpu"="generic" "target-features"="+store-imm,+jmp-ext" }
43+
44+
!llvm.module.flags = !{!0}
45+
!llvm.ident = !{!1}
46+
47+
!0 = !{i32 8, !"PIC Level", i32 2}
48+
!1 = !{!"rustc version 1.84.1-dev"}

0 commit comments

Comments
 (0)