[llvm] 90b60f9 - [AArch64] Fix crash for expandMOVImm

[via llvm-commits]

Author: zhongyunde
Date: 2023-01-28T09:26:02+08:00
New Revision: 90b60f9cd6eacfd16ac1c475aa9050e223513981

URL: https://github.com/llvm/llvm-project/commit/90b60f9cd6eacfd16ac1c475aa9050e223513981
DIFF: https://github.com/llvm/llvm-project/commit/90b60f9cd6eacfd16ac1c475aa9050e223513981.diff

LOG: [AArch64] Fix crash for expandMOVImm

Fix https://github.com/llvm/llvm-project/issues/59892

Reviewed By: efriedma

Differential Revision: https://reviews.llvm.org/D141258

Added: 
    llvm/test/CodeGen/AArch64/const-isel.ll

Modified: 
    llvm/lib/Target/AArch64/AArch64ISelLowering.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
index 5afa4fbf9288d..ff4f36873604d 100644
--- a/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
+++ b/llvm/lib/Target/AArch64/AArch64ISelLowering.cpp
@@ -9773,8 +9773,7 @@ bool AArch64TargetLowering::isFPImmLegal(const APFloat &Imm, EVT VT,
     // movw+movk+fmov vs. adrp+ldr (it's one instruction longer, but the
     // movw+movk is fused). So we limit up to 2 instrdduction at most.
     SmallVector<AArch64_IMM::ImmInsnModel, 4> Insn;
-    AArch64_IMM::expandMOVImm(ImmInt.getZExtValue(), VT.getSizeInBits(),
-			      Insn);
+    AArch64_IMM::expandMOVImm(ImmInt.getZExtValue(), VT.getSizeInBits(), Insn);
     unsigned Limit = (OptForSize ? 1 : (Subtarget->hasFuseLiterals() ? 5 : 2));
     IsLegal = Insn.size() <= Limit;
   }
@@ -14819,7 +14818,9 @@ bool AArch64TargetLowering::isMulAddWithConstProfitable(
   if (!isLegalAddImmediate(C1) || isLegalAddImmediate(C1C2.getSExtValue()))
     return true;
   SmallVector<AArch64_IMM::ImmInsnModel, 4> Insn;
-  AArch64_IMM::expandMOVImm(C1C2.getZExtValue(), VT.getSizeInBits(), Insn);
+  // Adapt to the width of a register.
+  unsigned BitSize = VT.getSizeInBits() <= 32 ? 32 : 64;
+  AArch64_IMM::expandMOVImm(C1C2.getZExtValue(), BitSize, Insn);
   if (Insn.size() > 1)
     return false;
 

diff  --git a/llvm/test/CodeGen/AArch64/const-isel.ll b/llvm/test/CodeGen/AArch64/const-isel.ll
new file mode 100644
index 0000000000000..adf3c5b329227
--- /dev/null
+++ b/llvm/test/CodeGen/AArch64/const-isel.ll
@@ -0,0 +1,16 @@
+; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
+; RUN: llc -mtriple=aarch64-none-linux-gnu -fast-isel -verify-machineinstrs < %s | FileCheck %s --check-prefix=FISEL
+
+define i53 @PR59892 () {
+; FISEL-LABEL: PR59892:
+; FISEL:       // %bb.0:
+; FISEL-NEXT:    mov x8, #47668
+; FISEL-NEXT:    movk x8, #4645, lsl #16
+; FISEL-NEXT:    movk x8, #58741, lsl #32
+; FISEL-NEXT:    movk x8, #1, lsl #48
+; FISEL-NEXT:    orr x9, x8, #0x2
+; FISEL-NEXT:    mul x0, x9, x8
+; FISEL-NEXT:    ret
+  %a = mul nsw i53 533765955107380, 533765955107382
+  ret i53 %a
+}