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

Update BCDCHK uncommoning for off-heap #20302

Merged
merged 1 commit into from
Oct 17, 2024
Merged

Update BCDCHK uncommoning for off-heap #20302

Show file tree
Hide file tree
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
68 changes: 50 additions & 18 deletions runtime/compiler/z/codegen/UncommonBCDCHKAddressNode.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,15 @@ UncommonBCDCHKAddressNode::perform()
{
TR::Node* node = tt->getNode();

if(node && node->getOpCodeValue() == TR::BCDCHK && node->getSymbol() && node->getSymbol()->getResolvedMethodSymbol())
if(node && node->getOpCodeValue() == TR::BCDCHK &&
node->getSymbol() &&
node->getSymbol()->getResolvedMethodSymbol() &&
node->getNumChildren() >= 2 &&
node->getFirstChild() &&
node->getFirstChild()->getType().isBCD() &&
node->getSecondChild() &&
node->getSecondChild()->getDataType().isAddress() &&
node->getSecondChild()->getReferenceCount() > 1)
{
TR::RecognizedMethod method = node->getSymbol()->getResolvedMethodSymbol()->getRecognizedMethod();
if(method == TR::com_ibm_dataaccess_DecimalData_convertIntegerToPackedDecimal_ ||
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I do not want to stretch this PR too much as it is fixing the functional issue, and following question is related to code that already exists so we can probably in future change this.
Instead of having a large if condition check, we should take out the check for recog. DAA method to a separate function and have a switch case in that function, that will make this code more readable.

Again, suggestion as it is something I observed in the PR.

Expand All @@ -60,27 +68,51 @@ UncommonBCDCHKAddressNode::perform()
method == TR::com_ibm_dataaccess_PackedDecimal_shiftLeftPackedDecimal_ ||
method == TR::com_ibm_dataaccess_PackedDecimal_shiftRightPackedDecimal_)
{
TR::Node* pdOpNode = node->getFirstChild();
TR::Node* oldAddressNode = node->getSecondChild();
TR_ASSERT(pdOpNode && oldAddressNode, "Unexpected null PD opNode or address node under BCDCHK");
TR_ASSERT(oldAddressNode->getNumChildren() == 2, "Expecting 2 children under address node of BCDCHK.");

TR::ILOpCodes addressOp = oldAddressNode->getOpCodeValue();
TR_ASSERT((addressOp == TR::aladd || addressOp == TR::aiadd), "Unexpected addressNode opcode");

if(oldAddressNode->getReferenceCount() > 1)
/* Expected tree structures for oldAddressNode
* 1. non off-heap mode
* aladd/aiadd
* load array_object
* array_element_offset
*
* 2. off-heap enabled: loading first array element because offset is 0
* aloadi <contiguousArrayDataAddrFieldSymbol>
* load array_object
*
* 3. off-heap enabled
* aladd/aiadd
* aloadi <contiguousArrayDataAddrFieldSymbol>
* load array_object
* array_element_offset
*/
TR_ASSERT_FATAL_WITH_NODE(node,
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would it make sense to have the expected tree structure comment moved here before the ASSERT to highlight what you are checking here?

(oldAddressNode->isDataAddrPointer() && oldAddressNode->getNumChildren() == 1)
|| ((addressOp == TR::aladd || addressOp == TR::aiadd) && oldAddressNode->getNumChildren() == 2),
"Expecting either a dataAddrPointer node with 1 child or a aladd/aiadd with 2 children under address node of BCDCHK."
"But the address node %s had %d children and dataAddrPointer flag set to %s\n",
oldAddressNode->getOpCode().getName(), oldAddressNode->getNumChildren(), oldAddressNode->isDataAddrPointer() ? "true" : "false");
TR::Node* newAddressNode = NULL;
if (oldAddressNode->getOpCodeValue() == TR::aloadi)
{
TR::Node* newAddressNode = TR::Node::create(node, addressOp, 2,
oldAddressNode->getFirstChild(),
oldAddressNode->getSecondChild());
node->setAndIncChild(1, newAddressNode);
oldAddressNode->decReferenceCount();
traceMsg(comp(), "%sReplacing node %s [%p] with [%p]\n",
OPT_DETAILS,
oldAddressNode->getOpCode().getName(),
oldAddressNode,
newAddressNode);
// handles expected tree structure 2
newAddressNode = TR::TransformUtil::generateArrayElementAddressTrees(comp(), oldAddressNode->getFirstChild());
}
else
{
// handles expected tree structure 1 and 3
newAddressNode = TR::Node::create(node, addressOp, 2,
oldAddressNode->getFirstChild(),
oldAddressNode->getSecondChild());
}

node->setAndIncChild(1, newAddressNode);
oldAddressNode->decReferenceCount();
traceMsg(comp(), "%sReplacing node %s [%p] with [%p]\n",
OPT_DETAILS,
oldAddressNode->getOpCode().getName(),
oldAddressNode,
newAddressNode);
}
}
}
Expand Down
1 change: 1 addition & 0 deletions runtime/compiler/z/codegen/UncommonBCDCHKAddressNode.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
#include "env/TRMemory.hpp"
#include "il/Node.hpp"
#include "infra/List.hpp"
#include "optimizer/TransformUtil.hpp"

/**
* \brief The Uncommon BCDCHK Address Node codegen phase is designed to cope with incorrect OOL PD copy problem
Expand Down