Skip to content

Commit 94279ae

Browse files
authored
[RISCV] Recommit "Expand vp.stride.load to splat of a scalar load." (#98579)
This is a recommit of #98140. The old commit should be rebased on #98205 which changes the feature of hardware zero stride optimization. It's a similar patch as a214c52 for vp.stride.load. Some targets prefer pattern (vmv.v.x (load)) instead of vlse with zero stride.
1 parent b037d0f commit 94279ae

File tree

3 files changed

+143
-6
lines changed

3 files changed

+143
-6
lines changed

llvm/lib/Target/RISCV/RISCVCodeGenPrepare.cpp

Lines changed: 51 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
#include "llvm/ADT/Statistic.h"
1919
#include "llvm/Analysis/ValueTracking.h"
2020
#include "llvm/CodeGen/TargetPassConfig.h"
21+
#include "llvm/IR/Dominators.h"
2122
#include "llvm/IR/IRBuilder.h"
2223
#include "llvm/IR/InstVisitor.h"
2324
#include "llvm/IR/Intrinsics.h"
25+
#include "llvm/IR/IntrinsicsRISCV.h"
2426
#include "llvm/IR/PatternMatch.h"
2527
#include "llvm/InitializePasses.h"
2628
#include "llvm/Pass.h"
@@ -35,6 +37,7 @@ namespace {
3537
class RISCVCodeGenPrepare : public FunctionPass,
3638
public InstVisitor<RISCVCodeGenPrepare, bool> {
3739
const DataLayout *DL;
40+
const DominatorTree *DT;
3841
const RISCVSubtarget *ST;
3942

4043
public:
@@ -48,12 +51,14 @@ class RISCVCodeGenPrepare : public FunctionPass,
4851

4952
void getAnalysisUsage(AnalysisUsage &AU) const override {
5053
AU.setPreservesCFG();
54+
AU.addRequired<DominatorTreeWrapperPass>();
5155
AU.addRequired<TargetPassConfig>();
5256
}
5357

5458
bool visitInstruction(Instruction &I) { return false; }
5559
bool visitAnd(BinaryOperator &BO);
5660
bool visitIntrinsicInst(IntrinsicInst &I);
61+
bool expandVPStrideLoad(IntrinsicInst &I);
5762
};
5863

5964
} // end anonymous namespace
@@ -128,6 +133,9 @@ bool RISCVCodeGenPrepare::visitAnd(BinaryOperator &BO) {
128133
// Which eliminates the scalar -> vector -> scalar crossing during instruction
129134
// selection.
130135
bool RISCVCodeGenPrepare::visitIntrinsicInst(IntrinsicInst &I) {
136+
if (expandVPStrideLoad(I))
137+
return true;
138+
131139
if (I.getIntrinsicID() != Intrinsic::vector_reduce_fadd)
132140
return false;
133141

@@ -155,6 +163,48 @@ bool RISCVCodeGenPrepare::visitIntrinsicInst(IntrinsicInst &I) {
155163
return true;
156164
}
157165

166+
bool RISCVCodeGenPrepare::expandVPStrideLoad(IntrinsicInst &II) {
167+
if (ST->hasOptimizedZeroStrideLoad())
168+
return false;
169+
170+
Value *BasePtr, *VL;
171+
172+
using namespace PatternMatch;
173+
if (!match(&II, m_Intrinsic<Intrinsic::experimental_vp_strided_load>(
174+
m_Value(BasePtr), m_Zero(), m_AllOnes(), m_Value(VL))))
175+
return false;
176+
177+
if (!isKnownNonZero(VL, {*DL, DT, nullptr, &II}))
178+
return false;
179+
180+
auto *VTy = cast<VectorType>(II.getType());
181+
182+
IRBuilder<> Builder(&II);
183+
184+
// Extend VL from i32 to XLen if needed.
185+
if (ST->is64Bit())
186+
VL = Builder.CreateZExt(VL, Builder.getInt64Ty());
187+
188+
Type *STy = VTy->getElementType();
189+
Value *Val = Builder.CreateLoad(STy, BasePtr);
190+
const auto &TLI = *ST->getTargetLowering();
191+
Value *Res;
192+
193+
// TODO: Also support fixed/illegal vector types to splat with evl = vl.
194+
if (isa<ScalableVectorType>(VTy) && TLI.isTypeLegal(EVT::getEVT(VTy))) {
195+
unsigned VMVOp = STy->isFloatingPointTy() ? Intrinsic::riscv_vfmv_v_f
196+
: Intrinsic::riscv_vmv_v_x;
197+
Res = Builder.CreateIntrinsic(VMVOp, {VTy, VL->getType()},
198+
{PoisonValue::get(VTy), Val, VL});
199+
} else {
200+
Res = Builder.CreateVectorSplat(VTy->getElementCount(), Val);
201+
}
202+
203+
II.replaceAllUsesWith(Res);
204+
II.eraseFromParent();
205+
return true;
206+
}
207+
158208
bool RISCVCodeGenPrepare::runOnFunction(Function &F) {
159209
if (skipFunction(F))
160210
return false;
@@ -164,6 +214,7 @@ bool RISCVCodeGenPrepare::runOnFunction(Function &F) {
164214
ST = &TM.getSubtarget<RISCVSubtarget>(F);
165215

166216
DL = &F.getDataLayout();
217+
DT = &getAnalysis<DominatorTreeWrapperPass>().getDomTree();
167218

168219
bool MadeChange = false;
169220
for (auto &BB : F)

llvm/test/CodeGen/RISCV/rvv/fixed-vectors-strided-vpload.ll

Lines changed: 46 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2+
; RUN: llc -mtriple=riscv32 -mattr=+m,+d,+zfh,+v,+zvfh,+optimized-zero-stride-load \
3+
; RUN: -verify-machineinstrs < %s \
4+
; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-RV32,CHECK-OPT
5+
; RUN: llc -mtriple=riscv64 -mattr=+m,+d,+zfh,+v,+zvfh,+optimized-zero-stride-load \
6+
; RUN: -verify-machineinstrs < %s \
7+
; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-RV64,CHECK-OPT
28
; RUN: llc -mtriple=riscv32 -mattr=+m,+d,+zfh,+v,+zvfh \
39
; RUN: -verify-machineinstrs < %s \
4-
; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-RV32
10+
; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-RV32,CHECK-NO-OPT
511
; RUN: llc -mtriple=riscv64 -mattr=+m,+d,+zfh,+v,+zvfh \
612
; RUN: -verify-machineinstrs < %s \
7-
; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-RV64
13+
; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-RV64,CHECK-NO-OPT
814

915
declare <2 x i8> @llvm.experimental.vp.strided.load.v2i8.p0.i8(ptr, i8, <2 x i1>, i32)
1016

@@ -626,3 +632,41 @@ define <33 x double> @strided_load_v33f64(ptr %ptr, i64 %stride, <33 x i1> %mask
626632
}
627633

628634
declare <33 x double> @llvm.experimental.vp.strided.load.v33f64.p0.i64(ptr, i64, <33 x i1>, i32)
635+
636+
; TODO: Use accurate evl.
637+
; Test unmasked integer zero strided
638+
define <4 x i8> @zero_strided_unmasked_vpload_4i8_i8(ptr %ptr) {
639+
; CHECK-OPT-LABEL: zero_strided_unmasked_vpload_4i8_i8:
640+
; CHECK-OPT: # %bb.0:
641+
; CHECK-OPT-NEXT: vsetivli zero, 3, e8, mf4, ta, ma
642+
; CHECK-OPT-NEXT: vlse8.v v8, (a0), zero
643+
; CHECK-OPT-NEXT: ret
644+
;
645+
; CHECK-NO-OPT-LABEL: zero_strided_unmasked_vpload_4i8_i8:
646+
; CHECK-NO-OPT: # %bb.0:
647+
; CHECK-NO-OPT-NEXT: lbu a0, 0(a0)
648+
; CHECK-NO-OPT-NEXT: vsetivli zero, 4, e8, mf4, ta, ma
649+
; CHECK-NO-OPT-NEXT: vmv.v.x v8, a0
650+
; CHECK-NO-OPT-NEXT: ret
651+
%load = call <4 x i8> @llvm.experimental.vp.strided.load.4i8.p0.i8(ptr %ptr, i8 0, <4 x i1> splat (i1 true), i32 3)
652+
ret <4 x i8> %load
653+
}
654+
655+
; TODO: Use accurate evl.
656+
; Test unmasked float zero strided
657+
define <4 x half> @zero_strided_unmasked_vpload_4f16(ptr %ptr) {
658+
; CHECK-OPT-LABEL: zero_strided_unmasked_vpload_4f16:
659+
; CHECK-OPT: # %bb.0:
660+
; CHECK-OPT-NEXT: vsetivli zero, 3, e16, mf2, ta, ma
661+
; CHECK-OPT-NEXT: vlse16.v v8, (a0), zero
662+
; CHECK-OPT-NEXT: ret
663+
;
664+
; CHECK-NO-OPT-LABEL: zero_strided_unmasked_vpload_4f16:
665+
; CHECK-NO-OPT: # %bb.0:
666+
; CHECK-NO-OPT-NEXT: flh fa5, 0(a0)
667+
; CHECK-NO-OPT-NEXT: vsetivli zero, 4, e16, mf2, ta, ma
668+
; CHECK-NO-OPT-NEXT: vfmv.v.f v8, fa5
669+
; CHECK-NO-OPT-NEXT: ret
670+
%load = call <4 x half> @llvm.experimental.vp.strided.load.4f16.p0.i32(ptr %ptr, i32 0, <4 x i1> splat (i1 true), i32 3)
671+
ret <4 x half> %load
672+
}

llvm/test/CodeGen/RISCV/rvv/strided-vpload.ll

Lines changed: 46 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
11
; NOTE: Assertions have been autogenerated by utils/update_llc_test_checks.py
2+
; RUN: llc -mtriple=riscv32 -mattr=+m,+d,+zfh,+v,+zvfh,+optimized-zero-stride-load \
3+
; RUN: -verify-machineinstrs < %s \
4+
; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-RV32,CHECK-OPT
5+
; RUN: llc -mtriple=riscv64 -mattr=+m,+d,+zfh,+v,+zvfh,+optimized-zero-stride-load \
6+
; RUN: -verify-machineinstrs < %s \
7+
; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-RV64,CHECK-OPT
28
; RUN: llc -mtriple=riscv32 -mattr=+m,+d,+zfh,+v,+zvfh \
3-
; RUN: -verify-machineinstrs < %s | FileCheck %s \
4-
; RUN: -check-prefixes=CHECK,CHECK-RV32
9+
; RUN: -verify-machineinstrs < %s \
10+
; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-RV32,CHECK-NO-OPT
511
; RUN: llc -mtriple=riscv64 -mattr=+m,+d,+zfh,+v,+zvfh \
6-
; RUN: -verify-machineinstrs < %s | FileCheck %s \
7-
; RUN: -check-prefixes=CHECK,CHECK-RV64
12+
; RUN: -verify-machineinstrs < %s \
13+
; RUN: | FileCheck %s --check-prefixes=CHECK,CHECK-RV64,CHECK-NO-OPT
814

915
declare <vscale x 1 x i8> @llvm.experimental.vp.strided.load.nxv1i8.p0.i8(ptr, i8, <vscale x 1 x i1>, i32)
1016

@@ -780,3 +786,39 @@ define <vscale x 16 x double> @strided_load_nxv17f64(ptr %ptr, i64 %stride, <vsc
780786
declare <vscale x 17 x double> @llvm.experimental.vp.strided.load.nxv17f64.p0.i64(ptr, i64, <vscale x 17 x i1>, i32)
781787
declare <vscale x 1 x double> @llvm.experimental.vector.extract.nxv1f64(<vscale x 17 x double> %vec, i64 %idx)
782788
declare <vscale x 16 x double> @llvm.experimental.vector.extract.nxv16f64(<vscale x 17 x double> %vec, i64 %idx)
789+
790+
; Test unmasked integer zero strided
791+
define <vscale x 1 x i8> @zero_strided_unmasked_vpload_nxv1i8_i8(ptr %ptr) {
792+
; CHECK-OPT-LABEL: zero_strided_unmasked_vpload_nxv1i8_i8:
793+
; CHECK-OPT: # %bb.0:
794+
; CHECK-OPT-NEXT: vsetivli zero, 4, e8, mf8, ta, ma
795+
; CHECK-OPT-NEXT: vlse8.v v8, (a0), zero
796+
; CHECK-OPT-NEXT: ret
797+
;
798+
; CHECK-NO-OPT-LABEL: zero_strided_unmasked_vpload_nxv1i8_i8:
799+
; CHECK-NO-OPT: # %bb.0:
800+
; CHECK-NO-OPT-NEXT: lbu a0, 0(a0)
801+
; CHECK-NO-OPT-NEXT: vsetivli zero, 4, e8, mf8, ta, ma
802+
; CHECK-NO-OPT-NEXT: vmv.v.x v8, a0
803+
; CHECK-NO-OPT-NEXT: ret
804+
%load = call <vscale x 1 x i8> @llvm.experimental.vp.strided.load.nxv1i8.p0.i8(ptr %ptr, i8 0, <vscale x 1 x i1> splat (i1 true), i32 4)
805+
ret <vscale x 1 x i8> %load
806+
}
807+
808+
; Test unmasked float zero strided
809+
define <vscale x 1 x half> @zero_strided_unmasked_vpload_nxv1f16(ptr %ptr) {
810+
; CHECK-OPT-LABEL: zero_strided_unmasked_vpload_nxv1f16:
811+
; CHECK-OPT: # %bb.0:
812+
; CHECK-OPT-NEXT: vsetivli zero, 4, e16, mf4, ta, ma
813+
; CHECK-OPT-NEXT: vlse16.v v8, (a0), zero
814+
; CHECK-OPT-NEXT: ret
815+
;
816+
; CHECK-NO-OPT-LABEL: zero_strided_unmasked_vpload_nxv1f16:
817+
; CHECK-NO-OPT: # %bb.0:
818+
; CHECK-NO-OPT-NEXT: flh fa5, 0(a0)
819+
; CHECK-NO-OPT-NEXT: vsetivli zero, 4, e16, mf4, ta, ma
820+
; CHECK-NO-OPT-NEXT: vfmv.v.f v8, fa5
821+
; CHECK-NO-OPT-NEXT: ret
822+
%load = call <vscale x 1 x half> @llvm.experimental.vp.strided.load.nxv1f16.p0.i32(ptr %ptr, i32 0, <vscale x 1 x i1> splat (i1 true), i32 4)
823+
ret <vscale x 1 x half> %load
824+
}

0 commit comments

Comments
 (0)