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

8318834: s390x: Debug builds are missing debug helpers #16365

Closed
wants to merge 1 commit into from

Conversation

theRealAph
Copy link
Contributor

@theRealAph theRealAph commented Oct 25, 2023

On s390x only, HotSpot is built by GCC with -ffunction-sections.
This means that debug helpers such as ps() and pfl() are not available. These helpers are extremely useful in debugging, so it makes no sense to omit them from debug builds.


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-8318834: s390x: Debug builds are missing debug helpers (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16365

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 25, 2023

👋 Welcome back aph! 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 Oct 25, 2023
@openjdk
Copy link

openjdk bot commented Oct 25, 2023

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

  • build

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 build build-dev@openjdk.org label Oct 25, 2023
@mlbridge
Copy link

mlbridge bot commented Oct 25, 2023

Webrevs

@theRealAph theRealAph changed the title 8318834: Debug builds are missing debug helpers 8318834: s390x: Debug builds are missing debug helpers Oct 25, 2023
Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

The comment in the block says:

    # do this on s390x also for libjvm (where serviceability agent is not supported)

...which I read as "if we enable this, SA would break". Does serviceability/sa pass in both release and fastdebug with this change?

@shipilev
Copy link
Member

The block in question also works when link-time gc is enabled, which is only so on s390x by default:

# should we linktime gc unused code sections in the JDK build ?
if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = xs390x; then
LINKTIME_GC_DEFAULT=true
else
LINKTIME_GC_DEFAULT=false
fi

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 (and seems helpful).
Those link-time options had been introduced many years ago in an effort to trim binary sizes. The serviceability agent was never ported to s390x.

@openjdk
Copy link

openjdk bot commented Oct 26, 2023

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

8318834: s390x: Debug builds are missing debug helpers

Reviewed-by: shade, lucy

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

  • 40a3c35: 8318723: RISC-V: C2 UDivL
  • 3885dc5: 8318737: Fallback linker passes bad JNI handle
  • 9864951: 8318447: Move NMT source code to own subdirectory
  • 744e089: 8318700: MacOS Zero cannot run gtests due to wrong JVM path
  • ec1bf23: 8318801: Parallel: Remove unused verify_all_young_refs_precise
  • 3cea892: 8318805: RISC-V: Wrong comments instructions cost in riscv.ad
  • bc1ba24: 8316437: JFR: assert(!tl->has_java_buffer()) failed: invariant
  • 970cd20: 8318788: java/net/Socks/SocksSocketProxySelectorTest.java fails on machines with no IPv6 link-local addresses
  • 37c40a1: 8318705: [macos] ProblemList java/rmi/registry/multipleRegistries/MultipleRegistries.java
  • 723db2d: 8305321: Remove unused exports in java.desktop
  • ... and 7 more: https://git.openjdk.org/jdk/compare/9e98ee6726a7762cce9dae85e2e1b4ca9527fc3c...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 Oct 26, 2023
@theRealAph
Copy link
Contributor Author

The block in question also works when link-time gc is enabled, which is only so on s390x by default:

# should we linktime gc unused code sections in the JDK build ?
if test "x$OPENJDK_TARGET_OS" = "xlinux" && test "x$OPENJDK_TARGET_CPU" = xs390x; then
LINKTIME_GC_DEFAULT=true
else
LINKTIME_GC_DEFAULT=false
fi

It does, but without functions-as-sections link-time GC has no effect.

Copy link
Member

@shipilev shipilev left a comment

Choose a reason for hiding this comment

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

All right, so this is a fix that is S390X specific. I missed that, I thought we were talking about generic debug builds. Okay then!

@theRealAph
Copy link
Contributor Author

The comment in the block says:

    # do this on s390x also for libjvm (where serviceability agent is not supported)

...which I read as "if we enable this, SA would break". Does serviceability/sa pass in both release and fastdebug with this change?

I read it as meaning "we don't enable the helpers, because without serviceability agent there's no point in having them. Which is very far from the truth.

As you might expect, SA tests don't run on s390:

   TEST                                              TOTAL  PASS  FAIL ERROR   
   jtreg:test/hotspot/jtreg/serviceability/sa            0     0     0     0   

I don't think they're specificially excluded on s390.

@theRealAph
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Oct 26, 2023

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

  • 40a3c35: 8318723: RISC-V: C2 UDivL
  • 3885dc5: 8318737: Fallback linker passes bad JNI handle
  • 9864951: 8318447: Move NMT source code to own subdirectory
  • 744e089: 8318700: MacOS Zero cannot run gtests due to wrong JVM path
  • ec1bf23: 8318801: Parallel: Remove unused verify_all_young_refs_precise
  • 3cea892: 8318805: RISC-V: Wrong comments instructions cost in riscv.ad
  • bc1ba24: 8316437: JFR: assert(!tl->has_java_buffer()) failed: invariant
  • 970cd20: 8318788: java/net/Socks/SocksSocketProxySelectorTest.java fails on machines with no IPv6 link-local addresses
  • 37c40a1: 8318705: [macos] ProblemList java/rmi/registry/multipleRegistries/MultipleRegistries.java
  • 723db2d: 8305321: Remove unused exports in java.desktop
  • ... and 7 more: https://git.openjdk.org/jdk/compare/9e98ee6726a7762cce9dae85e2e1b4ca9527fc3c...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Oct 26, 2023

@theRealAph Pushed as commit e1a458e.

💡 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
build build-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants