Skip to content

Extend Equals/StartsWith auto-vectorization for OrdinalIgnoreCase #66095

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
EgorBo merged 10 commits into from
Mar 9, 2022
Merged

Extend Equals/StartsWith auto-vectorization for OrdinalIgnoreCase #66095

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
d9beb1a
Add OrdinalIgnoreCase support for importer_vectorization.cpp
EgorBo Mar 2, 2022
fbec407
Optimize SWAR cases with XORs
EgorBo Mar 2, 2022
68d0f61
Merge branch 'main' of https://github.com/dotnet/runtime into unroll-…
EgorBo Mar 2, 2022
cc90fb8
Clean up
EgorBo Mar 2, 2022
d83ae01
Merge branch 'main' of https://github.com/dotnet/runtime into unroll-…
EgorBo Mar 2, 2022
b001e8c
fix assert
EgorBo Mar 2, 2022
61e4020
Merge branch 'main' of https://github.com/dotnet/runtime into unroll-…
EgorBo Mar 3, 2022
e0356ed
Merge branch 'main' of https://github.com/dotnet/runtime into unroll-…
EgorBo Mar 8, 2022
99e63c4
Merge branch 'main' of https://github.com/dotnet/runtime into unroll-…
EgorBo Mar 8, 2022
ab637c9
Clean up
EgorBo Mar 8, 2022
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
Prev Previous commit
Next Next commit
Optimize SWAR cases with XORs
  • Loading branch information
@EgorBo
EgorBo committed Mar 2, 2022
commit fbec4073f6d8448b769bd844c90e89038e41b022
43 changes: 20 additions & 23 deletions src/coreclr/jit/importer_vectorization.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,17 +54,13 @@ static bool ConvertToLowerCase(WCHAR* input, WCHAR* mask, int length)
return false;
}

// Inside [0..127] range only [a-Z] and [A-Z] sub-ranges are
// eligible for case changing
if ((ch >= 'A') && (ch <= 'Z'))
// Inside [0..127] range only [a-z] and [A-Z] sub-ranges are
// eligible for case changing, we can't apply 0x20 bit for e.g. '-'
if (((ch >= 'A') && (ch <= 'Z')) || ((ch >= 'a') && (ch <= 'z')))
{
input[i] |= 0x20;
mask[i] = 0x20;
}
else if ((ch >= 'a') && (ch <= 'z'))
{
mask[i] = 0x20;
}
else
{
mask[i] = 0;
Expand Down Expand Up @@ -308,13 +304,19 @@ GenTree* Compiler::impExpandHalfConstEqualsSIMD(
// offset - Offset for the data pointer
// value - Constant value to compare against
// ignoreCase - Ignore case mode (works only for ASCII cns)
// useXor - Use GT_XOR instead of GT_EQ
//
// Return Value:
// A tree with indirect load and comparison
// nullptr in case of 'ignoreCase' mode and non-ASCII value
//
static GenTree* impCreateCompareInd(
Compiler* comp, GenTreeLclVar* obj, var_types type, ssize_t offset, ssize_t value, bool ignoreCase)
static GenTree* impCreateCompareInd(Compiler* comp,
GenTreeLclVar* obj,
var_types type,
ssize_t offset,
ssize_t value,
bool ignoreCase,
bool useXor = false)
{
GenTree* offsetTree = comp->gtNewIconNode(offset, TYP_I_IMPL);
GenTree* addOffsetTree = comp->gtNewOperNode(GT_ADD, TYP_BYREF, obj, offsetTree);
Expand All @@ -333,7 +335,7 @@ static GenTree* impCreateCompareInd(
}

GenTree* valueTree = comp->gtNewIconNode(value, genActualType(type));
return comp->gtNewOperNode(GT_EQ, TYP_INT, indirTree, valueTree);
return comp->gtNewOperNode(useXor ? GT_XOR : GT_EQ, TYP_INT, indirTree, valueTree);
}

//------------------------------------------------------------------------
Expand Down Expand Up @@ -393,20 +395,16 @@ GenTree* Compiler::impExpandHalfConstEqualsSWAR(
//
UINT32 value1 = MAKEINT32(cns[0], cns[1]);
UINT32 value2 = MAKEINT32(cns[1], cns[2]);
GenTree* firstIndir = impCreateCompareInd(this, data, TYP_INT, dataOffset, value1, ignoreCase);
GenTree* firstIndir = impCreateCompareInd(this, data, TYP_INT, dataOffset, value1, ignoreCase, true);
GenTree* secondIndir = impCreateCompareInd(this, gtClone(data)->AsLclVar(), TYP_INT,
dataOffset + sizeof(USHORT), value2, ignoreCase);
dataOffset + sizeof(USHORT), value2, ignoreCase, true);

if ((firstIndir == nullptr) || (secondIndir == nullptr))
{
return nullptr;
}

// TODO-Unroll-CQ: Consider merging two indirs via XOR instead of QMARK
// e.g. gtNewOperNode(GT_XOR, TYP_INT, firstIndir, secondIndir);
// but it currently has CQ issues (redundant movs)
GenTreeColon* doubleIndirColon = gtNewColonNode(TYP_INT, secondIndir, gtNewFalse());
return gtNewQmarkNode(TYP_INT, firstIndir, doubleIndirColon);
return gtNewOperNode(GT_EQ, TYP_INT, gtNewOperNode(GT_OR, TYP_INT, firstIndir, secondIndir), gtNewIconNode(0));
}

assert(len >= 4 && len <= 8);
Expand All @@ -427,19 +425,18 @@ GenTree* Compiler::impExpandHalfConstEqualsSWAR(
// [ value2 ]
//
UINT64 value2 = MAKEINT64(cns[len - 4], cns[len - 3], cns[len - 2], cns[len - 1]);
GenTree* firstIndir = impCreateCompareInd(this, data, TYP_LONG, dataOffset, value1, ignoreCase);
GenTree* firstIndir = impCreateCompareInd(this, data, TYP_LONG, dataOffset, value1, ignoreCase, true);

ssize_t offset = dataOffset + len * sizeof(WCHAR) - sizeof(UINT64);
GenTree* secondIndir = impCreateCompareInd(this, gtClone(data)->AsLclVar(), TYP_LONG, offset, value2, ignoreCase);
ssize_t offset = dataOffset + len * sizeof(WCHAR) - sizeof(UINT64);
GenTree* secondIndir =
impCreateCompareInd(this, gtClone(data)->AsLclVar(), TYP_LONG, offset, value2, ignoreCase, true);

if ((firstIndir == nullptr) || (secondIndir == nullptr))
{
return nullptr;
}

// TODO-Unroll-CQ: Consider merging two indirs via XOR instead of QMARK
GenTreeColon* doubleIndirColon = gtNewColonNode(TYP_INT, secondIndir, gtNewFalse());
return gtNewQmarkNode(TYP_INT, firstIndir, doubleIndirColon);
return gtNewOperNode(GT_EQ, TYP_INT, gtNewOperNode(GT_OR, TYP_LONG, firstIndir, secondIndir), gtNewIconNode(0));
#else // TARGET_64BIT
return nullptr;
#endif
Expand Down