Skip to content

Commit

Permalink
Apply formatting patch
Browse files Browse the repository at this point in the history
  • Loading branch information
@tannergooding
tannergooding committed Jun 6, 2024
1 parent 0ef01c2 commit 49088f6
Show file tree
Hide file tree
Showing 5 changed files with 34 additions and 36 deletions.
10 changes: 5 additions & 5 deletions src/coreclr/jit/gentree.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18823,8 +18823,8 @@ void GenTreeVecCon::EvaluateUnaryInPlace(genTreeOps oper, bool scalar, var_types
// baseType - the base type of the constant being checked
// other - the other vector constant to use in the evaluation
//
void GenTreeVecCon::EvaluateBinaryInPlace(genTreeOps oper, bool scalar, var_types simdType, var_types baseType,
GenTreeVecCon* other)
void GenTreeVecCon::EvaluateBinaryInPlace(
genTreeOps oper, bool scalar, var_types simdType, var_types baseType, GenTreeVecCon* other)
{
switch (simdType)
{
Expand Down Expand Up @@ -27614,8 +27614,8 @@ bool GenTreeHWIntrinsic::OperIsCreateScalarUnsafe() const
//
bool GenTreeHWIntrinsic::OperIsBitwiseHWIntrinsic() const
{
bool isScalar = false;
genTreeOps oper = HWOperGet(&isScalar);
bool isScalar = false;
genTreeOps oper = HWOperGet(&isScalar);
return (oper == GT_AND) || (oper == GT_AND_NOT) || (oper == GT_NOT) || (oper == GT_OR) || (oper == GT_XOR);
}

Expand Down Expand Up @@ -28973,7 +28973,7 @@ uint8_t GenTreeHWIntrinsic::GetTernaryControlByte(GenTreeHWIntrinsic* second) co

bool isScalar = false;

genTreeOps firstOper = HWOperGet(&isScalar);
genTreeOps firstOper = HWOperGet(&isScalar);
assert(!isScalar);

genTreeOps secondOper = second->HWOperGet(&isScalar);
Expand Down
4 changes: 2 additions & 2 deletions src/coreclr/jit/gentree.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6877,8 +6877,8 @@ struct GenTreeVecCon : public GenTree
#endif // FEATURE_HW_INTRINSICS

void EvaluateUnaryInPlace(genTreeOps oper, bool scalar, var_types simdType, var_types baseType);
void EvaluateBinaryInPlace(genTreeOps oper, bool scalar, var_types simdType, var_types baseType,
GenTreeVecCon* other);
void EvaluateBinaryInPlace(
genTreeOps oper, bool scalar, var_types simdType, var_types baseType, GenTreeVecCon* other);

bool IsAllBitsSet() const
{
Expand Down
5 changes: 5 additions & 0 deletions src/coreclr/jit/morph.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -11338,6 +11338,11 @@ GenTree* Compiler::fgOptimizeHWIntrinsic(GenTreeHWIntrinsic* node)
}
break;
}

default:
{
break;
}
}

return node;
Expand Down
44 changes: 20 additions & 24 deletions src/coreclr/jit/valuenum.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7235,20 +7235,17 @@ ValueNum EvaluateSimdGetElement(ValueNumStore* vns, var_types type, var_types ba
}
}

