Skip to content

Ensure that we don't try to get the simdBaseJitType for scalar intrinsics #61982

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

Merged
tannergooding merged 2 commits into from
Dec 3, 2021
Merged

Ensure that we don't try to get the simdBaseJitType for scalar intrinsics #61982

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8b43a10
Ensure that we don't try to get the simdBaseJitType for scalar intrin…
tannergooding Nov 23, 2021
787dd71
Update a condition to also check for isScalarIsa
tannergooding Dec 2, 2021
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
28 changes: 18 additions & 10 deletions src/coreclr/jit/hwintrinsic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -747,10 +747,11 @@ GenTree* Compiler::impHWIntrinsic(NamedIntrinsic intrinsic,
CORINFO_SIG_INFO* sig,
bool mustExpand)
{
HWIntrinsicCategory category = HWIntrinsicInfo::lookupCategory(intrinsic);
int numArgs = sig->numArgs;
var_types retType = JITtype2varType(sig->retType);
CorInfoType simdBaseJitType = CORINFO_TYPE_UNDEF;
HWIntrinsicCategory category = HWIntrinsicInfo::lookupCategory(intrinsic);
CORINFO_InstructionSet isa = HWIntrinsicInfo::lookupIsa(intrinsic);
int numArgs = sig->numArgs;
var_types retType = JITtype2varType(sig->retType);
CorInfoType simdBaseJitType = CORINFO_TYPE_UNDEF;

if ((retType == TYP_STRUCT) && featureSIMD)
{
Expand All @@ -771,20 +772,27 @@ GenTree* Compiler::impHWIntrinsic(NamedIntrinsic intrinsic,

if (simdBaseJitType == CORINFO_TYPE_UNDEF)
{
if (category != HW_Category_Scalar)
if ((category == HW_Category_Scalar) || HWIntrinsicInfo::isScalarIsa(isa))
{
unsigned int sizeBytes;
simdBaseJitType = getBaseJitTypeAndSizeOfSIMDType(clsHnd, &sizeBytes);
assert((category == HW_Category_Special) || (category == HW_Category_Helper) || (sizeBytes != 0));
simdBaseJitType = sig->retType;

if (simdBaseJitType == CORINFO_TYPE_VOID)
{
simdBaseJitType = CORINFO_TYPE_UNDEF;
}
}
else
{
simdBaseJitType = sig->retType;
assert(featureSIMD);
unsigned int sizeBytes;

simdBaseJitType = getBaseJitTypeAndSizeOfSIMDType(clsHnd, &sizeBytes);
assert((category == HW_Category_Special) || (category == HW_Category_Helper) || (sizeBytes != 0));
}
}

Copy link
Contributor

@echesakov echesakov Nov 30, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we need to add check for !isScalarIsa(isa) below - line 795 in the new version of the file?

Copy link
Member Author

@tannergooding tannergooding Dec 2, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, its probably good to cover that scenario pre-emptively.

Nothing will hit it today, but it fits with the changes already being made.

// Immediately return if the category is other than scalar/special and this is not a supported base type.
if ((category != HW_Category_Special) && (category != HW_Category_Scalar) &&
if ((category != HW_Category_Special) && (category != HW_Category_Scalar) && !HWIntrinsicInfo::isScalarIsa(isa) &&
!isSupportedBaseType(intrinsic, simdBaseJitType))
{
return nullptr;
Expand Down