Skip to content
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

8218136: minor hotspot adjustments for xlclang++ from xlc16 on AIX #997

Closed

Conversation

backwaterred
Copy link
Contributor

@backwaterred backwaterred commented Apr 4, 2022

#993

8218136: minor hotspot adjustments for xlclang++ from xlc16 on AIX

Reviewed-by: dholmes, goetz, ihse

Backport Notes:

  • src/hotspot/share/runtime/arguments.cpp: Remove UNSUPPORTED_OPTION_NULL(AllocateOldGenAt) modified by backport but not present in original source.

Progress

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

Issue

  • JDK-8218136: minor hotspot adjustments for xlclang++ from xlc16 on AIX

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk11u-dev pull/997/head:pull/997
$ git checkout pull/997

Update a local copy of the PR:
$ git checkout pull/997
$ git pull https://git.openjdk.java.net/jdk11u-dev pull/997/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 997

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk11u-dev/pull/997.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Apr 4, 2022

👋 Welcome back backwaterred! 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.

@backwaterred backwaterred changed the title Backport only 8218136 Backport 821887202488f52f24a1b75fa8fbde62a9291d5d Apr 4, 2022
@openjdk openjdk bot changed the title Backport 821887202488f52f24a1b75fa8fbde62a9291d5d 8218136: minor hotspot adjustments for xlclang++ from xlc16 on AIX Apr 4, 2022
@openjdk
Copy link

openjdk bot commented Apr 4, 2022

This backport pull request has now been updated with issue from the original commit.

@openjdk openjdk bot added backport rfr Pull request is ready for review labels Apr 4, 2022
@mlbridge
Copy link

mlbridge bot commented Apr 4, 2022

Webrevs

@GoeLin
Copy link
Member

GoeLin commented Apr 6, 2022

Hi, what's wrong with the Pre-submit tests? Is it caused by your change or by some other, unrelated problem?

Also, please only add the jdk1*u-fix-request if the change is ready to be pushed. Here and in the other changes the review is missing. If you add the label, the change appears in my filter but I will not approve it. It just causes overhead to me.
If you backport a change you think is risky and which might not be approved, you can make an exception and flag it beforehand to bring it to my attention. If so, state so in the comment.

@backwaterred
Copy link
Contributor Author

please only add the jdk1*u-fix-request if the change is ready to be pushed. Here and in the other changes the review is missing. If you add the label, the change appears in my filter but I will not approve it. It just causes overhead to me.

@GoeLin noted! I have removed the fix-request labels and will re-add when the PRs are reviewed.

@backwaterred
Copy link
Contributor Author

what's wrong with the Pre-submit tests? Is it caused by your change or by some other, unrelated problem

To your other point, I was not able to reproduce the failure with gcc 9 or gcc 7 on an x86_64 machine running Ubuntu. I believe they are unrelated to this change.

Reviewed-by: erikj, kbarrett, mdoerr, dholmes

Backport Conflicts:
- make/autoconf/toolchain.m4: Update header year.
- src/hotspot/share/gc/g1/ptrQueue.hpp: Remove procedure definition (cpp
does not contian impl).
- src/hotspot/share/gc/shared/oopStorage.hpp: Remove procedure
definition (cpp does not contain impl).
- src/hotspot/share/runtime/vm_version.cpp: Remove ~100 lines not
present in base version.
- src/hotspot/share/utilities/globalDefinitions_xlc.hpp: Add xlc version
check.
Reviewed-by: dholmes, goetz, ihse

Backport Conflicts:
- src/hotspot/share/runtime/arguments.cpp: Remove
UNSUPPORTED_OPTION_NULL(AllocateOldGenAt).
- src/hotspot/share/runtime/arguments.hpp: Add definition of
UNSUPPORTED_OPTION_NULL.
- src/hotspot/share/utilities/globalDefinitions_xlc.hpp: Header year
clash.
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr 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. This allows us to build OpenJDK 11.0.16 on AIX with updated harfbuzz!

@openjdk
Copy link

openjdk bot commented Apr 6, 2022

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

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

8218136: minor hotspot adjustments for xlclang++ from xlc16 on AIX

Reviewed-by: mdoerr

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

  • 9b5d972: 8248876: LoadObject with bad base address created for exec file on linux
  • 4741ab5: 8275330: C2: assert(n->is_Root() || n->is_Region() || n->is_Phi() || n->is_MachMerge() || def_block->dominates(block)) failed: uses must be dominated by definitions
  • 2da50ce: 8283217: Leak FcObjectSet in getFontConfigLocations() in fontpath.c
  • b9a4153: 8284369: TestFailedAllocationBadGraph fails with -XX:TieredStopAtLevel < 4
  • 811cc9f: 8284573: [11u] ProblemList TestBubbleUpRef.java and TestGCOldWithCMS.java because of 8272195
  • e89b698: 8244602: Add JTREG_REPEAT_COUNT to repeat execution of a test
  • 7a02166: 8242312: use reproducible random in hotspot gc tests
  • e8fbaad: 8283641: Large value for CompileThresholdScaling causes assert
  • aeeab3d: 8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492
  • 5a66c8e: 8283408: Fix a C2 crash when filling arrays with unsafe
  • ... and 9 more: https://git.openjdk.java.net/jdk11u-dev/compare/061c08348a4babe66ce1d5481b6c5d34e752c4cc...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 (@TheRealMDoerr) 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 openjdk bot added the ready Pull request is ready to be integrated label Apr 6, 2022
@backwaterred
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Apr 11, 2022
@openjdk
Copy link

openjdk bot commented Apr 11, 2022

@backwaterred
Your change (at version 3782d6a) is now ready to be sponsored by a Committer.

@TheRealMDoerr
Copy link
Contributor

/sponsor

@openjdk
Copy link

openjdk bot commented Apr 11, 2022

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

  • 9b5d972: 8248876: LoadObject with bad base address created for exec file on linux
  • 4741ab5: 8275330: C2: assert(n->is_Root() || n->is_Region() || n->is_Phi() || n->is_MachMerge() || def_block->dominates(block)) failed: uses must be dominated by definitions
  • 2da50ce: 8283217: Leak FcObjectSet in getFontConfigLocations() in fontpath.c
  • b9a4153: 8284369: TestFailedAllocationBadGraph fails with -XX:TieredStopAtLevel < 4
  • 811cc9f: 8284573: [11u] ProblemList TestBubbleUpRef.java and TestGCOldWithCMS.java because of 8272195
  • e89b698: 8244602: Add JTREG_REPEAT_COUNT to repeat execution of a test
  • 7a02166: 8242312: use reproducible random in hotspot gc tests
  • e8fbaad: 8283641: Large value for CompileThresholdScaling causes assert
  • aeeab3d: 8280373: Update Xalan serializer / SystemIDResolver to align with JDK-8270492
  • 5a66c8e: 8283408: Fix a C2 crash when filling arrays with unsafe
  • ... and 9 more: https://git.openjdk.java.net/jdk11u-dev/compare/061c08348a4babe66ce1d5481b6c5d34e752c4cc...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Apr 11, 2022
@openjdk openjdk bot closed this Apr 11, 2022
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Apr 11, 2022
@openjdk
Copy link

openjdk bot commented Apr 11, 2022

@TheRealMDoerr @backwaterred Pushed as commit b930441.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants