Skip to content

Commit f21f1ba

Browse files
committed
[ARM] Allow usubo and uaddo to happen for any legal type
1 parent 30e323b commit f21f1ba

File tree

4 files changed

+38
-55
lines changed

4 files changed

+38
-55
lines changed

llvm/lib/Target/ARM/ARMISelLowering.h

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -641,8 +641,9 @@ class VectorType;
641641

642642
bool shouldFormOverflowOp(unsigned Opcode, EVT VT,
643643
bool MathUsed) const override {
644-
// Using overflow ops for overflow checks only should beneficial on ARM.
645-
return TargetLowering::shouldFormOverflowOp(Opcode, VT, true);
644+
if (VT.isVector())
645+
return false;
646+
return !isOperationExpand(Opcode, VT);
646647
}
647648

648649
bool shouldReassociateReduction(unsigned Opc, EVT VT) const override {

llvm/test/CodeGen/ARM/atomicrmw-uinc-udec-wrap.ll

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -147,11 +147,11 @@ define i32 @atomicrmw_udec_wrap_i32(ptr %ptr, i32 %val) {
147147
; CHECK-NEXT: .LBB6_1: @ %atomicrmw.start
148148
; CHECK-NEXT: @ =>This Inner Loop Header: Depth=1
149149
; CHECK-NEXT: ldrex r12, [r0]
150-
; CHECK-NEXT: mov r3, r1
151150
; CHECK-NEXT: cmp r12, r1
152-
; CHECK-NEXT: subls r3, r12, #1
153-
; CHECK-NEXT: cmp r12, #0
154-
; CHECK-NEXT: moveq r3, r1
151+
; CHECK-NEXT: sub r3, r12, #1
152+
; CHECK-NEXT: movhi r3, r1
153+
; CHECK-NEXT: cmp r12, #1
154+
; CHECK-NEXT: movlo r3, r1
155155
; CHECK-NEXT: strex r2, r3, [r0]
156156
; CHECK-NEXT: cmp r2, #0
157157
; CHECK-NEXT: bne .LBB6_1

llvm/test/CodeGen/ARM/select_const.ll

Lines changed: 18 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -763,46 +763,35 @@ define i64 @opaque_constant2(i1 %cond, i64 %x) {
763763
define i64 @func(i64 %arg) {
764764
; ARM-LABEL: func:
765765
; ARM: @ %bb.0: @ %entry
766-
; ARM-NEXT: adds r0, r0, #1
767-
; ARM-NEXT: mov r2, #0
768-
; ARM-NEXT: adcs r0, r1, #0
766+
; ARM-NEXT: and r0, r0, r1
769767
; ARM-NEXT: mov r1, #0
770-
; ARM-NEXT: adcs r0, r2, #0
771-
; ARM-NEXT: movne r0, #8
768+
; ARM-NEXT: cmn r0, #1
769+
; ARM-NEXT: mov r0, #0
770+
; ARM-NEXT: moveq r0, #8
772771
; ARM-NEXT: mov pc, lr
773772
;
774773
; THUMB2-LABEL: func:
775774
; THUMB2: @ %bb.0: @ %entry
775+
; THUMB2-NEXT: ands r0, r1
776+
; THUMB2-NEXT: movs r1, #0
776777
; THUMB2-NEXT: adds r0, #1
777-
; THUMB2-NEXT: mov.w r2, #0
778-
; THUMB2-NEXT: adcs r0, r1, #0
779-
; THUMB2-NEXT: mov.w r1, #0
780-
; THUMB2-NEXT: adcs r0, r2, #0
781-
; THUMB2-NEXT: it ne
782-
; THUMB2-NEXT: movne r0, #8
778+
; THUMB2-NEXT: mov.w r0, #0
779+
; THUMB2-NEXT: it eq
780+
; THUMB2-NEXT: moveq r0, #8
783781
; THUMB2-NEXT: bx lr
784782
;
785783
; THUMB-LABEL: func:
786784
; THUMB: @ %bb.0: @ %entry
787-
; THUMB-NEXT: .save {r4, lr}
788-
; THUMB-NEXT: push {r4, lr}
789-
; THUMB-NEXT: movs r2, #0
790-
; THUMB-NEXT: adds r3, r0, #1
791-
; THUMB-NEXT: mov r12, r1
792-
; THUMB-NEXT: mov r3, r12
793-
; THUMB-NEXT: adcs r3, r2
794-
; THUMB-NEXT: mov r12, r2
795-
; THUMB-NEXT: mov r3, r12
796-
; THUMB-NEXT: adcs r3, r2
797-
; THUMB-NEXT: subs r4, r3, #1
785+
; THUMB-NEXT: ands r0, r1
786+
; THUMB-NEXT: movs r1, #0
798787
; THUMB-NEXT: adds r0, r0, #1
799-
; THUMB-NEXT: adcs r1, r2
800-
; THUMB-NEXT: sbcs r3, r4
801-
; THUMB-NEXT: lsls r0, r3, #3
802-
; THUMB-NEXT: movs r1, r2
803-
; THUMB-NEXT: pop {r4}
804-
; THUMB-NEXT: pop {r2}
805-
; THUMB-NEXT: bx r2
788+
; THUMB-NEXT: beq .LBB26_2
789+
; THUMB-NEXT: @ %bb.1: @ %entry
790+
; THUMB-NEXT: movs r0, r1
791+
; THUMB-NEXT: bx lr
792+
; THUMB-NEXT: .LBB26_2:
793+
; THUMB-NEXT: movs r0, #8
794+
; THUMB-NEXT: bx lr
806795
entry:
807796
%0 = add i64 %arg, 1
808797
%1 = icmp ult i64 %0, 1

llvm/test/CodeGen/Thumb/scheduler-clone-cpsr-def.ll

Lines changed: 13 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -11,27 +11,20 @@
1111
define i64 @f(i64 %x2, i32 %z) {
1212
; CHECK-LABEL: f:
1313
; CHECK: @ %bb.0:
14-
; CHECK-NEXT: .save {r4, r5, r7, lr}
15-
; CHECK-NEXT: push {r4, r5, r7, lr}
16-
; CHECK-NEXT: movs r2, #0
17-
; CHECK-NEXT: subs r3, r0, #1
18-
; CHECK-NEXT: mov r3, r1
19-
; CHECK-NEXT: sbcs r3, r2
20-
; CHECK-NEXT: mov r3, r2
14+
; CHECK-NEXT: .save {r4, lr}
15+
; CHECK-NEXT: push {r4, lr}
16+
; CHECK-NEXT: mov r2, r0
17+
; CHECK-NEXT: orrs r2, r1
18+
; CHECK-NEXT: rsbs r3, r2, #0
2119
; CHECK-NEXT: adcs r3, r2
22-
; CHECK-NEXT: movs r4, #30
23-
; CHECK-NEXT: subs r5, r0, #1
24-
; CHECK-NEXT: mov r5, r1
25-
; CHECK-NEXT: sbcs r5, r2
26-
; CHECK-NEXT: adcs r4, r2
27-
; CHECK-NEXT: lsls r2, r1, #1
28-
; CHECK-NEXT: lsls r2, r4
29-
; CHECK-NEXT: movs r4, #1
30-
; CHECK-NEXT: eors r4, r3
31-
; CHECK-NEXT: lsrs r0, r4
32-
; CHECK-NEXT: orrs r0, r2
33-
; CHECK-NEXT: lsrs r1, r4
34-
; CHECK-NEXT: pop {r4, r5, r7, pc}
20+
; CHECK-NEXT: lsrs r0, r3
21+
; CHECK-NEXT: movs r2, #31
22+
; CHECK-NEXT: eors r2, r3
23+
; CHECK-NEXT: lsls r4, r1, #1
24+
; CHECK-NEXT: lsls r4, r2
25+
; CHECK-NEXT: orrs r0, r4
26+
; CHECK-NEXT: lsrs r1, r3
27+
; CHECK-NEXT: pop {r4, pc}
3528
%x3 = add nsw i64 %x2, -1
3629
%x8 = icmp ne i64 %x2, 0
3730
%x9 = xor i1 %x8, true

0 commit comments

Comments
 (0)