Skip to content

Commit 78266ab

Browse files
[ArgPromotion] Remove redundant logic from recursive argpromotion code (llvm#98657)
This patch further cleans up the implementation by removing some redundant checks and replacing cast<> with get() calls. This contribution is based on the discussion in llvm#78735
1 parent 57ae618 commit 78266ab

File tree

2 files changed

+71
-3
lines changed

2 files changed

+71
-3
lines changed

llvm/lib/Transforms/IPO/ArgumentPromotion.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -640,16 +640,16 @@ static bool findArgParts(Argument *Arg, const DataLayout &DL, AAResults &AAR,
640640
}
641641

642642
auto *CB = dyn_cast<CallBase>(V);
643-
Value *PtrArg = cast<Value>(U);
644-
if (CB && PtrArg && CB->getCalledFunction() == CB->getFunction()) {
643+
Value *PtrArg = U->get();
644+
if (CB && CB->getCalledFunction() == CB->getFunction()) {
645645
if (PtrArg != Arg) {
646646
LLVM_DEBUG(dbgs() << "ArgPromotion of " << *Arg << " failed: "
647647
<< "pointer offset is not equal to zero\n");
648648
return false;
649649
}
650650

651651
unsigned int ArgNo = Arg->getArgNo();
652-
if (CB->getArgOperand(ArgNo) != Arg || U->getOperandNo() != ArgNo) {
652+
if (U->getOperandNo() != ArgNo) {
653653
LLVM_DEBUG(dbgs() << "ArgPromotion of " << *Arg << " failed: "
654654
<< "arg position is different in callee\n");
655655
return false;
Lines changed: 68 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
; NOTE: Assertions have been autogenerated by utils/update_test_checks.py UTC_ARGS: --version 5
2+
; RUN: opt -S -passes=argpromotion < %s | FileCheck %s
3+
define internal i32 @foo(ptr %x, i32 %n, i32 %m) {
4+
; CHECK-LABEL: define internal i32 @foo(
5+
; CHECK-SAME: ptr [[X:%.*]], i32 [[N:%.*]], i32 [[M:%.*]]) {
6+
; CHECK-NEXT: [[ENTRY:.*:]]
7+
; CHECK-NEXT: [[CMP:%.*]] = icmp ne i32 [[N]], 0
8+
; CHECK-NEXT: br i1 [[CMP]], label %[[COND_TRUE:.*]], label %[[COND_FALSE:.*]]
9+
; CHECK: [[COND_TRUE]]:
10+
; CHECK-NEXT: [[VAL:%.*]] = load i32, ptr [[X]], align 4
11+
; CHECK-NEXT: br label %[[RETURN:.*]]
12+
; CHECK: [[COND_FALSE]]:
13+
; CHECK-NEXT: [[VAL2:%.*]] = load i32, ptr [[X]], align 4
14+
; CHECK-NEXT: [[SUBVAL:%.*]] = sub i32 [[N]], 1
15+
; CHECK-NEXT: [[CALLRET0:%.*]] = call float @foo(ptr [[X]], i32 [[SUBVAL]], i32 [[VAL2]])
16+
; CHECK-NEXT: [[CALLRET1:%.*]] = call i32 @foo(ptr [[X]], i32 [[SUBVAL]], i32 [[VAL2]])
17+
; CHECK-NEXT: [[SUBVAL2:%.*]] = sub i32 [[N]], 2
18+
; CHECK-NEXT: [[CALLRET2:%.*]] = call i32 @foo(ptr [[X]], i32 [[SUBVAL2]], i32 [[M]])
19+
; CHECK-NEXT: [[CMP2:%.*]] = add i32 [[CALLRET1]], [[CALLRET2]]
20+
; CHECK-NEXT: br label %[[RETURN]]
21+
; CHECK: [[COND_NEXT:.*]]:
22+
; CHECK-NEXT: br label %[[RETURN]]
23+
; CHECK: [[RETURN]]:
24+
; CHECK-NEXT: [[RETVAL_0:%.*]] = phi i32 [ [[VAL]], %[[COND_TRUE]] ], [ [[CMP2]], %[[COND_FALSE]] ], [ poison, %[[COND_NEXT]] ]
25+
; CHECK-NEXT: ret i32 [[RETVAL_0]]
26+
;
27+
entry:
28+
%cmp = icmp ne i32 %n, 0
29+
br i1 %cmp, label %cond_true, label %cond_false
30+
31+
cond_true: ; preds = %entry
32+
%val = load i32, ptr %x, align 4
33+
br label %return
34+
35+
cond_false: ; preds = %entry
36+
%val2 = load i32, ptr %x, align 4
37+
%subval = sub i32 %n, 1
38+
%callret0 = call float @foo(ptr %x, i32 %subval, i32 %val2)
39+
%callret1 = call i32 @foo(ptr %x, i32 %subval, i32 %val2)
40+
%subval2 = sub i32 %n, 2
41+
%callret2 = call i32 @foo(ptr %x, i32 %subval2, i32 %m)
42+
%cmp2 = add i32 %callret1, %callret2
43+
br label %return
44+
45+
cond_next: ; No predecessors!
46+
br label %return
47+
48+
return: ; preds = %cond_next, %cond_false, %cond_true
49+
%retval.0 = phi i32 [ %val, %cond_true ], [ %cmp2, %cond_false ], [ poison, %cond_next ]
50+
ret i32 %retval.0
51+
}
52+
53+
define i32 @bar(ptr align(4) dereferenceable(4) %x, i32 %n, i32 %m) {
54+
; CHECK-LABEL: define i32 @bar(
55+
; CHECK-SAME: ptr align 4 dereferenceable(4) [[X:%.*]], i32 [[N:%.*]], i32 [[M:%.*]]) {
56+
; CHECK-NEXT: [[ENTRY:.*:]]
57+
; CHECK-NEXT: [[CALLRET3:%.*]] = call i32 @foo(ptr [[X]], i32 [[N]], i32 [[M]])
58+
; CHECK-NEXT: br label %[[RETURN:.*]]
59+
; CHECK: [[RETURN]]:
60+
; CHECK-NEXT: ret i32 [[CALLRET3]]
61+
;
62+
entry:
63+
%callret3 = call i32 @foo(ptr %x, i32 %n, i32 %m)
64+
br label %return
65+
66+
return: ; preds = %entry
67+
ret i32 %callret3
68+
}

0 commit comments

Comments
 (0)