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

JDK-8313689 : C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation #15367

Closed
wants to merge 1 commit into from

Conversation

JohnTortugo
Copy link
Contributor

@JohnTortugo JohnTortugo commented Aug 21, 2023

Please see the JBS work item for more context.

These adjustments are necessary to make the IR graph shape more stable across executions of the tests. Also, tries to force inline of some important methods.

Tested locally on Linux x64 and Mac AArch64.


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-8313689: C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15367

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Aug 21, 2023

👋 Welcome back cslucas! 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 openjdk bot added the rfr Pull request is ready for review label Aug 21, 2023
@openjdk
Copy link

openjdk bot commented Aug 21, 2023

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

  • hotspot-compiler

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.

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Aug 21, 2023
@mlbridge
Copy link

mlbridge bot commented Aug 21, 2023

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.

Good

@openjdk
Copy link

openjdk bot commented Aug 21, 2023

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

8313689: C2: compiler/c2/irTests/scalarReplacement/AllocationMergesTests.java fails intermittently with -XX:-TieredCompilation

Reviewed-by: kvn, thartmann

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

  • ab86d23: 8250269: Replace ATTRIBUTE_ALIGNED with alignas
  • a66b5df: 8314618: RISC-V: -XX:MaxVectorSize does not work as expected
  • 87298d2: 8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
  • 78f74bc: 8314672: ProblemList runtime/cds/appcds/customLoader/HelloCustom_JFR.java on linux-all and windows-x64
  • 17a19dc: 8311639: Replace currentTimeMillis() with nanoTime() in jtreg/gc
  • 0b3f452: 8314161: G1: Fix -Wconversion warnings in G1CardSetConfiguration::_bitmap_hash_mask
  • abac608: 8313962: G1: Refactor G1ConcurrentMark::_num_concurrent_workers
  • 812f475: 8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
  • 8939d15: 8314100: G1: Improve collection set candidate selection code
  • ec1f7a8: 8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
  • ... and 4 more: https://git.openjdk.org/jdk/compare/395fc78880a91eeb06a08c1abf6905d580a650c0...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 (@vnkozlov, @TobiHartmann) 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 Aug 21, 2023
@JohnTortugo
Copy link
Contributor Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label Aug 22, 2023
@openjdk
Copy link

openjdk bot commented Aug 22, 2023

@JohnTortugo
Your change (at version 0ccb030) is now ready to be sponsored by a Committer.

Copy link
Member

@TobiHartmann TobiHartmann 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 to me too.

@TobiHartmann
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 22, 2023

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

  • ab86d23: 8250269: Replace ATTRIBUTE_ALIGNED with alignas
  • a66b5df: 8314618: RISC-V: -XX:MaxVectorSize does not work as expected
  • 87298d2: 8312535: MidiSystem.getSoundbank() throws unexpected SecurityException
  • 78f74bc: 8314672: ProblemList runtime/cds/appcds/customLoader/HelloCustom_JFR.java on linux-all and windows-x64
  • 17a19dc: 8311639: Replace currentTimeMillis() with nanoTime() in jtreg/gc
  • 0b3f452: 8314161: G1: Fix -Wconversion warnings in G1CardSetConfiguration::_bitmap_hash_mask
  • abac608: 8313962: G1: Refactor G1ConcurrentMark::_num_concurrent_workers
  • 812f475: 8314501: Shenandoah: sun/tools/jhsdb/heapconfig/JMapHeapConfigTest.java fails
  • 8939d15: 8314100: G1: Improve collection set candidate selection code
  • ec1f7a8: 8311630: [s390] Implementation of Foreign Function & Memory API (Preview)
  • ... and 4 more: https://git.openjdk.org/jdk/compare/395fc78880a91eeb06a08c1abf6905d580a650c0...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Aug 22, 2023
@openjdk openjdk bot closed this Aug 22, 2023
@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 Aug 22, 2023
@openjdk
Copy link

openjdk bot commented Aug 22, 2023

@TobiHartmann @JohnTortugo Pushed as commit 02ef859.

💡 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
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
3 participants