diff --git a/llvm/lib/Target/AVR/AVRInstrInfo.td b/llvm/lib/Target/AVR/AVRInstrInfo.td index 792aff828c031..da5e20e4e2859 100644 --- a/llvm/lib/Target/AVR/AVRInstrInfo.td +++ b/llvm/lib/Target/AVR/AVRInstrInfo.td @@ -1750,10 +1750,10 @@ def : Pat<(AVRcall(i16 tglobaladdr:$dst)), (RCALLk tglobaladdr:$dst)>; def : Pat<(AVRcall(i16 texternalsym:$dst)), (RCALLk texternalsym:$dst)>; // `anyext` -def : Pat<(i16(anyext i8 - : $src)), - (INSERT_SUBREG(i16(IMPLICIT_DEF)), i8 - : $src, sub_lo)>; +// FIMXE: Using INSERT_SUBREG is more efficient, but leads to issue #132203. +def : Pat<(i16(anyext i8:$src)), +// (INSERT_SUBREG(i16(IMPLICIT_DEF)), i8:$src, sub_lo)>; + (ZEXT i8:$src)>; // `trunc` def : Pat<(i8(trunc i16 : $src)), (EXTRACT_SUBREG i16 : $src, sub_lo)>; diff --git a/llvm/test/CodeGen/AVR/hardware-mul.ll b/llvm/test/CodeGen/AVR/hardware-mul.ll index edfdc7e64e8f5..c675d7dd539d8 100644 --- a/llvm/test/CodeGen/AVR/hardware-mul.ll +++ b/llvm/test/CodeGen/AVR/hardware-mul.ll @@ -21,19 +21,22 @@ define i16 @mult16(i16 %a, i16 %b) { ; CHECK-NEXT: mov r25, r0 ; CHECK-NEXT: clr r1 ; CHECK-NEXT: mul r22, r24 -; CHECK-NEXT: mov r20, r0 -; CHECK-NEXT: mov r18, r1 +; CHECK-NEXT: mov r18, r0 +; CHECK-NEXT: mov r19, r1 ; CHECK-NEXT: clr r1 -; CHECK-NEXT: add r18, r25 +; CHECK-NEXT: add r19, r25 ; CHECK-NEXT: muls r23, r24 ; CHECK-NEXT: clr r1 -; CHECK-NEXT: add r18, r0 -; CHECK-NEXT: mov r19, r18 -; CHECK-NEXT: clr r18 -; CHECK-NEXT: mov r24, r20 +; CHECK-NEXT: mov r24, r0 +; CHECK-NEXT: add r24, r19 +; CHECK-NEXT: mov r20, r24 +; CHECK-NEXT: clr r21 +; CHECK-NEXT: mov r21, r20 +; CHECK-NEXT: clr r20 +; CHECK-NEXT: mov r24, r18 ; CHECK-NEXT: clr r25 -; CHECK-NEXT: or r24, r18 -; CHECK-NEXT: or r25, r19 +; CHECK-NEXT: or r24, r20 +; CHECK-NEXT: or r25, r21 ; CHECK-NEXT: ret %mul = mul nsw i16 %b, %a ret i16 %mul diff --git a/llvm/test/CodeGen/AVR/inline-asm/inline-asm3.ll b/llvm/test/CodeGen/AVR/inline-asm/inline-asm3.ll index 07839a43331f0..86e75d9f9ac37 100644 --- a/llvm/test/CodeGen/AVR/inline-asm/inline-asm3.ll +++ b/llvm/test/CodeGen/AVR/inline-asm/inline-asm3.ll @@ -184,7 +184,10 @@ define void @add_b_i8(i8 signext %0, i8 signext %1) { ; CHECK: ; %bb.0: ; CHECK-NEXT: mov r20, r22 ; CHECK-NEXT: mov r22, r24 -; CHECK-NEXT: mov r30, r22 +; CHECK-NEXT: mov r24, r22 +; CHECK-NEXT: clr r25 +; CHECK-NEXT: mov r30, r24 +; CHECK-NEXT: mov r31, r25 ; CHECK-NEXT: ;APP ; CHECK-NEXT: mov r30, r30 ; CHECK-NEXT: add r30, r20 @@ -224,14 +227,16 @@ define void @add_b_i16(i16 signext %0, i16 signext %1) { define void @add_e_i8(i8 signext %0, i8 signext %1) { ; CHECK-LABEL: add_e_i8: ; CHECK: ; %bb.0: -; CHECK-NEXT: mov r30, r22 +; CHECK-NEXT: mov r20, r22 ; CHECK-NEXT: mov r22, r24 ; CHECK-NEXT: mov r26, r22 +; CHECK-NEXT: clr r27 +; CHECK-NEXT: mov r30, r20 +; CHECK-NEXT: clr r31 ; CHECK-NEXT: ;APP ; CHECK-NEXT: mov r26, r26 ; CHECK-NEXT: add r26, r30 ; CHECK-NEXT: ;NO_APP -; CHECK-NEXT: mov r20, r30 ; CHECK-NEXT: mov r24, r26 ; CHECK-NEXT: rcall foo8 ; CHECK-NEXT: ret @@ -286,14 +291,16 @@ define void @add_t_i8(i8 signext %0, i8 signext %1) { define void @add_w_i8(i8 signext %0, i8 signext %1) { ; CHECK-LABEL: add_w_i8: ; CHECK: ; %bb.0: -; CHECK-NEXT: mov r26, r22 -; CHECK-NEXT: mov r30, r24 +; CHECK-NEXT: mov r20, r22 +; CHECK-NEXT: mov r22, r24 +; CHECK-NEXT: mov r24, r22 +; CHECK-NEXT: clr r25 +; CHECK-NEXT: mov r30, r20 +; CHECK-NEXT: clr r31 ; CHECK-NEXT: ;APP -; CHECK-NEXT: mov r24, r30 -; CHECK-NEXT: add r24, r26 +; CHECK-NEXT: mov r24, r24 +; CHECK-NEXT: add r24, r30 ; CHECK-NEXT: ;NO_APP -; CHECK-NEXT: mov r22, r30 -; CHECK-NEXT: mov r20, r26 ; CHECK-NEXT: rcall foo8 ; CHECK-NEXT: ret %3 = tail call i8 asm sideeffect "mov $0, $1\0Aadd $0, $2", "=w,w,w"(i8 %0, i8 %1) @@ -333,9 +340,9 @@ define void @add_xyz_i8(i8 signext %0, i8 signext %1) { ; CHECK-NEXT: mov r20, r22 ; CHECK-NEXT: mov r22, r24 ; CHECK-NEXT: mov r28, r22 -; CHECK-NEXT: mov r29, r23 +; CHECK-NEXT: clr r29 ; CHECK-NEXT: mov r26, r20 -; CHECK-NEXT: mov r27, r21 +; CHECK-NEXT: clr r27 ; CHECK-NEXT: ;APP ; CHECK-NEXT: mov r30, r28 ; CHECK-NEXT: add r30, r26 diff --git a/llvm/test/CodeGen/AVR/issue-132203.ll b/llvm/test/CodeGen/AVR/issue-132203.ll new file mode 100644 index 0000000000000..4576a580185ff --- /dev/null +++ b/llvm/test/CodeGen/AVR/issue-132203.ll @@ -0,0 +1,66 @@ +; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py UTC_ARGS: --version 5 +; RUN: llc < %s -mtriple=avr -mattr=+movw | FileCheck %s --check-prefix=MOVW +; RUN: llc < %s -mtriple=avr -mattr=-movw | FileCheck %s --check-prefix=NOMOVW + +define i16 @food(ptr %this) { +; MOVW-LABEL: food: +; MOVW: ; %bb.0: ; %entry +; MOVW-NEXT: movw r30, r24 +; MOVW-NEXT: ldd r24, Z+25 +; MOVW-NEXT: clr r25 +; MOVW-NEXT: ldd r18, Z+26 +; MOVW-NEXT: clr r19 +; MOVW-NEXT: sub r24, r18 +; MOVW-NEXT: sbc r25, r19 +; MOVW-NEXT: andi r24, 63 +; MOVW-NEXT: andi r25, 0 +; MOVW-NEXT: ret +; +; NOMOVW-LABEL: food: +; NOMOVW: ; %bb.0: ; %entry +; NOMOVW-NEXT: mov r30, r24 +; NOMOVW-NEXT: mov r31, r25 +; NOMOVW-NEXT: ldd r24, Z+25 +; NOMOVW-NEXT: clr r25 +; NOMOVW-NEXT: ldd r18, Z+26 +; NOMOVW-NEXT: clr r19 +; NOMOVW-NEXT: sub r24, r18 +; NOMOVW-NEXT: sbc r25, r19 +; NOMOVW-NEXT: andi r24, 63 +; NOMOVW-NEXT: andi r25, 0 +; NOMOVW-NEXT: ret +entry: + %_rx_buffer_head = getelementptr inbounds nuw i8, ptr %this, i16 25 + %0 = load volatile i8, ptr %_rx_buffer_head + %conv = zext i8 %0 to i16 + %_rx_buffer_tail = getelementptr inbounds nuw i8, ptr %this, i16 26 + %1 = load volatile i8, ptr %_rx_buffer_tail + %conv2 = zext i8 %1 to i16 + %sub = sub nsw i16 %conv, %conv2 + %rem = and i16 %sub, 63 + ret i16 %rem +} + +define i16 @fooe(i8 %a) { +; MOVW-LABEL: fooe: +; MOVW: ; %bb.0: +; MOVW-NEXT: clr r25 +; MOVW-NEXT: subi r24, 0 +; MOVW-NEXT: sbci r25, 1 +; MOVW-NEXT: andi r24, 1 +; MOVW-NEXT: andi r25, 0 +; MOVW-NEXT: ret +; +; NOMOVW-LABEL: fooe: +; NOMOVW: ; %bb.0: +; NOMOVW-NEXT: clr r25 +; NOMOVW-NEXT: subi r24, 0 +; NOMOVW-NEXT: sbci r25, 1 +; NOMOVW-NEXT: andi r24, 1 +; NOMOVW-NEXT: andi r25, 0 +; NOMOVW-NEXT: ret + %1 = zext i8 %a to i16 + %2 = sub i16 %1, 256 + %3 = and i16 %2, 1 + ret i16 %3 +}