Skip to content

Ensure the assert in IsEmbMaskOp is correct #98306

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
merged 2 commits into from
Feb 13, 2024
Merged

Ensure the assert in IsEmbMaskOp is correct #98306

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a49537b
Ensure the assert in IsEmbMaskOp is correct
tannergooding Feb 12, 2024
0f5a211
Have IsEmbMaskOp check, rather than assert, the node is a HWIntrinsic
tannergooding Feb 12, 2024
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
5 changes: 2 additions & 3 deletions src/coreclr/jit/gentree.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2244,13 +2244,12 @@ struct GenTree
#if defined(TARGET_XARCH) && defined(FEATURE_HW_INTRINSICS)
bool IsEmbMaskOp()
{
bool result = (gtFlags & GTF_HW_EM_OP) != 0;
assert(!result || (gtOper == GT_HWINTRINSIC));
return result;
return OperIsHWIntrinsic() && ((gtFlags & GTF_HW_EM_OP) != 0);
Copy link
Member Author

@tannergooding tannergooding Feb 12, 2024

Choose a reason for hiding this comment

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

None of the callsites were checking OperIsHWIntrinsic() first, so needed to make the check explicit.

Asserting in MakeEmbMaskOp was then appropriate since it did check first.

}

void MakeEmbMaskOp()
{
assert(OperIsHWIntrinsic());
assert(!IsEmbMaskOp());
gtFlags |= GTF_HW_EM_OP;
}
Expand Down