Skip to content

Conversation

@offamitkumar
Copy link
Member

@offamitkumar offamitkumar commented Oct 25, 2024

We are on thin ice with the TestOSRLotsOfLocals test. Before it breaks, I'd like to provide the fix. :-)

Testing : Tier1 test with fastdebug vm.


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-8342962: [s390x] TestOSRLotsOfLocals.java crashes (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21703

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 25, 2024

👋 Welcome back amitkumar! 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 Oct 25, 2024

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

8342962: [s390x] TestOSRLotsOfLocals.java crashes

Reviewed-by: lucy, 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 31 new commits pushed to the master branch:

  • ec06187: 8034066: Incorrect alignment in the "Code" section for "-c -XDdetails" options
  • eb3669a: 8340796: Use a consistent order when loading cxq and EntryList
  • 0e3fc93: 8342083: Make a few fields in FileSystemPreferences final
  • 762a573: 8335880: More troubleshooting tips around windows space in path
  • 40e07a7: 8342865: Use type parameter for Class::getPrimitiveClass
  • 9e451aa: 8343102: Remove --compress from jlink command lines from jpackage tests
  • 873f8a6: 8305406: Add @SPEC tags in java.base/java.* (part 2)
  • 1476f6c: 8343030: RISC-V: Small assembler cleanups
  • f1a9a8d: 8342902: Deduplication of acquire calls in BindingSpecializer causes escape-analyisis failure
  • f1cc890: 8343086: [BACKOUT] JDK-8295269 G1: Improve slow startup due to predictor initialization
  • ... and 21 more: https://git.openjdk.org/jdk/compare/85774b713edf8782f162ac25b61ce99a77e116f4...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 changed the title 8342962 8342962: [s390x] TestOSRLotsOfLocals.java crashes Oct 25, 2024
@openjdk
Copy link

openjdk bot commented Oct 25, 2024

@offamitkumar 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 Oct 25, 2024
@offamitkumar offamitkumar marked this pull request as ready for review October 25, 2024 07:17
@openjdk openjdk bot added the rfr Pull request is ready for review label Oct 25, 2024
@mlbridge
Copy link

mlbridge bot commented Oct 25, 2024

Webrevs

Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

Just some academic improvements...

@offamitkumar offamitkumar requested a review from RealLucy October 25, 2024 11:56
Copy link
Contributor

@RealLucy RealLucy 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 now.
Yet another idea, though.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 25, 2024
@openjdk openjdk bot removed the ready Pull request is ready to be integrated label Oct 25, 2024
Copy link
Contributor

@RealLucy RealLucy left a comment

Choose a reason for hiding this comment

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

Wonderful!

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Oct 25, 2024
@offamitkumar
Copy link
Member Author

@TheRealMDoerr can I get a review for this fix :-)

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 correct to me. I suggest testing it by setting large_offset to true.

@offamitkumar
Copy link
Member Author

I suggest testing it by setting large_offset to true.

I ran tier1 test again with suggested settings and didn't see any regression.

@offamitkumar
Copy link
Member Author

Thanks @RealLucy, @TheRealMDoerr for the reviews.

/integrate

@openjdk
Copy link

openjdk bot commented Oct 29, 2024

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

  • f0075d5: 8343115: SkipIfEqual class is not used after JDK-8335946
  • 90bd544: 8342958: Use jvmArgs consistently in microbenchmarks
  • d49f210: 8342040: Further improve entry lookup performance for multi-release JARs
  • d2e716e: 8331958: Update PC/SC Lite for Suse Linux to 2.3.0
  • a95374f: 8343101: Rework BasicTest.testTemp test cases
  • 00fe9f7: 8343100: Consolidate EmptyFolderTest and EmptyFolderPackageTest jpackage tests into single java file
  • 9f6d5b4: 8343020: (fs) Add support for SecureDirectoryStream on macOS
  • 1341b81: 8341666: FileInputStream doesn't support readAllBytes() or readNBytes(int) on pseudo devices
  • 52382e2: 8338021: Support new unsigned and saturating vector operators in VectorAPI
  • e659d9d: 8342975: C2: Micro-optimize PhaseIdealLoop::Dominators()
  • ... and 35 more: https://git.openjdk.org/jdk/compare/85774b713edf8782f162ac25b61ce99a77e116f4...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Oct 29, 2024
@openjdk openjdk bot closed this Oct 29, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Oct 29, 2024
@openjdk
Copy link

openjdk bot commented Oct 29, 2024

@offamitkumar Pushed as commit 54327bc.

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

@offamitkumar offamitkumar deleted the lol branch October 29, 2024 05:11
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

Development

Successfully merging this pull request may close these issues.

3 participants