Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix fgValueNumberHWIntrinsic to support encodeResultType for Arity 0 nodes #34621

Merged
merged 1 commit into from
Apr 8, 2020
Merged

Fix fgValueNumberHWIntrinsic to support encodeResultType for Arity 0 nodes #34621

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
58 changes: 32 additions & 26 deletions src/coreclr/src/jit/valuenum.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8575,20 +8575,45 @@ void Compiler::fgValueNumberHWIntrinsic(GenTree* tree)
fgMutateGcHeap(tree DEBUGARG("HWIntrinsic - MemoryStore"));
}

int lookupNumArgs = HWIntrinsicInfo::lookupNumArgs(hwIntrinsicNode->gtHWIntrinsicId);
VNFunc func = GetVNFuncForNode(tree);
unsigned fixedArity = vnStore->VNFuncArity(func);
int lookupNumArgs = HWIntrinsicInfo::lookupNumArgs(hwIntrinsicNode->gtHWIntrinsicId);
bool encodeResultType = vnEncodesResultTypeForHWIntrinsic(hwIntrinsicNode->gtHWIntrinsicId);
VNFunc func = GetVNFuncForNode(tree);

ValueNumPair excSetPair = ValueNumStore::VNPForEmptyExcSet();
ValueNumPair normalPair;
ValueNumPair resvnp = ValueNumPair();

if (encodeResultType)
{
ValueNum vnSize = vnStore->VNForIntCon(hwIntrinsicNode->gtSIMDSize);
ValueNum vnBaseType = vnStore->VNForIntCon(INT32(hwIntrinsicNode->gtSIMDBaseType));
ValueNum simdTypeVN = vnStore->VNForFunc(TYP_REF, VNF_SimdType, vnSize, vnBaseType);
resvnp.SetBoth(simdTypeVN);

#ifdef DEBUG
if (verbose)
{
printf(" simdTypeVN is ");
vnPrint(simdTypeVN, 1);
printf("\n");
}
#endif
}

// There are some HWINTRINSICS operations that have zero args, i.e. NI_Vector128_Zero
if (tree->AsOp()->gtOp1 == nullptr)
{
assert(fixedArity == 0);

normalPair = vnStore->VNPairForFunc(tree->TypeGet(), func);
assert(lookupNumArgs == 0);
if (encodeResultType)
{
// There are zero arg HWINTRINSICS operations that encode the result type, i.e. Vector128_AllBitSet
normalPair = vnStore->VNPairForFunc(tree->TypeGet(), func, resvnp);
assert(vnStore->VNFuncArity(func) == 1);
}
else
{
normalPair = vnStore->VNPairForFunc(tree->TypeGet(), func);
assert(vnStore->VNFuncArity(func) == 0);
}
}
else if (tree->AsOp()->gtOp1->OperIs(GT_LIST) || (lookupNumArgs == -1))
{
Expand All @@ -8602,25 +8627,6 @@ void Compiler::fgValueNumberHWIntrinsic(GenTree* tree)
}
else // HWINTRINSIC unary or binary operator.
{
ValueNumPair resvnp = ValueNumPair();
bool encodeResultType = vnEncodesResultTypeForHWIntrinsic(hwIntrinsicNode->gtHWIntrinsicId);

if (encodeResultType)
{
ValueNum vnSize = vnStore->VNForIntCon(hwIntrinsicNode->gtSIMDSize);
ValueNum vnBaseType = vnStore->VNForIntCon(INT32(hwIntrinsicNode->gtSIMDBaseType));
ValueNum simdTypeVN = vnStore->VNForFunc(TYP_REF, VNF_SimdType, vnSize, vnBaseType);
resvnp.SetBoth(simdTypeVN);

#ifdef DEBUG
if (verbose)
{
printf(" simdTypeVN is ");
vnPrint(simdTypeVN, 1);
printf("\n");
}
#endif
}
ValueNumPair op1vnp;
ValueNumPair op1Xvnp;
vnStore->VNPUnpackExc(tree->AsOp()->gtOp1->gtVNPair, &op1vnp, &op1Xvnp);
Expand Down