-
Notifications
You must be signed in to change notification settings - Fork 737
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.
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
Accelerate StringCoding.hasNegatives for JDK 11, 17, StringCoding.countPositives for JDK 21+ on x86 #21121
base: master
Are you sure you want to change the base?
Accelerate StringCoding.hasNegatives for JDK 11, 17, StringCoding.countPositives for JDK 21+ on x86 #21121
Conversation
Paging @vijaysun-omr, @0xdaryl for review and @r30shah, @dchopra001 as requested for comparison to acceleration on Z |
543b8ac
to
233cf24
Compare
Looks fine to me from a quick review. I'll probably defer to @hzongaro for the review since he has much more direct awareness of this work than I do, and can easily review the inliner parts as well (that I skimmed over too). |
It appears that the crash is due to a recent OMR commit and is therefore unrelated to my changes. I can build successfully with the |
// AND the residual bytes with the new mask | ||
generateRegRegInstruction(TR::InstOpCode::TEST8RegReg, node, chunk, mask, cg); | ||
|
||
// If the result is nonzero (i.e. at least one of the sign bits is set), return true |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think you can simplify this code like the following, no branching required.
xor resultReg, resultReg ; Set result to 0
test chunk, mask
setne resultReg ; Set result to 1, if not eq
auto xmmmask = cg->allocateRegister(); | ||
auto mask = cg->allocateRegister(); | ||
auto i = cg->allocateRegister(); | ||
auto xmmchunk = cg->allocateRegister(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
For vector registers you need to call cg->allocateRegister(TR_VRF);
, otherwise register assignment, register spilling may not work right.
auto limit = cg->allocateRegister(); | ||
auto xmmmask = cg->allocateRegister(); | ||
auto mask = cg->allocateRegister(); | ||
auto i = cg->allocateRegister(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Use more descriptive naming i -> indexReg, ba -> bufReg, etc.
auto xmmchunk = cg->allocateRegister(); | ||
auto chunk = cg->allocateRegister(); | ||
auto bytes_left = cg->allocateRegister(); | ||
auto ecx = cg->allocateRegister(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you need ecx here? Its not used, and as far as I can tell, non of these instructions implicitly use it.Why do you need ecx here? Its not used, and as far as I can tell, non of these instructions implicitly use it.
auto xmmchunk = cg->allocateRegister(); | ||
auto chunk = cg->allocateRegister(); | ||
auto bytes_left = cg->allocateRegister(); | ||
auto ecx = cg->allocateRegister(); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Why do you need ecx here? Its not used, and as far as I can tell, non of these instructions implicitly use it.Why do you need ecx here? Its not used, and as far as I can tell, non of these instructions implicitly use it.
generateRegRegInstruction(TR::InstOpCode::PTESTRegReg, node, xmmchunk, xmmmask, cg); | ||
|
||
// If the result is nonzero (i.e. at least one of the sign bits is set), break and return index | ||
generateLabelInstruction(TR::InstOpCode::JNE4, node, returnIndexLabel, cg); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
at least one of the sign bits is set
Don't you need to keep track of the index of last positive element? This function should find the number of leading positive elements so the location of that negative matters. You cannot return (i - off) as you do in the residue processing because you don't know where in the vector the first negative is.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The key here was pointed out by Henry early on when I was first trying to figure out how to accelerate countPositives
:
/**
* Count the number of leading positive bytes in the range.
*
* @implSpec the implementation must return len if there are no negative
* bytes in the range. If there are negative bytes, the implementation must return
* a value that is less than or equal to the index of the first negative byte
* in the range.
*/
countPositives
only needs to return a value less than or equal to the index of the first negative byte. There are a few places in String.java
that call countPositives
and then do the work of finding the exact index themselves. I suppose the reason it was designed this way is to take advantage of small time saves in situations where you don't care about the exact index (like when being called by hasNegatives
).
|
||
case TR::java_lang_StringCoding_countPositives: | ||
{ | ||
if (comp->target().cpu.supportsAVX()) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
fix indentation
cg->setSupportsInlineStringCodingHasNegatives(); | ||
} | ||
static bool disableInlineStringCodingCountPositives = feGetEnv("TR_DisableInlineStringCodingCountPositives") != NULL; | ||
if (comp->target().cpu.supportsAVX() && !disableInlineStringCodingCountPositives && |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
You don't use any AVX instructions, as far as I cant tell the highest req you have is SSE 4.1. However, this can be done with just SSE 2 if you use pcmpgtb.
|
||
// Prepare a 16 byte sign bit mask | ||
static uint8_t dqMaskBytes[] = { 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80, 0x80 }; | ||
auto dqMaskMR = generateX86MemoryReference(cg->findOrCreate16ByteConstant(node, dqMaskBytes), cg); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
A couple of things with the main loop. You don't need to load this mask to track sign bits. You can compare each byte to 0 ( is 0 > arr[i] ) using pcmpgtb instruction. pcmpgtb produces at bit mask which can be converted into an integer with PMOVMSKB. If the mask is zero, the all vector elements are positive and you continue the loop. Otherwise, you can find the index of the first negative instruction using tzcnt (use bsf if bmi1 not available) instruction.
Here is some rough pseudo-code:
index = off
while (index < loop_limit)
movdqu data_xmm, [base_ptr + index]; Load 16 bytes from arr[i]
pxor tmp_xmm, tmp_xmm ; create zero vector
pcmpgtb tmp_xmm, data_xmm ; Compare: 0 > arr[i] -> 0xFF if negative, 0x00 otherwise
pmovmskb neg_mask, tmp_xmm ; Extract bitmask of negative values
test neg_mask, neg_mask ; Check if any negative values exist
jnz .foundNegative ; If mask is nonzero, handle first negative
add index, 16 ; all positive
; loop
.foundNegative
count = tzcount(neg_mask) + index - off
jmp .done
.residue
...
.done
...
Secondly, you do not need to track bytes_left
, its like having two loop index counters. Before entering the loop, calculate the loop limit as (len + off) & ~15
. You only need to align to vector length. if (i < loop_limit)
then execute the loop.
} | ||
} | ||
break; | ||
#if JAVA_SPEC_VERSION < 19 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Excluding this call for JDK < 19 is OK, but why not do the same for the method declaration?
{ | ||
// Arguments to countPositives | ||
// Byte array | ||
auto ba = cg->evaluate(node->getChild(0)); |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I will let you process and action all of Brad's comments before reviewing this thoroughly, but one thing I will mention right away are my strong opinions on the use of the auto
keyword and its impact on future code understanding for anyone but the author. I may be known to let one or two slip in on occasion, but since you have many (12) in succession I'll ask that you specify the data type for each (they look to be either TR::Node *
's or TR::Register *
's in your case.
I'll echo Brad's comments about variable naming as well. It is easier to read the code later if the variables that contain nodes are suffixed with Node
and registers are suffixed with Reg
.
This PR accelerates intrinsic candidates
StringCoding.hasNegatives
andStringCoding.countPositives
on x86, the former on JDK 9-18 and the latter on JDK 19+.This PR is incremental in a few ways.
hasNegatives
for arrays of 0-8 elements on JDK 19+. It performs so well for these short arrays that implementing my 'acceleration' would actually cause a performance regression there. While this anomaly is investigated, I will not be acceleratinghasNegatives
on JDK 19+.In the interest of taking advantage of the performance boost as it currently stands for the 0.51 release, this PR will deliver these changes in their incremental state, with plans for another PR or two down the road to close the aforementioned gaps.