8318027: Support alternative name to jdk.internal.vm.compiler #16189

dougxc · 2023-10-13T16:28:19Z

The Graal code base has renamed its module to jdk.compiler.graal as part of preparations for Project Galahad. Due to the way Java modules work, this requires a JDK change. The core of the issue is that the service by which HotSpot requests a Graal compilation is defined in JVMCI. Since JVMCI is in the boot layer, the service can only be implemented by a provider in the boot layer and the package defining the service must be exported to the provider's defining module. This export currently targets jdk.internal.vm.compiler and so the binding fails for the new Graal module. To address this, this PR reflects the Graal module renaming, including adjusting the qualified export.

Edit: The target of the rename is now jdk.graal.compiler - see #16189 (comment)

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-8318027: Support alternative name to jdk.internal.vm.compiler (Enhancement - P4)

Reviewers

Erik Joelsson (@erikj79 - Reviewer) ⚠️ Review applies to 6b729561
Magnus Ihse Bursie (@magicus - Reviewer) ⚠️ Review applies to 6b729561
Vladimir Kozlov (@vnkozlov - Reviewer) ⚠️ Review applies to 193e22a6
Alan Bateman (@AlanBateman - Reviewer)
Hamlin Li (@Hamlin-Li - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16189

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-10-13T16:29:56Z

👋 Welcome back dnsimon! 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 · 2023-10-13T16:32:03Z

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

build
core-libs
graal
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.

mlbridge · 2023-10-20T13:34:00Z

Webrevs

openjdk · 2023-10-20T13:43:16Z

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

8318027: Support alternative name to jdk.internal.vm.compiler

Reviewed-by: erikj, ihse, kvn, alanb, mli

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

99de9bb: 8317807: JAVA_FLAGS removed from jtreg running in JDK-8317039
704c6ea: 8303525: Refactor/cleanup open/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
7c0a828: 8318649: G1: Remove unimplemented HeapRegionRemSet::add_code_root_locked
ff5c5b6: 8318643: +UseTransparentHugePages must enable +UseLargePages
fc29a2e: 8318082: ConcurrentModificationException from IndexWriter
729f4c5: 8318507: G1: Improve remset clearing for humongous candidates
4eab39d: 8318585: Rename CodeCache::UnloadingScope to UnlinkingScope
ffadd63: 8317868: Add @sealedGraph to MethodHandleDesc and descendants
ecd25e7: 8318484: Initial version of cdsConfig.hpp
a876beb: 8316741: BasicStroke.createStrokedShape miter-limits failing on small shapes
... and 225 more: https://git.openjdk.org/jdk/compare/3105538de5569845547b40f243a994a95a84b48f...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.

magicus

Build changes look trivially good.

vnkozlov

Why you replaced pair of copyright years with one year in module-info.Java files? Instead of updating last year only.
Why also update 'since' there?
Even if you changed location these files existed already.

dougxc · 2023-10-20T14:39:56Z

Why you replaced pair of copyright years with one year in module-info.Java files? Instead of updating last year only. Why also update 'since' there? Even if you changed location these files existed already.

The files may be renamed from git's point of view, but I would argue that these are new modules and so should have a new @since tag. Otherwise, someone seeing that jdk.compiler.graal existed @since 9 may be a little surprised/confused if they look for it in a JDK 9 binary. Same thinking applies to the copyright dates. Happy to fix it if this is the wrong way to think about it.

vnkozlov · 2023-10-20T14:53:46Z

Copyright is associated with file and should be kept, only update last year.
I don't know rules about 'since'. But there will be no confusion for developers. Everyone knows that these files were created for Graal from the start.

mbreinhold · 2023-10-20T15:35:25Z

The @since tag should reflect the release in which the tagged element was introduced (i.e., 22), not the release in which some predecessor of the element was introduced.

dougxc · 2023-10-20T15:37:32Z

Ok, thanks for the clarification. What about the copyright dates on the module-info.java files?

mbreinhold · 2023-10-20T15:39:30Z

Vladimir was right about the copyright dates — they should record the year in which the content was created and last updated, regardless of the content’s name.

AlanBateman

The module config and test update looks fine.

vnkozlov

Good.

jonathan-gibbons · 2023-10-20T18:33:42Z

The proposed name jdk.compiler.graal makes it seem like the module is strongly related to the jdk.compiler module, which contains javac and related tools, whereas these modules are completely unrelated.

Is there not a better name that can be used (that does not begin with jdk.compiler)?

jonathan-gibbons · 2023-10-20T18:34:20Z

/label compiler

openjdk · 2023-10-20T18:34:44Z

@jonathan-gibbons
The compiler label was successfully added.

mbreinhold · 2023-10-20T20:10:38Z

Jon makes a good point. If memory serves, wasn’t the name jdk.graal.compiler suggested previously? That would avoid the overlap with the name of the existing jdk.compiler module.

Added tag jdk-22+18 for changeset 3105538

dougxc · 2023-10-21T11:32:26Z

Based on external discussion, agreement has been reached to rename to jdk.graal.compiler instead of jdk.compiler.graal.
Not only does this avoid the confusion with jdk.compiler pointed out by @jonathan-gibbons but it also establishes the namespace jdk.graal for Graal subprojects.

dougxc · 2023-10-23T13:14:32Z

Thanks for all the reviews and careful consideration on this naming change. It will have long term consequences so getting it right is important.

/integrate

openjdk · 2023-10-23T13:15:37Z

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

c2efd77: 8295795: hsdis does not build with binutils 2.39+
99de9bb: 8317807: JAVA_FLAGS removed from jtreg running in JDK-8317039
704c6ea: 8303525: Refactor/cleanup open/test/jdk/javax/rmi/ssl/SSLSocketParametersTest.java
7c0a828: 8318649: G1: Remove unimplemented HeapRegionRemSet::add_code_root_locked
ff5c5b6: 8318643: +UseTransparentHugePages must enable +UseLargePages
fc29a2e: 8318082: ConcurrentModificationException from IndexWriter
729f4c5: 8318507: G1: Improve remset clearing for humongous candidates
4eab39d: 8318585: Rename CodeCache::UnloadingScope to UnlinkingScope
ffadd63: 8317868: Add @sealedGraph to MethodHandleDesc and descendants
ecd25e7: 8318484: Initial version of cdsConfig.hpp
... and 226 more: https://git.openjdk.org/jdk/compare/3105538de5569845547b40f243a994a95a84b48f...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-10-23T13:15:46Z

@dougxc Pushed as commit bd22d23.

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

rename jdk.internal.vm.compiler* to jdk.compiler.graal*

6b72956

openjdk bot added graal graal-dev@openjdk.org build build-dev@openjdk.org hotspot-compiler hotspot-compiler-dev@openjdk.org core-libs core-libs-dev@openjdk.org labels Oct 13, 2023

dougxc changed the title 8318027: rename jdk.internal.vm.compiler* to jdk.compiler.graal* 8318027: support alternative name to jdk.internal.vm.compiler Oct 14, 2023

dougxc changed the title ~~8318027: support alternative name to jdk.internal.vm.compiler~~ 8318027: Support alternative name to jdk.internal.vm.compiler Oct 20, 2023

dougxc marked this pull request as ready for review October 20, 2023 13:28

openjdk bot added the rfr Pull request is ready for review label Oct 20, 2023

erikj79 approved these changes Oct 20, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Oct 20, 2023

magicus approved these changes Oct 20, 2023

View reviewed changes

vnkozlov suggested changes Oct 20, 2023

View reviewed changes

fix copyright dates and @SInCE tags to reflect history

cc0474b

re-fix since tags to reflect current JDK release

193e22a

AlanBateman approved these changes Oct 20, 2023

View reviewed changes

vnkozlov approved these changes Oct 20, 2023

View reviewed changes

openjdk bot added the compiler compiler-dev@openjdk.org label Oct 20, 2023

dougxc added 2 commits October 21, 2023 12:04

rename jdk.compiler.graal to jdk.graal.compiler

210c9bd

Merge tag 'jdk-22+18' into JDK-8318027_rename

3014f40

Added tag jdk-22+18 for changeset 3105538

Hamlin-Li approved these changes Oct 22, 2023

View reviewed changes

AlanBateman approved these changes Oct 23, 2023

View reviewed changes

openjdk bot added the integrated Pull request has been integrated label Oct 23, 2023

openjdk bot closed this Oct 23, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 23, 2023

dougxc mentioned this pull request Oct 24, 2023

Module jdk.compiler.graal does not read a module that exports jdk.vm.ci.services oracle/graal#7651

Closed

dougxc deleted the JDK-8318027_rename branch August 20, 2024 06:22

8318027: Support alternative name to jdk.internal.vm.compiler #16189

8318027: Support alternative name to jdk.internal.vm.compiler #16189

Uh oh!

Conversation

dougxc commented Oct 13, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Oct 13, 2023

Uh oh!

openjdk bot commented Oct 13, 2023

Uh oh!

mlbridge bot commented Oct 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

openjdk bot commented Oct 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

magicus left a comment

Choose a reason for hiding this comment

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

dougxc commented Oct 20, 2023

Uh oh!

vnkozlov commented Oct 20, 2023

Uh oh!

mbreinhold commented Oct 20, 2023

Uh oh!

dougxc commented Oct 20, 2023

Uh oh!

mbreinhold commented Oct 20, 2023

Uh oh!

AlanBateman left a comment

Choose a reason for hiding this comment

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

jonathan-gibbons commented Oct 20, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

jonathan-gibbons commented Oct 20, 2023

Uh oh!

openjdk bot commented Oct 20, 2023

Uh oh!

mbreinhold commented Oct 20, 2023

Uh oh!

dougxc commented Oct 21, 2023

Uh oh!

dougxc commented Oct 23, 2023

Uh oh!

openjdk bot commented Oct 23, 2023

Uh oh!

openjdk bot commented Oct 23, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

8 participants

dougxc commented Oct 13, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Oct 20, 2023 •

edited

Loading

openjdk bot commented Oct 20, 2023 •

edited

Loading

jonathan-gibbons commented Oct 20, 2023 •

edited

Loading