Skip to content

Conversation

@shipilev
Copy link
Member

@shipilev shipilev commented Nov 22, 2023

When doing JDK-8319777, I misplaced the _supports_cx8 = true flag setting in the method that is only called when CPU features are polled from perf counter code. We need to move the check to a proper place. JDK-8318776 would catch fire without this.

Additional testing (redoing JDK-8319777 testing):

  • Linux arm Zero fastdebug now builds fine with JDK-8318776 fix
  • Linux x86_32 Zero release; jcstress
  • Linux x86_32 Zero fastdebug, compiler/unsafe java/lang/invoke/VarHandles
  • Linux x86_32 Zero fastdebug, bootcycle-images

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-8320582: Zero: Misplaced CX8 enablement flag (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16779

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

Using diff file

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

Webrev

Link to Webrev Comment

@shipilev shipilev marked this pull request as ready for review November 22, 2023 10:34
@bridgekeeper
Copy link

bridgekeeper bot commented Nov 22, 2023

👋 Welcome back shade! 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 Nov 22, 2023
@openjdk
Copy link

openjdk bot commented Nov 22, 2023

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

  • hotspot

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 hotspot-dev@openjdk.org label Nov 22, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 22, 2023

Webrevs

Copy link
Member

@dholmes-ora dholmes-ora left a comment

Choose a reason for hiding this comment

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

It is a bit unclear exactly where the right place is in the sense that I'd expect the other variables, like _no_of_cores, to be initialized at the same time. But ok.

@openjdk
Copy link

openjdk bot commented Nov 22, 2023

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

8320582: Zero: Misplaced CX8 enablement flag

Reviewed-by: dholmes

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

  • a4bd9e4: 8319440: RISC-V: jdk can't be built with clang due to register keyword
  • 524da14: 8320418: PPC64: invokevfinal_helper duplicates code to handle ResolvedMethodEntry
  • 5d4a54b: 8319449: compiler/print/CompileCommandPrintMemStat.java fails on Graal
  • 35526d0: 8257076: os::scan_pages is empty on all platforms
  • 25cebe8: 8317799: AIX PPC64: FFI symbol lookup doesn't find symbols
  • c39d001: 8319137: release _object in ObjectMonitor dtor to avoid races
  • 8b47a14: 8320309: AIX: pthreads created by foreign test library don't work as expected
  • bf0a904: 8318175: AIX PPC64: Handle alignment of double in structs
  • 6ce0ebb: 8295343: sun/security/pkcs11 tests fail on Linux RHEL 8.6 and newer

Please see this link for an up-to-date comparison between the source branch of this pull request and 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.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Nov 22, 2023
@shipilev
Copy link
Member Author

It is a bit unclear exactly where the right place is in the sense that I'd expect the other variables, like _no_of_cores, to be initialized at the same time. But ok.

Yeah. One would expect that after VM_Version::initialize is done, all these are set. Which is a proper expectation, and is what the new guarantee in JDK-8318776 apparently relies on.

Trivial? I would like to integrate as soon as testing comes back clean.

@shipilev
Copy link
Member Author

Testing passes. I would like to get this in now, if we agree this is trivial.

@dholmes-ora
Copy link
Member

Yes trivial. Sorry bad timing

@shipilev
Copy link
Member Author

No problem!

/integrate

@openjdk
Copy link

openjdk bot commented Nov 23, 2023

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

  • 14193a0: 8314614: jdk/jshell/ImportTest.java failed with "InternalError: Failed remote listen"
  • 864b39a: 8320564: RISC-V: Minimal build failed after JDK-8316592
  • 2bb4b93: 8319569: Several java/util tests should be updated to accept VM flags
  • 6016536: 8314745: JFR: @StackFilter
  • aac4318: 8320577: Improve MessageHeader's toString() function to make HttpURLConnection's debug log readable
  • 572b14a: 8320536: problemlist failing serviceability/attach/ConcAttachTest.java test on macosx
  • 30462f9: 8318986: Improve GenericWaitBarrier performance
  • 407cdd4: 8320207: doclet incorrectly chooses code font for a See Also link
  • 1629a90: 8320331: G1 Full GC Heap verification relies on metadata not reset before verification
  • 93bdc2a: 8306055: Add a built-in Catalog to JDK XML module
  • ... and 9 more: https://git.openjdk.org/jdk/compare/5e818318eac8cda7d42b599dc7d7d44e5c299a9f...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 23, 2023

@shipilev Pushed as commit 06d957f.

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

@shipilev shipilev deleted the JDK-8320582-zero-cx8-misplaced branch November 28, 2023 15:03
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot hotspot-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

2 participants