ValueNum ValueNumStore::EvalHWIntrinsicFunUnary(GenTreeHWIntrinsic* tree,
VNFunc func,
ValueNum arg0VN,
bool encodeResultType,
ValueNum resultTypeVN)
ValueNum ValueNumStore::EvalHWIntrinsicFunUnary(
GenTreeHWIntrinsic* tree, VNFunc func, ValueNum arg0VN, bool encodeResultType, ValueNum resultTypeVN)
{
var_types type = tree->TypeGet();
var_types baseType = tree->GetSimdBaseType();
NamedIntrinsic ni = tree->GetHWIntrinsicId();

if (IsVNConstant(arg0VN))
{
bool isScalar = false;
genTreeOps oper = tree->HWOperGet(&isScalar);
bool isScalar = false;
genTreeOps oper = tree->HWOperGet(&isScalar);

if (oper != GT_NONE)
{
Expand Down Expand Up @@ -7447,11 +7444,11 @@ ValueNum ValueNumStore::EvalHWIntrinsicFunUnary(GenTreeHWIntrinsic* tree,
}

ValueNum ValueNumStore::EvalHWIntrinsicFunBinary(GenTreeHWIntrinsic* tree,
VNFunc func,
ValueNum arg0VN,
ValueNum arg1VN,
bool encodeResultType,
ValueNum resultTypeVN)
VNFunc func,
ValueNum arg0VN,
ValueNum arg1VN,
bool encodeResultType,
ValueNum resultTypeVN)
{
var_types type = tree->TypeGet();
var_types baseType = tree->GetSimdBaseType();
Expand Down Expand Up @@ -7483,8 +7480,8 @@ ValueNum ValueNumStore::EvalHWIntrinsicFunBinary(GenTreeHWIntrinsic* tree,
{
assert(IsVNConstant(arg0VN) && IsVNConstant(arg1VN));

bool isScalar = false;
genTreeOps oper = tree->HWOperGet(&isScalar);
bool isScalar = false;
genTreeOps oper = tree->HWOperGet(&isScalar);

if (oper != GT_NONE)
{
Expand Down Expand Up @@ -7673,8 +7670,8 @@ ValueNum ValueNumStore::EvalHWIntrinsicFunBinary(GenTreeHWIntrinsic* tree,
}
else if (cnsVN != NoVN)
{
bool isScalar = false;
genTreeOps oper = tree->HWOperGet(&isScalar);
bool isScalar = false;
genTreeOps oper = tree->HWOperGet(&isScalar);

if (isScalar)
{
Expand Down Expand Up @@ -7937,8 +7934,8 @@ ValueNum ValueNumStore::EvalHWIntrinsicFunBinary(GenTreeHWIntrinsic* tree,
}
else if (arg0VN == arg1VN)
{
bool isScalar = false;
genTreeOps oper = tree->HWOperGet(&isScalar);
bool isScalar = false;
genTreeOps oper = tree->HWOperGet(&isScalar);

if (isScalar)
{
Expand Down Expand Up @@ -11834,8 +11831,8 @@ void Compiler::fgValueNumberHWIntrinsic(GenTreeHWIntrinsic* tree)

if (opCount == 1)
{
ValueNum normalLVN = vnStore->EvalHWIntrinsicFunUnary(tree, func, op1vnp.GetLiberal(),
encodeResultType, resultTypeVNPair.GetLiberal());
ValueNum normalLVN = vnStore->EvalHWIntrinsicFunUnary(tree, func, op1vnp.GetLiberal(), encodeResultType,
resultTypeVNPair.GetLiberal());
ValueNum normalCVN =
vnStore->EvalHWIntrinsicFunUnary(tree, func, op1vnp.GetConservative(), encodeResultType,
resultTypeVNPair.GetConservative());
Expand All @@ -11854,10 +11851,9 @@ void Compiler::fgValueNumberHWIntrinsic(GenTreeHWIntrinsic* tree)
ValueNum normalLVN =
vnStore->EvalHWIntrinsicFunBinary(tree, func, op1vnp.GetLiberal(), op2vnp.GetLiberal(),
encodeResultType, resultTypeVNPair.GetLiberal());
ValueNum normalCVN =
vnStore->EvalHWIntrinsicFunBinary(tree, func, op1vnp.GetConservative(),
op2vnp.GetConservative(), encodeResultType,
resultTypeVNPair.GetConservative());
ValueNum normalCVN = vnStore->EvalHWIntrinsicFunBinary(tree, func, op1vnp.GetConservative(),
op2vnp.GetConservative(), encodeResultType,
resultTypeVNPair.GetConservative());

normalPair = ValueNumPair(normalLVN, normalCVN);
excSetPair = vnStore->VNPExcSetUnion(op1Xvnp, op2Xvnp);
Expand Down
7 changes: 2 additions & 5 deletions src/coreclr/jit/valuenum.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1212,11 +1212,8 @@ class ValueNumStore
}

#if defined(FEATURE_HW_INTRINSICS)
ValueNum EvalHWIntrinsicFunUnary(GenTreeHWIntrinsic* tree,
VNFunc func,
ValueNum arg0VN,
bool encodeResultType,
ValueNum resultTypeVN);
ValueNum EvalHWIntrinsicFunUnary(
GenTreeHWIntrinsic* tree, VNFunc func, ValueNum arg0VN, bool encodeResultType, ValueNum resultTypeVN);

ValueNum EvalHWIntrinsicFunBinary(GenTreeHWIntrinsic* tree,
VNFunc func,
Expand Down

0 comments on commit 49088f6

Please sign in to comment.