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

8315578: PPC builds are broken after JDK-8304913 #15556

Closed
wants to merge 4 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Sep 4, 2023

Similar to other issues in the same area. I have no PPC32 machine to test the build on, but this matches other fixes for other architectures (83c096d) after this fix the PPC32 Zero build completes fine.


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-8315578: PPC builds are broken after JDK-8304913 (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 15556

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Sep 4, 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 Sep 4, 2023
@openjdk
Copy link

openjdk bot commented Sep 4, 2023

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

  • core-libs

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 core-libs core-libs-dev@openjdk.org label Sep 4, 2023
@mlbridge
Copy link

mlbridge bot commented Sep 4, 2023

Webrevs

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.

Thanks!

@openjdk
Copy link

openjdk bot commented Sep 7, 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:

8315578: PPC builds are broken after JDK-8304913

Reviewed-by: mdoerr, rriggs

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:

  • e409d07: 8315696: SignedLoggerFinderTest.java test failed
  • ab6a87e: 8314838: 3 compiler tests ignore vm flags
  • b3dfc39: 8315930: Revert "8315220: Event NativeLibraryLoad breaks invariant by taking a stacktrace when thread is in state _thread_in_native"
  • ebc718f: 8315818: vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.java fails on libgraal
  • 4a6bd81: 8315854: G1: Remove obsolete comment in G1ReclaimEmptyRegionsTask
  • c664f1c: 8307352: AARCH64: Improve itable_stub
  • 8ddf9ea: 8315686: G1: Disallow evacuation of marking regions in a Prepare Mixed gc
  • 7ef059a: 8315605: G1: Add number of nmethods in code roots scanning statistics
  • 825e0ed: 8315774: Enable parallelism in vmTestbase/gc/g1/unloading tests
  • dac1727: 8308869: C2: use profile data in subtype checks when profile has more than one class
  • ... and 21 more: https://git.openjdk.org/jdk/compare/9887cd8adc408a71b045b1a4891cc0d5dede7e0e...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 added the ready Pull request is ready to be integrated label Sep 7, 2023
@@ -59,6 +59,7 @@ class PlatformProps {
static final boolean TARGET_ARCH_IS_RISCV64 = "@@OPENJDK_TARGET_CPU@@" == "riscv64";
static final boolean TARGET_ARCH_IS_LOONGARCH64 = "@@OPENJDK_TARGET_CPU@@" == "loongarch64";
static final boolean TARGET_ARCH_IS_S390 = "@@OPENJDK_TARGET_CPU@@" == "s390";
static final boolean TARGET_ARCH_IS_PPC32 = "@@OPENJDK_TARGET_CPU@@" == "ppc";
Copy link
Contributor

Choose a reason for hiding this comment

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

The list is getting longer. I'd suggest/request that all the enums be resorted alphabetically. (now or later).

Copy link
Member Author

Choose a reason for hiding this comment

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

I think later? Don't want to keep retesting the PR for accidental problems during reshuffle :)

Copy link
Member Author

Choose a reason for hiding this comment

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

Agreed, @RogerRiggs? If so, please approve.

Aside, I am planning to bring the stack of relevant backports to 21u, to unbreak it there.

@shipilev
Copy link
Member Author

shipilev commented Sep 7, 2023

Yeah, so as I see from GHA testing:

STARTED    ArchTest::checkParams '[8] ppc, PPC32, 32, BIG_ENDIAN, false'
java.lang.IllegalArgumentException: No enum constant jdk.internal.util.Architecture.PPC
	at java.base/java.lang.Enum.valueOf(Enum.java:293)
	at java.base/jdk.internal.util.Architecture.valueOf(Architecture.java:39)
	at java.base/jdk.internal.util.Architecture.lookupByName(Architecture.java:99)
	at ArchTest.checkParams(ArchTest.java:120)
	at java.base/jdk.internal.reflect.DirectMethodHandleAccessor.invoke(DirectMethodHandleAccessor.java:103)
	at java.base/java.lang.reflect.Method.invoke(Method.java:580)

And AFAICS, we cannot change to ppc32 here, because the test would verify that enum names are consistent with os.arch. Which would be ppc, based on build system pick. Therefore, we cannot do PPC32. I reverted the previous commit...

This reverts commit d829d24.
@shipilev
Copy link
Member Author

shipilev commented Sep 8, 2023

@TheRealMDoerr, PPC32 did not work out, see above. Still good to go in in current form?

@TheRealMDoerr
Copy link
Contributor

TheRealMDoerr commented Sep 8, 2023

I can live with it. Hoping that not too many people get confused by isPPC() returning false on PPC64.

Copy link
Contributor

@RogerRiggs RogerRiggs left a comment

Choose a reason for hiding this comment

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

Looks ok with PPC == PPC 32

@shipilev
Copy link
Member Author

shipilev commented Sep 8, 2023

Thanks!

/integrate

@openjdk
Copy link

openjdk bot commented Sep 8, 2023

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

  • e409d07: 8315696: SignedLoggerFinderTest.java test failed
  • ab6a87e: 8314838: 3 compiler tests ignore vm flags
  • b3dfc39: 8315930: Revert "8315220: Event NativeLibraryLoad breaks invariant by taking a stacktrace when thread is in state _thread_in_native"
  • ebc718f: 8315818: vmTestbase/nsk/jvmti/Allocate/alloc001/alloc001.java fails on libgraal
  • 4a6bd81: 8315854: G1: Remove obsolete comment in G1ReclaimEmptyRegionsTask
  • c664f1c: 8307352: AARCH64: Improve itable_stub
  • 8ddf9ea: 8315686: G1: Disallow evacuation of marking regions in a Prepare Mixed gc
  • 7ef059a: 8315605: G1: Add number of nmethods in code roots scanning statistics
  • 825e0ed: 8315774: Enable parallelism in vmTestbase/gc/g1/unloading tests
  • dac1727: 8308869: C2: use profile data in subtype checks when profile has more than one class
  • ... and 21 more: https://git.openjdk.org/jdk/compare/9887cd8adc408a71b045b1a4891cc0d5dede7e0e...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Sep 8, 2023

@shipilev Pushed as commit 9559e03.

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