dnrops
/
dotnet_runtime
mirror of https://github.com/dotnet/runtime
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Partially revert "Combine cast => negate => compare on ARM64 #112944"

This commit is contained in:
EgorBo 2025-07-30 15:52:26 +02:00
parent 123627ba0f
commit d6a38a637e
2 changed files with 1 additions and 68 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/coreclr/jit/lowerarmarch.cpp
View File

@ -384,7 +384,7 @@ bool Lowering::IsContainableUnaryOrBinaryOp(GenTree* parentNode, GenTree* childN
if (childNode->OperIs(GT_NEG))
{
// If we have a contained LSH, RSH or RSZ, we can still contain NEG if the parent is a EQ or NE.
if (childNode->gtGetOp1()->isContained() && !childNode->gtGetOp1()->OperIs(GT_LSH, GT_RSH, GT_RSZ, GT_CAST))
if (childNode->gtGetOp1()->isContained() && !childNode->gtGetOp1()->OperIs(GT_LSH, GT_RSH, GT_RSZ))
{
// Cannot contain if the childs op1 is already contained
return false;
@ -403,31 +403,6 @@ bool Lowering::IsContainableUnaryOrBinaryOp(GenTree* parentNode, GenTree* childN
{
return false;
}
if (childNode->gtGetOp1()->OperIs(GT_CAST))
{
// Grab the cast as well, we can contain this with cmn (extended-register).
GenTreeCast* cast = childNode->gtGetOp1()->AsCast();
GenTree* castOp = cast->CastOp();
// Cannot contain the cast from floating point.
if (!varTypeIsIntegral(castOp))
{
return false;
}
// Cannot contain the cast if it already contains it's CastOp.
if (castOp->isContained())
{
return false;
}
assert(!cast->gtOverflow());
assert(varTypeIsIntegral(cast) && varTypeIsIntegral(cast->CastToType()));
MakeSrcContained(childNode, cast);
}
return true;
}

42
src/tests/JIT/opt/InstructionCombining/Cmn.cs
View File

@ -159,47 +159,5 @@ namespace TestCompareNegative
}
return false;
}
[MethodImpl(MethodImplOptions.NoInlining)]
static bool CmnExtendedB(int a, int b)
{
//ARM64-FULL-LINE: cmn {{w[0-9]+}}, {{w[0-9]+}}, SXTB
return (a == -(sbyte)b);
}
[MethodImpl(MethodImplOptions.NoInlining)]
static bool CmnExtendedH(int a, int b)
{
//ARM64-FULL-LINE: cmn {{w[0-9]+}}, {{w[0-9]+}}, SXTH
return (a == -(short)b);
}
[MethodImpl(MethodImplOptions.NoInlining)]
static bool CmnExtendedS(long a, long b)
{
//ARM64-FULL-LINE: cmn {{x[0-9]+}}, {{w[0-9]+}}, SXTW
return (a == -(long)(int)b);
}
[MethodImpl(MethodImplOptions.NoInlining)]
static bool CmnExtendedUB(int a, int b)
{
//ARM64-FULL-LINE: cmn {{w[0-9]+}}, {{w[0-9]+}}, UXTB
return (a == -(byte)b);
}
[MethodImpl(MethodImplOptions.NoInlining)]
static bool CmnExtendedUH(int a, int b)
{
//ARM64-FULL-LINE: cmn {{w[0-9]+}}, {{w[0-9]+}}, UXTH
return (a == -(ushort)b);
}
[MethodImpl(MethodImplOptions.NoInlining)]
static bool CmnExtendedUS(long a, long b)
{
//ARM64-FULL-LINE: cmn {{x[0-9]+}}, {{w[0-9]+}}, UXTW
return (a == -(uint)b);
}
}
}