Skip to content

Commit b278aa3

Browse files
preameslukel97
andauthored
[RISCV] Make xrivosvizip interleave2 and deinterleave2 undef safe (#136733)
We're duplicating uses here, so we need to freeze the inputs. --------- Co-authored-by: Luke Lau <luke_lau@icloud.com>
1 parent 72cc868 commit b278aa3

File tree

2 files changed

+16
-10
lines changed

2 files changed

+16
-10
lines changed

llvm/lib/Target/RISCV/RISCVISelLowering.cpp

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11550,6 +11550,8 @@ SDValue RISCVTargetLowering::lowerVECTOR_DEINTERLEAVE(SDValue Op,
1155011550
EVT NewVT = VT.getDoubleNumVectorElementsVT();
1155111551
SDValue ZeroIdx = DAG.getVectorIdxConstant(0, DL);
1155211552
Src = DAG.getNode(ISD::EXTRACT_SUBVECTOR, DL, NewVT, Src, ZeroIdx);
11553+
// Freeze the source so we can increase its use count.
11554+
Src = DAG.getFreeze(Src);
1155311555
SDValue Even = lowerVZIP(RISCVISD::RI_VUNZIP2A_VL, Src,
1155411556
DAG.getUNDEF(NewVT), DL, DAG, Subtarget);
1155511557
SDValue Odd = lowerVZIP(RISCVISD::RI_VUNZIP2B_VL, Src,
@@ -11559,6 +11561,9 @@ SDValue RISCVTargetLowering::lowerVECTOR_DEINTERLEAVE(SDValue Op,
1155911561
return DAG.getMergeValues({Even, Odd}, DL);
1156011562
}
1156111563

11564+
// Freeze the sources so we can increase their use count.
11565+
V1 = DAG.getFreeze(V1);
11566+
V2 = DAG.getFreeze(V2);
1156211567
SDValue Even =
1156311568
lowerVZIP(RISCVISD::RI_VUNZIP2A_VL, V1, V2, DL, DAG, Subtarget);
1156411569
SDValue Odd =
@@ -11800,8 +11805,9 @@ SDValue RISCVTargetLowering::lowerVECTOR_INTERLEAVE(SDValue Op,
1180011805
// TODO: Figure out the best lowering for the spread variants
1180111806
if (Subtarget.hasVendorXRivosVizip() && !Op.getOperand(0).isUndef() &&
1180211807
!Op.getOperand(1).isUndef()) {
11803-
SDValue V1 = Op->getOperand(0);
11804-
SDValue V2 = Op->getOperand(1);
11808+
// Freeze the sources so we can increase their use count.
11809+
SDValue V1 = DAG.getFreeze(Op->getOperand(0));
11810+
SDValue V2 = DAG.getFreeze(Op->getOperand(1));
1180511811
SDValue Lo = lowerVZIP(RISCVISD::RI_VZIP2A_VL, V1, V2, DL, DAG, Subtarget);
1180611812
SDValue Hi = lowerVZIP(RISCVISD::RI_VZIP2B_VL, V1, V2, DL, DAG, Subtarget);
1180711813
return DAG.getMergeValues({Lo, Hi}, DL);

llvm/test/CodeGen/RISCV/rvv/vector-interleave.ll

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -260,18 +260,18 @@ define <vscale x 128 x i1> @vector_interleave_nxv128i1_nxv64i1(<vscale x 64 x i1
260260
; ZIP-NEXT: vsetvli a0, zero, e8, m8, ta, ma
261261
; ZIP-NEXT: vmv1r.v v9, v0
262262
; ZIP-NEXT: vmv1r.v v0, v8
263-
; ZIP-NEXT: vmv.v.i v24, 0
264-
; ZIP-NEXT: vmerge.vim v16, v24, 1, v0
263+
; ZIP-NEXT: vmv.v.i v16, 0
264+
; ZIP-NEXT: vmerge.vim v24, v16, 1, v0
265265
; ZIP-NEXT: vmv1r.v v0, v9
266-
; ZIP-NEXT: vmerge.vim v8, v24, 1, v0
266+
; ZIP-NEXT: vmerge.vim v8, v16, 1, v0
267267
; ZIP-NEXT: vsetvli a0, zero, e8, m4, ta, ma
268-
; ZIP-NEXT: ri.vzip2b.vv v4, v8, v16
269-
; ZIP-NEXT: ri.vzip2b.vv v28, v12, v20
270-
; ZIP-NEXT: ri.vzip2a.vv v0, v8, v16
271-
; ZIP-NEXT: ri.vzip2a.vv v24, v12, v20
268+
; ZIP-NEXT: ri.vzip2b.vv v4, v8, v24
269+
; ZIP-NEXT: ri.vzip2b.vv v20, v12, v28
270+
; ZIP-NEXT: ri.vzip2a.vv v0, v8, v24
271+
; ZIP-NEXT: ri.vzip2a.vv v16, v12, v28
272272
; ZIP-NEXT: vsetvli a0, zero, e8, m8, ta, ma
273273
; ZIP-NEXT: vmsne.vi v9, v0, 0
274-
; ZIP-NEXT: vmsne.vi v8, v24, 0
274+
; ZIP-NEXT: vmsne.vi v8, v16, 0
275275
; ZIP-NEXT: vmv1r.v v0, v9
276276
; ZIP-NEXT: ret
277277
%res = call <vscale x 128 x i1> @llvm.vector.interleave2.nxv128i1(<vscale x 64 x i1> %a, <vscale x 64 x i1> %b)

0 commit comments

Comments
 (0)