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

Jump to bottom

WIP: Add support for subtracting -header size from offset #7405

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

WIP: Add support for subtracting -header size from offset #7405

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7f13f6d
Add support for subtracting -header size from offset
VermaSh Jul 10, 2024
f31aaa2
Assert assumptions about array and index nodes
VermaSh Jul 23, 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
65 changes: 51 additions & 14 deletions compiler/optimizer/OMRTransformUtil.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -445,6 +445,10 @@ OMR::TransformUtil::generateDataAddrLoadTrees(TR::Compilation *comp, TR::Node *a
TR::Compiler->om.isOffHeapAllocationEnabled(),
"This helper shouldn't be called if off heap allocation is disabled.\n");

TR_ASSERT_FATAL_WITH_NODE(arrayObject,
arrayObject->getDataType().isAddress(),
"arrayObject must be address data type.\n");

TR::SymbolReference *dataAddrFieldOffset = comp->getSymRefTab()->findOrCreateContiguousArrayDataAddrFieldShadowSymRef();
TR::Node *dataAddrField = TR::Node::createWithSymRef(TR::aloadi, 1, arrayObject, 0, dataAddrFieldOffset);
dataAddrField->setIsInternalPointer(true);
Expand All @@ -454,7 +458,7 @@ OMR::TransformUtil::generateDataAddrLoadTrees(TR::Compilation *comp, TR::Node *a
#endif /* OMR_GC_SPARSE_HEAP_ALLOCATION */

TR::Node *
OMR::TransformUtil::generateArrayElementAddressTrees(TR::Compilation *comp, TR::Node *arrayNode, TR::Node *offsetNode)
OMR::TransformUtil::generateArrayElementAddressTrees(TR::Compilation *comp, TR::Node *arrayNode, TR::Node *offsetNode, bool subNegativeHeaderSize)
{
TR::Node *arrayAddressNode = NULL;
TR::Node *totalOffsetNode = NULL;
Expand All @@ -463,29 +467,50 @@ OMR::TransformUtil::generateArrayElementAddressTrees(TR::Compilation *comp, TR::
!TR::Compiler->om.canGenerateArraylets(),
"This helper shouldn't be called if arraylets are enabled.\n");

TR_ASSERT_FATAL_WITH_NODE(arrayNode,
arrayNode->getDataType().isAddress(),
"arrayNode must be address data type.\n");

TR_ASSERT_FATAL_WITH_NODE(offsetNode,
offsetNode == NULL || offsetNode->getDataType().isIntegral(),
"offsetNode must be integeral data type.\n");

#if defined(OMR_GC_SPARSE_HEAP_ALLOCATION)
if (TR::Compiler->om.isOffHeapAllocationEnabled())
{
arrayAddressNode = generateDataAddrLoadTrees(comp, arrayNode);
if (offsetNode)
arrayAddressNode = TR::Node::create(TR::aladd, 2, arrayAddressNode, offsetNode);
}
else if (comp->target().is64Bit())
#else
if (comp->target().is64Bit())
#endif /* OMR_GC_SPARSE_HEAP_ALLOCATION */
{
totalOffsetNode = TR::Node::lconst(TR::Compiler->om.contiguousArrayHeaderSizeInBytes());
if (offsetNode)
totalOffsetNode = TR::Node::create(TR::ladd, 2, offsetNode, totalOffsetNode);
arrayAddressNode = TR::Node::create(TR::aladd, 2, arrayNode, totalOffsetNode);
}
else
#endif /* OMR_GC_SPARSE_HEAP_ALLOCATION */
{
totalOffsetNode = TR::Node::iconst(static_cast<int32_t>(TR::Compiler->om.contiguousArrayHeaderSizeInBytes()));
TR_ASSERT_FATAL_WITH_NODE(arrayNode,
static_cast<int64_t>(TR::Compiler->om.contiguousArrayHeaderSizeInBytes()) <= TR::getMaxSigned<TR::Int32>(),
"Array header size is expected to fit in int32 but was wider.\n");
TR::DataTypes widestAvailableIntDataType = comp->target().is64Bit() ? TR::DataTypes::Int64 : TR::DataTypes::Int32;

TR::ILOpCodes arrayHeaderSizeLoadOpCode = TR::ILOpCode::constOpCode(widestAvailableIntDataType);
int32_t arrayHeaderSize = static_cast<int32_t>(TR::Compiler->om.contiguousArrayHeaderSizeInBytes());
if (offsetNode)
totalOffsetNode = TR::Node::create(TR::iadd, 2, offsetNode, totalOffsetNode);
arrayAddressNode = TR::Node::create(TR::aiadd, 2, arrayNode, totalOffsetNode);
{
TR::ILOpCodes offsetNodeOpCode = TR::ILOpCode::addOpCode(widestAvailableIntDataType, comp->target().is64Bit());

if (subNegativeHeaderSize)
{
arrayHeaderSize = -arrayHeaderSize;
offsetNodeOpCode = TR::ILOpCode::subtractOpCode(widestAvailableIntDataType);
}

totalOffsetNode = TR::Node::create(offsetNodeOpCode, 2, offsetNode, TR::Node::create(arrayHeaderSizeLoadOpCode, 0, arrayHeaderSize));
}
else
{
totalOffsetNode = TR::Node::create(arrayHeaderSizeLoadOpCode, 0, arrayHeaderSize);
}

TR::ILOpCodes arrayAddressNodeOpCode = TR::ILOpCode::addOpCode(TR::DataTypes::Address, comp->target().is64Bit());
arrayAddressNode = TR::Node::create(arrayAddressNodeOpCode, 2, arrayNode, totalOffsetNode);
}

return arrayAddressNode;
Expand All @@ -494,13 +519,25 @@ OMR::TransformUtil::generateArrayElementAddressTrees(TR::Compilation *comp, TR::
TR::Node *
OMR::TransformUtil::generateFirstArrayElementAddressTrees(TR::Compilation *comp, TR::Node *arrayObject)
{
TR_ASSERT_FATAL_WITH_NODE(arrayObject,
arrayObject->getDataType().isAddress(),
"arrayObject must be address data type.\n");

TR::Node *firstArrayElementNode = generateArrayElementAddressTrees(comp, arrayObject);
return firstArrayElementNode;
}

TR::Node *
OMR::TransformUtil::generateConvertArrayElementIndexToOffsetTrees(TR::Compilation *comp, TR::Node *indexNode, TR::Node *elementSizeNode, int32_t elementSize, bool useShiftOpCode)
{
TR_ASSERT_FATAL_WITH_NODE(indexNode,
indexNode->getDataType().isIntegral(),
"indexNode must be integeral data type.\n");

TR_ASSERT_FATAL_WITH_NODE(elementSizeNode,
elementSizeNode == NULL || elementSizeNode->getDataType().isIntegral(),
"elementSizeNode must be integeral data type.\n");

TR::Node *offsetNode = indexNode->createLongIfNeeded();
TR::Node *strideNode = elementSizeNode;
if (strideNode)
Expand Down
7 changes: 6 additions & 1 deletion compiler/optimizer/OMRTransformUtil.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -219,14 +219,19 @@ class OMR_EXTENSIBLE TransformUtil
* \param offsetNode
* The offset node (in bytes)
*
* \param subNegativeHeaderSize
* Subtract -header size from offset instead of adding header size,
* applies only when offsetNode is not null
*
* \return
* IL to access array element at offset provided by offsetNode or
* first array element if no offset node is provided
*/
static TR::Node *generateArrayElementAddressTrees(
TR::Compilation *comp,
TR::Node *arrayNode,
TR::Node *offsetNode = NULL);
TR::Node *offsetNode = NULL,
bool subNegativeHeaderSize = false);

/**
* \brief
Expand Down