8358556: Assert when running with -XX:-UseLibmIntrinsic #25680

missa-prime · 2025-06-06T20:40:49Z

This change fixes unwanted calls to the cbrt and tanh intrinsics on x86 when they are explicitly disabled by flags such as -XX:-UseLibmIntrinsic or -XX:-InlineIntrinsics.

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-8358556: Assert when running with -XX:-UseLibmIntrinsic (Bug - P4)

Reviewers

Sandhya Viswanathan (@sviswa7 - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 25680

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

Using diff file

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

Using Webrev

Link to Webrev Comment

…d runtime implementations

bridgekeeper · 2025-06-06T20:41:32Z

👋 Welcome back missa-prime! 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 · 2025-06-06T20:42:13Z

@missa-prime 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:

8358556: Assert when running with -XX:-UseLibmIntrinsic

Reviewed-by: sviswanathan

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 61 new commits pushed to the master branch:

500a3a2: 8358799: Refactor os::jvm_path()
a2f99fd: 8354383: C2: enable sinking of Type nodes out of loop
0582bd2: 8357639: DigestEchoClient fails intermittently due to: java.io.IOException: Data received while in pool
... and 58 more: https://git.openjdk.org/jdk/compare/3cf3e4bbec26a84d77cb7a3125a60ba1e1e4ee97...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@sviswa7) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

openjdk · 2025-06-06T20:42:51Z

@missa-prime The following label will be automatically applied to this pull request:

hotspot-runtime

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.

missa-prime · 2025-06-06T20:45:32Z

@dholmes-ora Does this fix the -XX:-InlineIntrinsics assertion failures when running CubeRootTests.java and HyperbolicTests.java? I couldn't reproduce those, but I could reproduce the one with java -XX:-UseLibmIntrinsic -version.

mlbridge · 2025-06-06T20:48:00Z

Webrevs

… breaks

sviswa7 · 2025-06-06T22:58:24Z

src/hotspot/share/classfile/vmIntrinsics.cpp

+    case vmIntrinsics::_dtanh:
+    case vmIntrinsics::_dcbrt:


You could also move _floatToFloat16 and _float16ToFloat to here from the switch below to make it consistent.

Ok, I moved them.

…rs could be used later on

sviswa7 · 2025-06-06T23:41:27Z

src/hotspot/share/classfile/vmIntrinsics.cpp

@@ -316,6 +314,10 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
  case vmIntrinsics::_fmaF:
    if (!InlineMathNatives || !UseFMA) return true;
    break;
+  case vmIntrinsics::_dtanh:
+  case vmIntrinsics::_dcbrt:
+    if (!InlineMathNatives) return true;


Ah, looks like you missed !InlineIntrinsic check here:
if (!InlineMathNatives || !InlineIntrinsics) return true;

Yes, I was thinking to fall through to the cases below, but I missed the break statement. It's clearer with the extra check anyway, so I added it in now.

dholmes-ora · 2025-06-09T05:13:12Z

@dholmes-ora Does this fix the -XX:-InlineIntrinsics assertion failures when running CubeRootTests.java and HyperbolicTests.java? I couldn't reproduce those, but I could reproduce the one with java -XX:-UseLibmIntrinsic -version.

Yes it does - thanks. Though I'm still unclear why only a couple of these math intrinsics are affected by -XX:-InineIntrinsics ??

missa-prime · 2025-06-09T06:45:52Z

@dholmes-ora Does this fix the -XX:-InlineIntrinsics assertion failures when running CubeRootTests.java and HyperbolicTests.java? I couldn't reproduce those, but I could reproduce the one with java -XX:-UseLibmIntrinsic -version.

Yes it does - thanks. Though I'm still unclear why only a couple of these math intrinsics are affected by -XX:-InineIntrinsics ??

The unaffected math intrinsics (dsin, dcos, dexp, ...) can fall back to alternate C++ implementations in the shared runtime when the stubs aren't generated by -XX:-InlineIntrinsics or -XX:-UseLibmIntrinsic. This isn't the case for the dtanh and dcbrt intrinsics.

sviswa7 · 2025-06-09T18:31:47Z

src/hotspot/share/classfile/vmIntrinsics.cpp

@@ -316,6 +314,10 @@ bool vmIntrinsics::disabled_by_jvm_flags(vmIntrinsics::ID id) {
  case vmIntrinsics::_fmaF:
    if (!InlineMathNatives || !UseFMA) return true;
    break;
+  case vmIntrinsics::_dtanh:
+  case vmIntrinsics::_dcbrt:
+    if (!InlineMathNatives || !InlineIntrinsics) return true;


You also need to add check for UseLibmIntrinsic here:
#ifdef AMD64
if (!UseLibmIntrinsic) return true;
#endif

sviswa7

Looks good to me.

missa-prime · 2025-06-10T03:52:19Z

Looks good to me.

@sviswa7 I had to make some more changes to cover the linux-x64-hs-zero build.

sviswa7

Changes look good.

vnkozlov · 2025-06-10T16:31:23Z

Please, do not push until we review and test it.

sviswa7 · 2025-06-10T16:33:26Z

Thanks @vnkozlov, we will look forward to your testing.

vnkozlov · 2025-06-10T16:58:56Z

I submitted testing.

Fix assertion failures for libm math intrinsics that don't have share…

21cda33

…d runtime implementations

openjdk bot added the rfr Pull request is ready for review label Jun 6, 2025

openjdk bot added the hotspot-runtime [email protected] label Jun 6, 2025

Move UseLibmIntrinsic flag to x86 portion of code base to avoid build…

c11f54e

… breaks

sviswa7 reviewed Jun 6, 2025

View reviewed changes

Re-structure logic to avoid reliance on UseLibmIntrinsic flag as othe…

8dadb41

…rs could be used later on

sviswa7 reviewed Jun 6, 2025

View reviewed changes

Add extra check for InlineIntrinscs flag

b887243

sviswa7 reviewed Jun 9, 2025

View reviewed changes

Include check for UseLibmIntrinsic flag but restrict to x86 platforms

aff9ca0

sviswa7 approved these changes Jun 9, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 9, 2025

Add guard preprocessors to ensure HotSpot Zero JVM builds don't fail

fa21605

openjdk bot removed the ready Pull request is ready to be integrated label Jun 10, 2025

sviswa7 approved these changes Jun 10, 2025

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 10, 2025

8358556: Assert when running with -XX:-UseLibmIntrinsic #25680

Are you sure you want to change the base?

8358556: Assert when running with -XX:-UseLibmIntrinsic #25680

Conversation

missa-prime commented Jun 6, 2025 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Jun 6, 2025

Uh oh!

openjdk bot commented Jun 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openjdk bot commented Jun 6, 2025

Uh oh!

missa-prime commented Jun 6, 2025

Uh oh!

mlbridge bot commented Jun 6, 2025 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

sviswa7 Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

missa-prime Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

sviswa7 Jun 6, 2025

Choose a reason for hiding this comment

Uh oh!

missa-prime Jun 7, 2025

Choose a reason for hiding this comment

Uh oh!

dholmes-ora commented Jun 9, 2025

Uh oh!

missa-prime commented Jun 9, 2025

Uh oh!

sviswa7 Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

missa-prime Jun 9, 2025

Choose a reason for hiding this comment

Uh oh!

sviswa7 left a comment

Choose a reason for hiding this comment

Uh oh!

missa-prime commented Jun 10, 2025

Uh oh!

sviswa7 left a comment

Choose a reason for hiding this comment

Uh oh!

vnkozlov commented Jun 10, 2025

Uh oh!

sviswa7 commented Jun 10, 2025

Uh oh!

vnkozlov commented Jun 10, 2025

Uh oh!

Uh oh!

missa-prime commented Jun 6, 2025 •

edited by openjdk bot

Loading

openjdk bot commented Jun 6, 2025 •

edited

Loading

mlbridge bot commented Jun 6, 2025 •

edited

Loading