Correctly handle variable argument SIMDScalar (#26421) (#26778)

CarolEidt · web-flow · commit 1a4112735fc9 · 2019-10-14T13:23:46.000-07:00
* Correctly handle variable argument SIMDScalar

Fix #26286
diff --git a/src/jit/hwintrinsiccodegenxarch.cpp b/src/jit/hwintrinsiccodegenxarch.cpp
@@ -125,7 +125,16 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)
                     if ((ival != -1) && varTypeIsFloating(baseType))
                     {
                         assert((ival >= 0) && (ival <= 127));
-                        genHWIntrinsic_R_RM_I(node, ins, (int8_t)ival);
+                        if ((category == HW_Category_SIMDScalar) && HWIntrinsicInfo::CopiesUpperBits(intrinsicId))
+                        {
+                            assert(!op1->isContained());
+                            emit->emitIns_SIMD_R_R_R_I(ins, simdSize, targetReg, op1Reg, op1Reg,
+                                                       static_cast<int8_t>(ival));
+                        }
+                        else
+                        {
+                            genHWIntrinsic_R_RM_I(node, ins, static_cast<int8_t>(ival));
+                        }
                     }
                     else if ((category == HW_Category_SIMDScalar) && HWIntrinsicInfo::CopiesUpperBits(intrinsicId))
                     {

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,16 @@ void CodeGen::genHWIntrinsic(GenTreeHWIntrinsic* node)`
`125`	`125`	`if ((ival != -1) && varTypeIsFloating(baseType))`
`126`	`126`	`{`
`127`	`127`	`assert((ival >= 0) && (ival <= 127));`
`128`		`- genHWIntrinsic_R_RM_I(node, ins, (int8_t)ival);`
	`128`	`+ if ((category == HW_Category_SIMDScalar) && HWIntrinsicInfo::CopiesUpperBits(intrinsicId))`
	`129`	`+ {`
	`130`	`+ assert(!op1->isContained());`
	`131`	`+ emit->emitIns_SIMD_R_R_R_I(ins, simdSize, targetReg, op1Reg, op1Reg,`
	`132`	`+ static_cast<int8_t>(ival));`
	`133`	`+ }`
	`134`	`+ else`
	`135`	`+ {`
	`136`	`+ genHWIntrinsic_R_RM_I(node, ins, static_cast<int8_t>(ival));`
	`137`	`+ }`
`129`	`138`	`}`
`130`	`139`	`else if ((category == HW_Category_SIMDScalar) && HWIntrinsicInfo::CopiesUpperBits(intrinsicId))`
`131`	`140`	`{`