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

8277503: compiler/onSpinWait/TestOnSpinWaitAArch64DefaultFlags.java failed with "OnSpinWaitInst with the expected value 'isb' not found." #107

Closed
wants to merge 2 commits into from

Conversation

eastig
Copy link
Contributor

@eastig eastig commented Jan 19, 2022

The backport of JDK-8277137 "Set OnSpinWaitInst/OnSpinWaitInstCount defaults to "isb"/1 for Arm Neoverse N1" adds a new test: TestOnSpinWaitAArch64DefaultFlags.java. The test has a bug. It fails on release builds.
This is a backport of the test fix. The original patch removed the test from test/hotspot/jtreg/ProblemList.txt. This change causes a conflict in ProblemList.txt because the test does not exist and is not excluded in jdk17.
The change to the test applies cleanly.

As the backport does not change anything in JVM sources, it can be tested with TestOnSpinWaitAArch64DefaultFlags.java on fastdebug and release builds.

Tested: release and fastdebug builds

  • make test TEST=hotspot/jtreg/compiler/onSpinWait/TestOnSpinWaitAArch64DefaultFlags.java: Passed

Progress

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

Issue

  • JDK-8277503: compiler/onSpinWait/TestOnSpinWaitAArch64DefaultFlags.java failed with "OnSpinWaitInst with the expected value 'isb' not found."

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 107

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

Using diff file

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

@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented Jan 19, 2022

👋 Welcome back eastig! A progress list of the required criteria for merging this PR into pr/103 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 changed the title Backport 7b2d823e842e6a66dbe46b048da44ca9e5485c75 8277503: compiler/onSpinWait/TestOnSpinWaitAArch64DefaultFlags.java failed with "OnSpinWaitInst with the expected value 'isb' not found." Jan 19, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 19, 2022

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

@openjdk openjdk bot added backport rfr labels Jan 19, 2022
@mlbridge
Copy link

@mlbridge mlbridge bot commented Jan 19, 2022

Webrevs

Copy link
Member

@phohensee phohensee left a comment

In case it's needed, lgtm.

@eastig
Copy link
Contributor Author

@eastig eastig commented Jan 19, 2022

@phohensee Thank you.

@GoeLin
Copy link
Member

@GoeLin GoeLin commented Jan 20, 2022

@easting, please enable Pre-submit tests. We will see results when you rebase the change after pushing 8277137.

Strange that this was not marked as clean. Maybe it will be marked clean after rebasing.
Update: Ah, I found in the bug that the ProblemList is the reason.
Hint: Put into the bug

  • the reason of the backport
  • the risk of the backport (ev. mentioning the scope of your testing)
  • only a hint whether the change can be backported clean or needs adaptions.
    It helps reviewers to know what you had to change, so this goes into the PR.
    Thanks!

@eastig
Copy link
Contributor Author

@eastig eastig commented Jan 20, 2022

@easting, please enable Pre-submit tests. We see results when you rebase the change after pushing 8277137.

Strange that this was not marked as clean. Maybe it will be marked clean after rebasing.

Sorry, I should have written the reason of this here. The original patch removed the test from test/hotspot/jtreg/ProblemList.txt. This change causes a conflict in ProblemList.txt because the test does not exist and is not excluded in jdk17.
The change to the test applies cleanly.

@openjdk-notifier openjdk-notifier bot changed the base branch from pr/103 to master Jan 20, 2022
@openjdk-notifier
Copy link

@openjdk-notifier openjdk-notifier bot commented Jan 20, 2022

The dependent pull request has now been integrated, and the target branch of this pull request has been updated. This means that changes from the dependent pull request can start to show up as belonging to this pull request, which may be confusing for reviewers. To remedy this situation, simply merge the latest changes from the new target branch into this pull request by running commands similar to these in the local repository for your personal fork:

git checkout backport-38345bd2
git fetch https://git.openjdk.java.net/jdk17u-dev master
git merge FETCH_HEAD
# if there are conflicts, follow the instructions given by git merge
git commit -m "Merge master"
git push

@openjdk
Copy link

@openjdk openjdk bot commented Jan 20, 2022

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

8277503: compiler/onSpinWait/TestOnSpinWaitAArch64DefaultFlags.java failed with "OnSpinWaitInst with the expected value 'isb' not found."

Reviewed-by: phh

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

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 (@phohensee) 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 label Jan 20, 2022
@eastig
Copy link
Contributor Author

@eastig eastig commented Jan 20, 2022

/integrate

@phohensee
Copy link
Member

@phohensee phohensee commented Jan 20, 2022

/sponsor

@openjdk openjdk bot added the sponsor label Jan 20, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 20, 2022

@eastig
Your change (at version 9b67545) is now ready to be sponsored by a Committer.

@openjdk
Copy link

@openjdk openjdk bot commented Jan 20, 2022

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

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 20, 2022
@openjdk openjdk bot closed this Jan 20, 2022
@openjdk openjdk bot removed ready rfr sponsor labels Jan 20, 2022
@openjdk
Copy link

@openjdk openjdk bot commented Jan 20, 2022

@phohensee @eastig Pushed as commit 43ddf82.

💡 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
3 participants