fixup! [RISCV] Support VLS for VCIX

4vtomat · 4vtomat · commit 29ce8cd125de · 2023-10-06T10:28:14.000-07:00
diff --git a/llvm/lib/Target/RISCV/RISCVISelLowering.cpp b/llvm/lib/Target/RISCV/RISCVISelLowering.cpp
@@ -8316,11 +8316,12 @@ SDValue RISCVTargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,
 
     SDLoc DL(Op);
     MVT RetContainerVT = getContainerForFixedLengthVector(VT);
+    SDVTList VTs = DAG.getVTList({RetContainerVT, MVT::Other});
     SDValue ScalableVector =
-        DAG.getNode(ISD::INTRINSIC_W_CHAIN, DL, RetContainerVT, Ops);
+        DAG.getNode(ISD::INTRINSIC_W_CHAIN, DL, VTs, Ops);
     SDValue FixedVector =
         convertFromScalableVector(VT, ScalableVector, DAG, Subtarget);
-    return DAG.getMergeValues({FixedVector, Op.getOperand(0)}, DL);
+    return DAG.getMergeValues({FixedVector, ScalableVector.getValue(1)}, DL);
   }
   }
 

Original file line number	Diff line number	Diff line change
`@@ -8316,11 +8316,12 @@ SDValue RISCVTargetLowering::LowerINTRINSIC_W_CHAIN(SDValue Op,`
`8316`	`8316`
`8317`	`8317`	`SDLoc DL(Op);`
`8318`	`8318`	`MVT RetContainerVT = getContainerForFixedLengthVector(VT);`
	`8319`	`+ SDVTList VTs = DAG.getVTList({RetContainerVT, MVT::Other});`
`8319`	`8320`	`SDValue ScalableVector =`
`8320`		`- DAG.getNode(ISD::INTRINSIC_W_CHAIN, DL, RetContainerVT, Ops);`
	`8321`	`+ DAG.getNode(ISD::INTRINSIC_W_CHAIN, DL, VTs, Ops);`
`8321`	`8322`	`SDValue FixedVector =`
`8322`	`8323`	`convertFromScalableVector(VT, ScalableVector, DAG, Subtarget);`
`8323`		`- return DAG.getMergeValues({FixedVector, Op.getOperand(0)}, DL);`
	`8324`	`+ return DAG.getMergeValues({FixedVector, ScalableVector.getValue(1)}, DL);`
`8324`	`8325`	`}`
`8325`	`8326`	`}`
`8326`	`8327`