From: Amara Emerson Date: Tue, 29 Jan 2019 21:19:33 +0000 (+0000) Subject: [AArch64][GlobalISel] Unmerge into scalars from a vector should use FPR bank. X-Git-Tag: llvmorg-10-init~13357 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=102c9ed768d534189bb51b53212dbba7eee9e412;p=platform%2Fupstream%2Fllvm.git [AArch64][GlobalISel] Unmerge into scalars from a vector should use FPR bank. This currently shows up as a selection fallback since the dest regs were given GPR banks but the source was a vector FPR reg. Differential Revision: https://reviews.llvm.org/D57408 llvm-svn: 352545 --- diff --git a/llvm/lib/Target/AArch64/AArch64RegisterBankInfo.cpp b/llvm/lib/Target/AArch64/AArch64RegisterBankInfo.cpp index bbf4e4e..23d7e18 100644 --- a/llvm/lib/Target/AArch64/AArch64RegisterBankInfo.cpp +++ b/llvm/lib/Target/AArch64/AArch64RegisterBankInfo.cpp @@ -669,7 +669,11 @@ AArch64RegisterBankInfo::getInstrMapping(const MachineInstr &MI) const { &AArch64::FPRRegBank; }; - if (any_of(MRI.use_instructions(MI.getOperand(0).getReg()), + LLT SrcTy = MRI.getType(MI.getOperand(MI.getNumOperands()-1).getReg()); + // UNMERGE into scalars from a vector should always use FPR. + // Likewise if any of the uses are FP instructions. + if (SrcTy.isVector() || + any_of(MRI.use_instructions(MI.getOperand(0).getReg()), [&](MachineInstr &MI) { return HasFPConstraints(MI); })) { // Set the register bank of every operand to FPR. for (unsigned Idx = 0, NumOperands = MI.getNumOperands(); diff --git a/llvm/test/CodeGen/AArch64/GlobalISel/regbankselect-unmerge-vec.mir b/llvm/test/CodeGen/AArch64/GlobalISel/regbankselect-unmerge-vec.mir new file mode 100644 index 0000000..3123de2 --- /dev/null +++ b/llvm/test/CodeGen/AArch64/GlobalISel/regbankselect-unmerge-vec.mir @@ -0,0 +1,26 @@ +# NOTE: Assertions have been autogenerated by utils/update_mir_test_checks.py +# RUN: llc -O0 -mtriple arm64-- -run-pass=regbankselect -verify-machineinstrs %s -o - | FileCheck %s +--- +name: unmerge +alignment: 2 +legalized: true +tracksRegLiveness: true +frameInfo: + maxCallFrameSize: 0 +body: | + bb.0: + liveins: $q0 + + ; Ensure that the dest regs have FPR since we're unmerging from a vector + ; CHECK-LABEL: name: unmerge + ; CHECK: liveins: $q0 + ; CHECK: [[COPY:%[0-9]+]]:fpr(<2 x s64>) = COPY $q0 + ; CHECK: [[UV:%[0-9]+]]:fpr(s64), [[UV1:%[0-9]+]]:fpr(s64) = G_UNMERGE_VALUES [[COPY]](<2 x s64>) + ; CHECK: $x0 = COPY [[UV]](s64) + ; CHECK: RET_ReallyLR implicit $x0 + %0:_(<2 x s64>) = COPY $q0 + %1:_(s64), %2:_(s64) = G_UNMERGE_VALUES %0(<2 x s64>) + $x0 = COPY %1(s64) + RET_ReallyLR implicit $x0 + +...