Enable inlineIntrinsicIndexOf for off-heap #21796
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
VermaSh
force-pushed
the
enableStringIndexOf
branch
from
0fd1762 to
0ba0739
Compare
|
Launched a test build (re-run) for final verification. |
|
cc: @r30shah, @zl-wang, @dchopra001 |
VermaSh
changed the title
|
Marking this ready for review since the failure weren't related to these changes. @dchopra001 Since you worked on most of these APIs, can I please get an initial review? |
VermaSh
force-pushed
the
enableStringIndexOf
branch
2 times, most recently
from
de4932e to
afea548
Compare
r30shah
requested changes
May 13, 2025
| if (TR::Compiler->om.isOffHeapAllocationEnabled()) | ||
| { | ||
| // Load first data element address | ||
| generateRXInstruction(cg, |
There was a problem hiding this comment.
Similar comment as I had previously, TR::Register array is not clobberable register.
| @@ -1168,6 +1168,30 @@ J9::Z::TreeEvaluator::inlineVectorizedStringIndexOf(TR::Node* node, TR::CodeGene | |||
| TR::Register* patternLenReg = cg->gprClobberEvaluate(node->getChild(firstCallArgIdx+3)); | |||
| TR::Register* stringIndexReg = cg->gprClobberEvaluate(node->getChild(firstCallArgIdx+4)); | |||
|
|
|||
| // Offset to be added to array object pointer to get to the data elements | |||
| int32_t offsetToDataElements = TR::Compiler->om.contiguousArrayHeaderSizeInBytes(); | |||
There was a problem hiding this comment.
Suggested change
| int32_t offsetToDataElements = TR::Compiler->om.contiguousArrayHeaderSizeInBytes(); | |
| int32_t offsetToDataElements = static_cast<int32_t>(TR::Compiler->om.contiguousArrayHeaderSizeInBytes()); |
| @@ -1880,6 +1904,23 @@ J9::Z::TreeEvaluator::inlineIntrinsicIndexOf(TR::Node * node, TR::CodeGenerator | |||
| regDeps->addPostCondition(resultVector, TR::RealRegister::AssignAny); | |||
| regDeps->addPostCondition(valueVector, TR::RealRegister::AssignAny); | |||
|
|
|||
| // Offset to be added to array object pointer to get to the data elements | |||
| int32_t offsetToDataElements = TR::Compiler->om.contiguousArrayHeaderSizeInBytes(); | |||
There was a problem hiding this comment.
Suggested change
| int32_t offsetToDataElements = TR::Compiler->om.contiguousArrayHeaderSizeInBytes(); | |
| int32_t offsetToDataElements = static_cast<int32_t>(TR::Compiler->om.contiguousArrayHeaderSizeInBytes()); |
VermaSh
force-pushed
the
enableStringIndexOf
branch
from
afea548 to
758c00c
Compare
|
@r30shah I have updated the PR based on your suggestions. Can I please get another review? |
r30shah
requested changes
May 14, 2025
| #ifdef J9VM_GC_SPARSE_HEAP_ALLOCATION | ||
| if (TR::Compiler->om.isOffHeapAllocationEnabled()) | ||
| { | ||
| srm = cg->generateScratchRegisterManager(11); |
There was a problem hiding this comment.
Why can't we simply clobberEvaluate node->getChild(firstCallArgIdx) and other one ?
VermaSh
force-pushed
the
enableStringIndexOf
branch
2 times, most recently
from
54fbe6f to
fa786e0
Compare
|
Jenkins test sanity zlinux jdk11,jdk21 |
|
Jenkins test sanity zlinux jdk11,jdk21 |
VermaSh
force-pushed
the
enableStringIndexOf
branch
from
fa786e0 to
bf12070
Compare
|
Jenkins test sanity zlinux jdk11,jdk21 |
The acceleration was initially disabled because it added array header size to the array object, which was required to reach the elements. However, this is unnecessary for off-heap mode. As a result, the evaluator has been updated to add the array header size exclusively for non-off-heap mode, while in off-heap mode, it now retrieves the data element address directly from the array header, enabling acceleration in off-heap mode. Signed-off-by: Shubham Verma <[email protected]>
VermaSh
force-pushed
the
enableStringIndexOf
branch
from
bf12070 to
d77e768
Compare
|
The build failure was due to a typo. @r30shah can you please relaunch the tests? |
|
Jenkins test sanity zlinux jdk11,jdk21 |
r30shah
approved these changes
May 20, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The acceleration was initially disabled because it added array header size to the array object, which was required to reach the elements. However, this is unnecessary for off-heap mode. Consequently, the evaluator has been updated to add the array header size exclusively for non-off-heap mode, enabling acceleration in off-heap mode.