Index: lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp =================================================================== --- lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp +++ lib/Target/AArch64/AArch64LoadStoreOptimizer.cpp @@ -41,7 +41,7 @@ STATISTIC(NumPreFolded, "Number of pre-index updates folded"); STATISTIC(NumUnscaledPairCreated, "Number of load/store from unscaled generated"); -STATISTIC(NumSmallTypeMerged, "Number of small type loads merged"); +STATISTIC(NumNarrowLdPromotion, "Number of narrow load promotions"); static cl::opt ScanLimit("aarch64-load-store-scan-limit", cl::init(20), cl::Hidden); @@ -160,6 +160,9 @@ case AArch64::LDURXi: case AArch64::LDURSWi: case AArch64::LDURHHi: + case AArch64::LDURBBi: + case AArch64::LDURSBWi: + case AArch64::LDURSHWi: return true; } } @@ -168,19 +171,40 @@ return isUnscaledLdSt(MI->getOpcode()); } -static bool isSmallTypeLdMerge(unsigned Opc) { +static unsigned getBitExtrOpcode(MachineInstr *MI) { + switch (MI->getOpcode()) { + default: + llvm_unreachable("Unexpected opcode."); + case AArch64::LDRBBui: + case AArch64::LDURBBi: + case AArch64::LDRHHui: + case AArch64::LDURHHi: + return AArch64::UBFMWri; + case AArch64::LDRSBWui: + case AArch64::LDURSBWi: + case AArch64::LDRSHWui: + case AArch64::LDURSHWi: + return AArch64::SBFMWri; + } +} + +static bool isNarrowLd(unsigned Opc) { switch (Opc) { default: return false; case AArch64::LDRHHui: case AArch64::LDURHHi: + case AArch64::LDRBBui: + case AArch64::LDURBBi: + case AArch64::LDRSHWui: + case AArch64::LDURSHWi: + case AArch64::LDRSBWui: + case AArch64::LDURSBWi: return true; - // FIXME: Add other instructions (e.g, LDRBBui, LDURSHWi, LDRSHWui, etc.). } } -static bool isSmallTypeLdMerge(MachineInstr *MI) { - return isSmallTypeLdMerge(MI->getOpcode()); -} + +static bool isNarrowLd(MachineInstr *MI) { return isNarrowLd(MI->getOpcode()); } // Scaling factor for unscaled load or store. static int getMemScale(MachineInstr *MI) { @@ -188,10 +212,15 @@ default: llvm_unreachable("Opcode has unknown scale!"); case AArch64::LDRBBui: + case AArch64::LDURBBi: + case AArch64::LDRSBWui: + case AArch64::LDURSBWi: case AArch64::STRBBui: return 1; case AArch64::LDRHHui: case AArch64::LDURHHi: + case AArch64::LDRSHWui: + case AArch64::LDURSHWi: case AArch64::STRHHui: return 2; case AArch64::LDRSui: @@ -264,11 +293,21 @@ case AArch64::LDURSi: case AArch64::LDRHHui: case AArch64::LDURHHi: + case AArch64::LDRBBui: + case AArch64::LDURBBi: return Opc; case AArch64::LDRSWui: return AArch64::LDRWui; case AArch64::LDURSWi: return AArch64::LDURWi; + case AArch64::LDRSBWui: + return AArch64::LDRBBui; + case AArch64::LDRSHWui: + return AArch64::LDRHHui; + case AArch64::LDURSBWi: + return AArch64::LDURBBi; + case AArch64::LDURSHWi: + return AArch64::LDURHHi; } } @@ -310,9 +349,17 @@ case AArch64::LDURSWi: return AArch64::LDPSWi; case AArch64::LDRHHui: + case AArch64::LDRSHWui: return AArch64::LDRWui; case AArch64::LDURHHi: + case AArch64::LDURSHWi: return AArch64::LDURWi; + case AArch64::LDRBBui: + case AArch64::LDRSBWui: + return AArch64::LDRHHui; + case AArch64::LDURBBi: + case AArch64::LDURSBWi: + return AArch64::LDURHHi; } } @@ -532,14 +579,12 @@ int OffsetImm = getLdStOffsetOp(RtMI).getImm(); - if (isSmallTypeLdMerge(Opc)) { + if (isNarrowLd(Opc)) { // Change the scaled offset from small to large type. if (!IsUnscaled) OffsetImm /= 2; MachineInstr *RtNewDest = MergeForward ? I : Paired; // Construct the new load instruction. - // FIXME: currently we support only halfword unsigned load. We need to - // handle byte type, signed, and store instructions as well. MachineInstr *NewMemMI, *BitExtMI1, *BitExtMI2; NewMemMI = BuildMI(*I->getParent(), InsertionPoint, I->getDebugLoc(), TII->get(NewOpc)) @@ -559,35 +604,61 @@ DEBUG(dbgs() << " with instructions:\n "); DEBUG((NewMemMI)->print(dbgs())); + int immsHigh = getMemScale(I) == 1 ? 15 : 31; + int immrHigh = getMemScale(I) == 1 ? 8 : 16; + int immsLow = getMemScale(I) == 1 ? 7 : 15; + MachineInstr *ExtDestMI = MergeForward ? Paired : I; if (ExtDestMI == Rt2MI) { // Create the bitfield extract for high half. BitExtMI1 = BuildMI(*I->getParent(), InsertionPoint, I->getDebugLoc(), - TII->get(AArch64::UBFMWri)) + TII->get(getBitExtrOpcode(Rt2MI))) .addOperand(getLdStRegOp(Rt2MI)) .addReg(getLdStRegOp(RtNewDest).getReg()) - .addImm(16) - .addImm(31); + .addImm(immrHigh) + .addImm(immsHigh); + // Create the bitfield extract for low half. - BitExtMI2 = BuildMI(*I->getParent(), InsertionPoint, I->getDebugLoc(), - TII->get(AArch64::ANDWri)) - .addOperand(getLdStRegOp(RtMI)) - .addReg(getLdStRegOp(RtNewDest).getReg()) - .addImm(15); + if (RtMI->getOpcode() == getMatchingNonSExtOpcode(RtMI->getOpcode())) { + // For unsigned, prefer to use AND for low bits. + BitExtMI2 = BuildMI(*I->getParent(), InsertionPoint, I->getDebugLoc(), + TII->get(AArch64::ANDWri)) + .addOperand(getLdStRegOp(RtMI)) + .addReg(getLdStRegOp(RtNewDest).getReg()) + .addImm(immsLow); + } else { + BitExtMI2 = BuildMI(*I->getParent(), InsertionPoint, I->getDebugLoc(), + TII->get(getBitExtrOpcode(RtMI))) + .addOperand(getLdStRegOp(RtMI)) + .addReg(getLdStRegOp(RtNewDest).getReg()) + .addImm(0) + .addImm(immsLow); + } } else { // Create the bitfield extract for low half. - BitExtMI1 = BuildMI(*I->getParent(), InsertionPoint, I->getDebugLoc(), - TII->get(AArch64::ANDWri)) - .addOperand(getLdStRegOp(RtMI)) - .addReg(getLdStRegOp(RtNewDest).getReg()) - .addImm(15); + if (RtMI->getOpcode() == getMatchingNonSExtOpcode(RtMI->getOpcode())) { + // For unsigned, prefer to use AND for low bits. + BitExtMI1 = BuildMI(*I->getParent(), InsertionPoint, I->getDebugLoc(), + TII->get(AArch64::ANDWri)) + .addOperand(getLdStRegOp(RtMI)) + .addReg(getLdStRegOp(RtNewDest).getReg()) + .addImm(immsLow); + } else { + BitExtMI1 = BuildMI(*I->getParent(), InsertionPoint, I->getDebugLoc(), + TII->get(getBitExtrOpcode(RtMI))) + .addOperand(getLdStRegOp(RtMI)) + .addReg(getLdStRegOp(RtNewDest).getReg()) + .addImm(0) + .addImm(immsLow); + } + // Create the bitfield extract for high half. BitExtMI2 = BuildMI(*I->getParent(), InsertionPoint, I->getDebugLoc(), - TII->get(AArch64::UBFMWri)) + TII->get(getBitExtrOpcode(Rt2MI))) .addOperand(getLdStRegOp(Rt2MI)) .addReg(getLdStRegOp(RtNewDest).getReg()) - .addImm(16) - .addImm(31); + .addImm(immrHigh) + .addImm(immsHigh); } DEBUG(dbgs() << " "); DEBUG((BitExtMI1)->print(dbgs())); @@ -760,8 +831,7 @@ // range, plus allow an extra one in case we find a later insn that matches // with Offset-1) int OffsetStride = IsUnscaled ? getMemScale(FirstMI) : 1; - if (!isSmallTypeLdMerge(Opc) && - !inBoundsForPair(IsUnscaled, Offset, OffsetStride)) + if (!isNarrowLd(Opc) && !inBoundsForPair(IsUnscaled, Offset, OffsetStride)) return E; // Track which registers have been modified and used between the first insn @@ -820,15 +890,15 @@ // If the resultant immediate offset of merging these instructions // is out of range for a pairwise instruction, bail and keep looking. bool MIIsUnscaled = isUnscaledLdSt(MI); - bool IsSmallTypeLd = isSmallTypeLdMerge(MI->getOpcode()); - if (!IsSmallTypeLd && + bool IsNarrowLd = isNarrowLd(MI->getOpcode()); + if (!IsNarrowLd && !inBoundsForPair(MIIsUnscaled, MinOffset, OffsetStride)) { trackRegDefsUses(MI, ModifiedRegs, UsedRegs, TRI); MemInsns.push_back(MI); continue; } - if (IsSmallTypeLd) { + if (IsNarrowLd) { // If the alignment requirements of the larger type scaled load // instruction can't express the scaled offset of the smaller type // input, bail and keep looking. @@ -1147,8 +1217,8 @@ LdStPairFlags Flags; MachineBasicBlock::iterator Paired = findMatchingInsn(MBBI, Flags, ScanLimit); if (Paired != E) { - if (isSmallTypeLdMerge(MI)) { - ++NumSmallTypeMerged; + if (isNarrowLd(MI)) { + ++NumNarrowLdPromotion; } else { ++NumPairCreated; if (isUnscaledLdSt(MI)) @@ -1168,7 +1238,7 @@ bool enableNarrowLdOpt) { bool Modified = false; // Three tranformations to do here: - // 1) Find halfword loads that can be merged into a single 32-bit word load + // 1) Find narrow loads that can be converted into a single wider load // with bitfield extract instructions. // e.g., // ldrh w0, [x2] @@ -1202,8 +1272,14 @@ break; // Scaled instructions. case AArch64::LDRHHui: + case AArch64::LDRBBui: + case AArch64::LDRSBWui: + case AArch64::LDRSHWui: // Unscaled instructions. - case AArch64::LDURHHi: { + case AArch64::LDURHHi: + case AArch64::LDURBBi: + case AArch64::LDURSBWi: + case AArch64::LDURSHWi: { if (tryToMergeLdStInst(MBBI)) { Modified = true; break; Index: test/CodeGen/AArch64/arm64-ldr-merge.ll =================================================================== --- test/CodeGen/AArch64/arm64-ldr-merge.ll +++ test/CodeGen/AArch64/arm64-ldr-merge.ll @@ -45,3 +45,183 @@ %add14 = add nuw nsw i16 %add9, %l3 ret i16 %add14 } + +; CHECK-LABEL: Ldrsh_merge +; CHECK-NOT: ldrsh +; CHECK: ldr [[NEW_DEST:w[0-9]+]] +; CHECK: asr w{{[0-9]+}}, [[NEW_DEST]], #16 +; CHECK: sxth w{{[0-9]+}}, [[NEW_DEST]] +define i32 @Ldrsh_merge(i16* %p) nounwind { + %add.ptr0 = getelementptr inbounds i16, i16* %p, i64 5 + %tmp = load i16, i16* %add.ptr0 + %add.ptr = getelementptr inbounds i16, i16* %p, i64 4 + %tmp1 = load i16, i16* %add.ptr + %sexttmp = sext i16 %tmp to i32 + %sexttmp1 = sext i16 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} + +; CHECK-LABEL: Ldrsh_zsext_merge +; CHECK: ldr [[NEW_DEST:w[0-9]+]] +; CHECK: lsr w{{[0-9]+}}, [[NEW_DEST]], #16 +; CHECK: sxth w{{[0-9]+}}, [[NEW_DEST]] +define i32 @Ldrsh_zsext_merge(i16* %p) nounwind { + %add.ptr0 = getelementptr inbounds i16, i16* %p, i64 5 + %tmp = load i16, i16* %add.ptr0 + %add.ptr = getelementptr inbounds i16, i16* %p, i64 4 + %tmp1 = load i16, i16* %add.ptr + %sexttmp = zext i16 %tmp to i32 + %sexttmp1 = sext i16 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} + +; CHECK-LABEL: Ldrsh_szext_merge +; CHECK: ldr [[NEW_DEST:w[0-9]+]] +; CHECK: asr w{{[0-9]+}}, [[NEW_DEST]], #16 +; CHECK: and w{{[0-9]+}}, [[NEW_DEST]], #0xffff +define i32 @Ldrsh_szext_merge(i16* %p) nounwind { + %add.ptr0 = getelementptr inbounds i16, i16* %p, i64 5 + %tmp = load i16, i16* %add.ptr0 + %add.ptr = getelementptr inbounds i16, i16* %p, i64 4 + %tmp1 = load i16, i16* %add.ptr + %sexttmp = sext i16 %tmp to i32 + %sexttmp1 = zext i16 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} + +; CHECK-LABEL: Ldrsb_merge +; CHECK: ldrh [[NEW_DEST:w[0-9]+]] +; CHECK: sxtb w{{[0-9]+}}, [[NEW_DEST]] +; CHECK: sbfx w{{[0-9]+}}, [[NEW_DEST]], #8, #8 +define i32 @Ldrsb_merge(i8* %p) nounwind { + %add.ptr0 = getelementptr inbounds i8, i8* %p, i64 2 + %tmp = load i8, i8* %add.ptr0 + %add.ptr = getelementptr inbounds i8, i8* %p, i64 3 + %tmp1 = load i8, i8* %add.ptr + %sexttmp = sext i8 %tmp to i32 + %sexttmp1 = sext i8 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} + +; CHECK-LABEL: Ldrsb_zsext_merge +; CHECK: ldrh [[NEW_DEST:w[0-9]+]] +; CHECK: and w{{[0-9]+}}, [[NEW_DEST]], #0xff +; CHECK: sbfx w{{[0-9]+}}, [[NEW_DEST]], #8, #8 +define i32 @Ldrsb_zsext_merge(i8* %p) nounwind { + %add.ptr0 = getelementptr inbounds i8, i8* %p, i64 2 + %tmp = load i8, i8* %add.ptr0 + %add.ptr = getelementptr inbounds i8, i8* %p, i64 3 + %tmp1 = load i8, i8* %add.ptr + %sexttmp = zext i8 %tmp to i32 + %sexttmp1 = sext i8 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} + +; CHECK-LABEL: Ldrsb_szext_merge +; CHECK: ldrh [[NEW_DEST:w[0-9]+]] +; CHECK: sxtb w{{[0-9]+}}, [[NEW_DEST]] +; CHECK: ubfx w{{[0-9]+}}, [[NEW_DEST]], #8, #8 +define i32 @Ldrsb_szext_merge(i8* %p) nounwind { + %add.ptr0 = getelementptr inbounds i8, i8* %p, i64 2 + %tmp = load i8, i8* %add.ptr0 + %add.ptr = getelementptr inbounds i8, i8* %p, i64 3 + %tmp1 = load i8, i8* %add.ptr + %sexttmp = sext i8 %tmp to i32 + %sexttmp1 = zext i8 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} +; CHECK-LABEL: Ldursh_merge +; CHECK: ldur [[NEW_DEST:w[0-9]+]] +; CHECK: asr w{{[0-9]+}}, [[NEW_DEST]], #16 +; CHECK: sxth w{{[0-9]+}}, [[NEW_DEST]] +define i32 @Ldursh_merge(i16* %p) nounwind { + %add.ptr0 = getelementptr inbounds i16, i16* %p, i64 -1 + %tmp = load i16, i16* %add.ptr0 + %add.ptr = getelementptr inbounds i16, i16* %p, i64 -2 + %tmp1 = load i16, i16* %add.ptr + %sexttmp = sext i16 %tmp to i32 + %sexttmp1 = sext i16 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} + +; CHECK-LABEL: Ldursh_zsext_merge +; CHECK: ldur [[NEW_DEST:w[0-9]+]] +; CHECK: lsr w{{[0-9]+}}, [[NEW_DEST]], #16 +; CHECK: sxth w{{[0-9]+}}, [[NEW_DEST]] +define i32 @Ldursh_zsext_merge(i16* %p) nounwind { + %add.ptr0 = getelementptr inbounds i16, i16* %p, i64 -1 + %tmp = load i16, i16* %add.ptr0 + %add.ptr = getelementptr inbounds i16, i16* %p, i64 -2 + %tmp1 = load i16, i16* %add.ptr + %sexttmp = zext i16 %tmp to i32 + %sexttmp1 = sext i16 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} + +; CHECK-LABEL: Ldursh_szext_merge +; CHECK: ldur [[NEW_DEST:w[0-9]+]] +; CHECK: asr w{{[0-9]+}}, [[NEW_DEST]], #16 +; CHECK: and w{{[0-9]+}}, [[NEW_DEST]], #0xffff +define i32 @Ldursh_szext_merge(i16* %p) nounwind { + %add.ptr0 = getelementptr inbounds i16, i16* %p, i64 -1 + %tmp = load i16, i16* %add.ptr0 + %add.ptr = getelementptr inbounds i16, i16* %p, i64 -2 + %tmp1 = load i16, i16* %add.ptr + %sexttmp = sext i16 %tmp to i32 + %sexttmp1 = zext i16 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} +; CHECK-LABEL: Ldursb_merge +; CHECK: ldurh [[NEW_DEST:w[0-9]+]] +; CHECK: sbfx w{{[0-9]+}}, [[NEW_DEST]], #8, #8 +; CHECK: sxtb w{{[0-9]+}}, [[NEW_DEST]] +define i32 @Ldursb_merge(i8* %p) nounwind { + %add.ptr0 = getelementptr inbounds i8, i8* %p, i64 -1 + %tmp = load i8, i8* %add.ptr0 + %add.ptr = getelementptr inbounds i8, i8* %p, i64 -2 + %tmp1 = load i8, i8* %add.ptr + %sexttmp = sext i8 %tmp to i32 + %sexttmp1 = sext i8 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} + +; CHECK-LABEL: Ldursb_zsext_merge +; CHECK: ldurh [[NEW_DEST:w[0-9]+]] +; CHECK: ubfx w{{[0-9]+}}, [[NEW_DEST]], #8, #8 +; CHECK: sxtb w{{[0-9]+}}, [[NEW_DEST]] +define i32 @Ldursb_zsext_merge(i8* %p) nounwind { + %add.ptr0 = getelementptr inbounds i8, i8* %p, i64 -1 + %tmp = load i8, i8* %add.ptr0 + %add.ptr = getelementptr inbounds i8, i8* %p, i64 -2 + %tmp1 = load i8, i8* %add.ptr + %sexttmp = zext i8 %tmp to i32 + %sexttmp1 = sext i8 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} + +; CHECK-LABEL: Ldursb_szext_merge +; CHECK: ldurh [[NEW_DEST:w[0-9]+]] +; CHECK: sbfx w{{[0-9]+}}, [[NEW_DEST]], #8, #8 +; CHECK: and w{{[0-9]+}}, [[NEW_DEST]], #0xff +define i32 @Ldursb_szext_merge(i8* %p) nounwind { + %add.ptr0 = getelementptr inbounds i8, i8* %p, i64 -1 + %tmp = load i8, i8* %add.ptr0 + %add.ptr = getelementptr inbounds i8, i8* %p, i64 -2 + %tmp1 = load i8, i8* %add.ptr + %sexttmp = sext i8 %tmp to i32 + %sexttmp1 = zext i8 %tmp1 to i32 + %add = add nsw i32 %sexttmp1, %sexttmp + ret i32 %add +} +