Skip to content
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

(0.49) Minor VectorAPI boxing fixes #20796

Merged
merged 1 commit into from
Dec 10, 2024
Merged

(0.49) Minor VectorAPI boxing fixes #20796

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 13 additions & 8 deletions runtime/compiler/optimizer/VectorAPIExpansion.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -317,7 +317,7 @@ TR_VectorAPIExpansion::visitNodeToBuildVectorAliases(TR::Node *node, bool verify
}
else if (boxingAllowed() &&
opCodeValue == TR::astore &&
rhs->getOpCode().isFunctionCall())
rhs->getOpCodeValue() != TR::aload)
{
_aliasTable[id1]._elementType = TR::Address;
dontVectorizeNode(node);
Expand Down Expand Up @@ -1565,11 +1565,7 @@ TR_VectorAPIExpansion::unboxNode(TR::Node *parentNode, TR::Node *operand, vapiOb
bool parentVectorizedOrScalarized = isVectorizedOrScalarizedNode(parentNode, elementType, bitsLength,
parentType, parentScalarized);

// TODO: enable mask unboxing after general bug of using masks read from arrays is fixed
//
static bool enableMaskUnboxing = feGetEnv("TR_enableMaskUnboxing") ? true : false;

if ((operandObjectType != Vector && (operandObjectType != Mask || !enableMaskUnboxing)) ||
if ((operandObjectType != Vector && operandObjectType != Mask) ||
elementType != TR::Int8 ||
bitsLength != 128 ||
parentScalarized) // TODO: support unboxing into scalars
Expand Down Expand Up @@ -1801,8 +1797,17 @@ TR_VectorAPIExpansion::transformIL(bool checkBoxing)
int32_t elementSize = OMR::DataType::getSize(elementType);
numLanes = bitsLength/8/elementSize;

// TODO: add an assert that unboxing is not needed in this case since the temp
// would not be vectorized
if (boxingAllowed())
{
TR::DataType elementTypeTmp;
int32_t bitsLengthTmp;
vapiObjType objectTypeTmp;
bool scalarizedTmp;
bool rhsVectorizedOrScalarized = isVectorizedOrScalarizedNode(node->getFirstChild(), elementTypeTmp, bitsLengthTmp,
objectTypeTmp, scalarizedTmp);

TR_ASSERT_FATAL(rhsVectorizedOrScalarized, "RHS of vectorized astore should be vectorized too");
}

if (!checkBoxing)
astoreHandler(this, treeTop, node, elementType, vectorLength, numLanes, doMode);
Expand Down