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

8310974: NMT: Arena diffs miss the scale #14680

Closed
wants to merge 3 commits into from

Conversation

shipilev
Copy link
Member

@shipilev shipilev commented Jun 27, 2023

We noticed this in one of the NMT logs:

Compiler (reserved=175324KB +135838KB, committed=175324KB +135838KB)
    (malloc=29999KB +5558KB #23578 +8965)
    (arena=145325KB +130279 #17 -5)

The +130279 should actually be +130279KB.

I looked at all current uses of diff_in_current_scale and amount_in_current_scale, and all them seem to be printed with scale. So we have only this one spot missing.

Note this also fixes the stray d leftover from JDK-8281213.

Sample excerpt before:

-                  Compiler (reserved=1623KB +453KB, committed=1623KB +453KB)
                            (malloc=16KB +1KB #110 +19)
                            (arena=1608KB +452d #10 +5)

...and after:

-                  Compiler (reserved=220KB -537KB, committed=220KB -537KB)
                            (malloc=25KB +8KB #228 +110)
                            (arena=196KB -546KB #4 -1)

Additional testing:

  • macos-aarch64-server-fastdebug, runtime/NMT

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-8310974: NMT: Arena diffs miss the scale (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14680

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

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

openjdk bot commented Jun 27, 2023

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

  • hotspot-runtime

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

mlbridge bot commented Jun 27, 2023

Webrevs

Copy link
Contributor

@zhengyu123 zhengyu123 left a comment

Choose a reason for hiding this comment

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

LGTM

@openjdk
Copy link

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

8310974: NMT: Arena diffs miss the scale

Reviewed-by: zgu, stuefe

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

  • ef71c32: 8310110: Shenandoah: Trace page sizes
  • c3f10e8: 8307625: Redundant receiver null check in LibraryCallKit::generate_method_call
  • 39c104d: 8310380: Handle problems in core-related tests on macOS when codesign tool does not work
  • 526dba1: 8310130: C2: assert(false) failed: scalar_input is neither phi nor a matchin reduction
  • 48e61c1: 8310728: Enable Zc:inline flag in Visual Studio build
  • 56a73a6: 8309591: Socket.setOption(TCP_QUICKACK) uses wrong level
  • afdaa2a: 8309109: AArch64: [TESTBUG] compiler/intrinsics/sha/cli/TestUseSHA3IntrinsicsOptionOnSupportedCPU.java fails on Neoverse N2 and V1
  • 7f09435: 8310982: jdk/internal/util/ArchTest.java fails after JDK-8308452 failed with Method isARM()
  • f07e396: 8310914: Remove 2 malformed java/foreign ProblemList entries
  • a97f98f: 8310585: GetThreadState spec mentions undefined JVMTI_THREAD_STATE_MONITOR_WAITING
  • ... and 118 more: https://git.openjdk.org/jdk/compare/4229baf9b669ad0af94720cab21a4b80a6ae1c7e...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 Jun 27, 2023
@shipilev
Copy link
Member Author

Thanks, @zhengyu123! Anyone else wants to take a look? @tstuefe, perhaps?

Copy link
Member

@tstuefe tstuefe left a comment

Choose a reason for hiding this comment

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

Good.

@shipilev
Copy link
Member Author

Thank you!

/integrate

@openjdk
Copy link

openjdk bot commented Jun 28, 2023

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

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 28, 2023

@shipilev Pushed as commit 46e4ee1.

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

@shipilev shipilev deleted the JDK-8310974-nmt-arena-scale branch August 10, 2023 08:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
3 participants