Skip to content

Conversation

@sviswa7
Copy link

@sviswa7 sviswa7 commented Nov 4, 2021

This patch removes conflicts with libsvml.so distributed with Intel's MKL library:
Renames exported symbols from __svml to __jsvml.
Renames library from libsvml.so to libjsvml.so.
Updates the stubGenerator_x86_64.cpp accordingly to load libjsvml.so and the renamed symbols.
Updates tests to look for the new library.

Please review.

Best Regards,
Sandhya


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8276025: Hotspot's libsvml.so may conflict with user dependency

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/6265/head:pull/6265
$ git checkout pull/6265

Update a local copy of the PR:
$ git checkout pull/6265
$ git pull https://git.openjdk.java.net/jdk pull/6265/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 6265

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/6265.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 4, 2021

👋 Welcome back sviswanathan! 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
Copy link

openjdk bot commented Nov 4, 2021

@sviswa7 The following labels will be automatically applied to this pull request:

  • build
  • hotspot-compiler

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

@openjdk openjdk bot added build build-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org labels Nov 4, 2021
@sviswa7 sviswa7 marked this pull request as ready for review November 4, 2021 17:52
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 4, 2021
@mlbridge
Copy link

mlbridge bot commented Nov 4, 2021

Webrevs

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Looks good. I will run tests.

@openjdk
Copy link

openjdk bot commented Nov 4, 2021

@sviswa7 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:

8276025: Hotspot's libsvml.so may conflict with user dependency

Reviewed-by: kvn, erikj, psandoz, ihse

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

  • 7b1916e: 8233557: [TESTBUG] DoubleClickTitleBarTest.java fails on macOs
  • 8ec80c4: 8276653: Missing row headers in j.l.Character docs
  • 7e87f94: 8276652: Missing row headers in MethodHandles.Lookup docs
  • dcf36f8: 8275670: ciReplay: java.lang.NoClassDefFoundError when trying to load java/lang/invoke/LambdaForm$MH
  • 81203ef: 8276655: Use blessed modifier order in SCTP
  • 2b5a32c: 8275718: Relax memory constraint on exception counter updates
  • 99d4b07: 8276649: MethodHandles.Lookup docs: replace the table in the cross-module access check section with list
  • 1533b81: 8276629: Use blessed modifier order in core-libs code
  • 7bb2173: 8276199: java/nio/channels/FileChannel/LargeGatheringWrite.java fails to terminate correctly
  • b57715a: 8276573: Use blessed modifier order in jdk.javadoc
  • ... and 18 more: https://git.openjdk.java.net/jdk/compare/32895ac60949ccceb0a3d25c73ec5e3a00c29593...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 openjdk bot added the ready Pull request is ready to be integrated label Nov 4, 2021
@sviswa7
Copy link
Author

sviswa7 commented Nov 4, 2021

Thanks a lot @vnkozlov.

@vnkozlov
Copy link
Contributor

vnkozlov commented Nov 4, 2021

For completeness may be rename files too: jsvml_.S and jsvml_.S.inc

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Choose a reason for hiding this comment

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

Good.

Copy link
Member

@erikj79 erikj79 left a comment

Choose a reason for hiding this comment

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

Build changes look good.

@vnkozlov
Copy link
Contributor

vnkozlov commented Nov 4, 2021

There is also need to update one closed test we have before (together with) integration. I submitted closed PR.

Copy link
Member

@PaulSandoz PaulSandoz left a comment

Choose a reason for hiding this comment

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

I did a case insensitive regex search [^j]svml over the checked out PR and did not find anything relevant that was missed.

@vnkozlov
Copy link
Contributor

vnkozlov commented Nov 5, 2021

@sviswa7 testing passed you can integrate.

@sviswa7
Copy link
Author

sviswa7 commented Nov 5, 2021

Thanks a lot @vnkozlov for testing and review.
Thanks @erikj79 @PaulSandoz @magicus for the review.

@sviswa7
Copy link
Author

sviswa7 commented Nov 5, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Nov 5, 2021

Going to push as commit 9ad4d3d.
Since your change was applied there have been 29 commits pushed to the master branch:

  • e21b5c7: 8276650: GenGraphs does not produce deterministic output
  • 7b1916e: 8233557: [TESTBUG] DoubleClickTitleBarTest.java fails on macOs
  • 8ec80c4: 8276653: Missing row headers in j.l.Character docs
  • 7e87f94: 8276652: Missing row headers in MethodHandles.Lookup docs
  • dcf36f8: 8275670: ciReplay: java.lang.NoClassDefFoundError when trying to load java/lang/invoke/LambdaForm$MH
  • 81203ef: 8276655: Use blessed modifier order in SCTP
  • 2b5a32c: 8275718: Relax memory constraint on exception counter updates
  • 99d4b07: 8276649: MethodHandles.Lookup docs: replace the table in the cross-module access check section with list
  • 1533b81: 8276629: Use blessed modifier order in core-libs code
  • 7bb2173: 8276199: java/nio/channels/FileChannel/LargeGatheringWrite.java fails to terminate correctly
  • ... and 19 more: https://git.openjdk.java.net/jdk/compare/32895ac60949ccceb0a3d25c73ec5e3a00c29593...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Nov 5, 2021
@openjdk openjdk bot added integrated Pull request has been integrated and removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Nov 5, 2021
@openjdk
Copy link

openjdk bot commented Nov 5, 2021

@sviswa7 Pushed as commit 9ad4d3d.

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

@sviswa7 sviswa7 deleted the svmlname branch November 19, 2021 00:51
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

build build-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

5 participants