8339220: [s390x] TestIfMinMax.java failure

[offamitkumar]

This test enables Conditional moves for long operands for s390x. Which fixes the test-case.

Ran tier1 and not saw any regression.

---

Progress

• Change must be properly reviewed (1 review required, with at least 1 Reviewer)
• Change must not contain extraneous whitespace
• Commit message must refer to an issue

Issue

• JDK-8339220: [s390x] TestIfMinMax.java failure (Bug - P4)

Reviewers

• Andrew Haley (@theRealAph - Reviewer) Review applies to 162932fa
• Lutz Schmidt (@RealLucy - Reviewer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/21198/head:pull/21198
$ git checkout pull/21198

Update a local copy of the PR:
$ git checkout pull/21198
$ git pull https://git.openjdk.org/jdk.git pull/21198/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21198

View PR using the GUI difftool:
$ git pr show -t 21198

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/21198.diff

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back amitkumar! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

[openjdk]

@offamitkumar This change now passes all automated pre-integration checks.

ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details.

After integration, the commit message for the final commit will be:

8339220: [s390x] TestIfMinMax.java failure

Reviewed-by: lucy, aph

You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed.

At the time when this comment was updated there had been 153 new commits pushed to the master branch:

• 92186a2: 8341612: [BACKOUT] 8338442: AArch64: Clean up IndOffXX type and let legitimize_address() fix out-of-range operands
• 6600161: 8338379: Accesses to class init state should be properly synchronized
• 20f36c6: 8339329: ConstantPoolBuilder#constantValueEntry method doc typo and clarifications
• 50426b3: 8337713: RISC-V: fix typos in macroAssembler_riscv.cpp
• 260d465: 8340572: ConcurrentModificationException when sorting ArrayList sublists
• 9a25f82: 8339386: Assertion on AIX - original PC must be in the main code section of the compiled method
• df763cd: 8341558: [AIX] build broken after 8341413
• 1c3e56c: 8341512: Optimize StackMapGenerator::processInvokeInstructions
• f8db3a8: 8341510: Optimize StackMapGenerator::processFieldInstructions
• b42fbf4: 8339699: Optimize DataOutputStream writeUTF
• ... and 143 more: https://git.openjdk.org/jdk/compare/47c10694c66bc131c8a5e1572340415b8daaba08...master

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

[openjdk]

@offamitkumar The following label will be automatically applied to this pull request:

• hotspot

When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command.

[mlbridge]

Webrevs

• 02: Full - Incremental (281a66bf)
• 01: Full - Incremental (d2467e73)
• 00: Full (162932fa)

[theRealAph]

Looks good.
I wonder why it wasn't enabled already.

[offamitkumar]

I wonder why it wasn't enabled already.

I tried to find out but, like always I ended up going to "The s390x Port" commit. Which committed this code in OpenJDK. As no history is there before that, so couldn't find out the reason.

But I assume @RealLucy can tell us something useful :-)

[offamitkumar]

I did two benchmark, and I see some performance improvement, in IfMinMax.testSingleLong and IfMinMax.testVectorLong:

Without Patch: 

Benchmark                   Mode  Cnt      Score      Error  Units
IfMinMax.testReductionInt   avgt   15   2073.648 ±    4.173  ns/op
IfMinMax.testReductionLong  avgt   15   2028.487 ±    1.246  ns/op
IfMinMax.testSingleInt      avgt   15      9.752 ±    0.172  ns/op
IfMinMax.testSingleLong     avgt   15     16.168 ±    0.248  ns/op
IfMinMax.testVectorInt      avgt   15   4713.057 ±   14.566  ns/op
IfMinMax.testVectorLong     avgt   15  27669.122 ± 4096.469  ns/op
Finished running test 'micro:vm.compiler.IfMinMax'


Benchmark                   Mode  Cnt      Score      Error  Units
IfMinMax.testReductionInt   avgt   15   2073.340 ±    4.624  ns/op
IfMinMax.testReductionLong  avgt   15   2028.775 ±    1.874  ns/op
IfMinMax.testSingleInt      avgt   15      9.742 ±    0.172  ns/op
IfMinMax.testSingleLong     avgt   15     16.286 ±    0.177  ns/op
IfMinMax.testVectorInt      avgt   15   4720.292 ±   30.984  ns/op
IfMinMax.testVectorLong     avgt   15  25043.432 ± 1627.543  ns/op
Finished running test 'micro:vm.compiler.IfMinMax'

===================================================================

With Patch: 

Benchmark                   Mode  Cnt     Score    Error  Units
IfMinMax.testReductionInt   avgt   15  2082.858 ± 27.064  ns/op
IfMinMax.testReductionLong  avgt   15  2029.843 ±  4.514  ns/op
IfMinMax.testSingleInt      avgt   15     9.743 ±  0.170  ns/op
IfMinMax.testSingleLong     avgt   15    10.072 ±  0.123  ns/op
IfMinMax.testVectorInt      avgt   15  4775.680 ±  9.953  ns/op
IfMinMax.testVectorLong     avgt   15  4736.881 ± 20.507  ns/op
Finished running test 'micro:vm.compiler.IfMinMax'

Benchmark                   Mode  Cnt     Score    Error  Units
IfMinMax.testReductionInt   avgt   15  2071.544 ±  2.536  ns/op
IfMinMax.testReductionLong  avgt   15  2030.751 ±  3.733  ns/op
IfMinMax.testSingleInt      avgt   15     9.630 ±  0.010  ns/op
IfMinMax.testSingleLong     avgt   15     9.921 ±  0.001  ns/op
IfMinMax.testVectorInt      avgt   15  4774.041 ±  2.562  ns/op
IfMinMax.testVectorLong     avgt   15  4753.247 ± 22.158  ns/op
Finished running test 'micro:vm.compiler.IfMinMax'

[RealLucy]

But I assume @RealLucy can tell us something useful :-)

Yes, the s390x port was alive before it was donated to OpenJDK. :-) If there is general interest, I can dig in the internal history in search for more details.

[RealLucy]

Looks good now.
Sorry for the delay, and thanks for the review reminder. This PR flew below radar coverage.

[offamitkumar]

Thanks @RealLucy @theRealAph for the reviews.

/integrate

[openjdk]

Going to push as commit 59ac703.
Since your change was applied there have been 170 commits pushed to the master branch:

• ffb60e5: 8341594: Use Unsafe to coalesce reads in java.util.zip.ZipUtils
• 57c859e: 8339836: Open source several AWT Mouse tests - Batch 1
• b6a4047: 8339982: Open source several AWT Mouse tests - Batch 2
• 45a6359: 8341668: Shenandoah: assert(tail_bits < (idx_t)BitsPerWord) failed: precondition
• d996ca8: 8341581: Optimize BytecodeHelpers validate slot
• 4d50cbb: 8341278: Open source few TrayIcon tests - Set7
• 23f3ca2: 8330206: Bump minimum boot jdk to JDK 23
• fc7244d: 8340713: Open source DnD tests - Set5
• f7bb647: 8341595: Clean up iteration of CEN headers in ZipFile.Source.initCEN
• d0c5e4b: 8341373: Open source closed frame tests # 4
• ... and 160 more: https://git.openjdk.org/jdk/compare/47c10694c66bc131c8a5e1572340415b8daaba08...master

Your commit was automatically rebased without conflicts.

[openjdk]

@offamitkumar Pushed as commit 59ac703.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.