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

8347721: Replace SIZE_FORMAT in compiler directories #23108

Closed
wants to merge 1 commit into from

Conversation

coleenp
Copy link
Contributor

@coleenp coleenp commented Jan 14, 2025

Please review this change to replace SIZE_FORMAT with %zu in the code and opto directories. There weren't very many. Most were done with a script with almost no hand-editing.

Tested just now with tier1-4 on x86 and aarch64.


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-8347721: Replace SIZE_FORMAT in compiler directories (Sub-task - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 23108

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

Using diff file

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

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 14, 2025

👋 Welcome back coleenp! 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 Jan 14, 2025

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

8347721: Replace SIZE_FORMAT in compiler directories

Reviewed-by: kvn, dlong

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

  • 10d08db: 8346142: [perf] scalability issue for the specjvm2008::xml.validation workload
  • 9b1bed0: 8290043: serviceability/attach/ConcAttachTest.java failed "guarantee(!CheckJNICalls) failed: Attached JNI thread exited without being detached"
  • 2de71d0: 8347129: cpuset cgroups controller is required for no good reason
  • 4c30933: 8346971: [ubsan] psCardTable.cpp:131:24: runtime error: large index is out of bounds
  • 06ff4c1: 8347146: Convert IncludeLocalesPluginTest to use JUnit
  • db76f47: 8347720: [BACKOUT] Portable implementation of FORBID_C_FUNCTION and ALLOW_C_FUNCTION
  • e6902cf: 8323740: java.lang.ExceptionInInitializerError when trying to load XML classes in wrong order
  • a01e92c: 8347724: Replace SIZE_FORMAT in jfr directory
  • d002933: 8347286: (fs) Remove some extensions from java/nio/file/Files/probeContentType/Basic.java
  • d532019: 8347143: [aix] Fix strdup use in os::dll_load
  • ... and 4 more: https://git.openjdk.org/jdk/compare/b4cd3b12967688d78028f548db76d24cfe654614...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 rfr Pull request is ready for review label Jan 14, 2025
@openjdk
Copy link

openjdk bot commented Jan 14, 2025

@coleenp 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 Jan 14, 2025
@coleenp
Copy link
Contributor Author

coleenp commented Jan 14, 2025

/label add hotspot-runtime

@openjdk openjdk bot added the hotspot-runtime hotspot-runtime-dev@openjdk.org label Jan 14, 2025
@openjdk
Copy link

openjdk bot commented Jan 14, 2025

@coleenp
The hotspot-runtime label was successfully added.

@mlbridge
Copy link

mlbridge bot commented Jan 14, 2025

Webrevs

@vnkozlov
Copy link
Contributor

@coleenp is this change is also affected by JDK-8347627?

@coleenp
Copy link
Contributor Author

coleenp commented Jan 14, 2025

No JDK-8347627 replaced a INTX_FORMAT_X macro in the ciMethodData file with %#zx but the behavior of the # was not what we expected when the value is zero. Instead of 0x0 it was just 0. The failure was in tier2. I have the fix for JDK-8347627 in this already.

Copy link
Contributor

@vnkozlov vnkozlov 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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 14, 2025
@coleenp
Copy link
Contributor Author

coleenp commented Jan 14, 2025

Thanks Vladimir. Trivial?

@vnkozlov
Copy link
Contributor

Okay, trivial but wait when GHA testing finished.

@dean-long
Copy link
Member

One measure of "trivial" could be when the generated binaries match before and after, which should apply here.

@coleenp
Copy link
Contributor Author

coleenp commented Jan 15, 2025

Thanks for reviewing Vladimir and Dean. Maybe too many lines changed to be trivial. GHA passed.
/integrate

@openjdk
Copy link

openjdk bot commented Jan 15, 2025

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

  • af3f5d8: 8347039: ThreadPerTaskExecutor terminates if cancelled tasks still running
  • 91197b3: 8347531: The signal tests are failing after JDK-8345782 due to an unrelated warning
  • 4f3dc9d: 8347352: RISC-V: Cleanup bitwise AND assembler routines
  • afc4529: 8346834: Tests failing with -XX:+UseNUMA due to "NUMA support disabled" warning
  • a3be97e: 8347761: Test tools/jimage/JImageExtractTest.java fails after JDK-8303884
  • 28e01e6: 8347762: ClassFile attribute specification refers to non-SE modules
  • be1cdd9: 8344140: Refactor the discovery of AOT cache artifacts
  • 973c630: 8342466: Improve API documentation for java.lang.classfile.attribute
  • 9782bfd: 8347620: Shenandoah: Use 'free' tag for free set related logging
  • 35be4a4: 8347173: java/net/DatagramSocket/InterruptibleDatagramSocket.java fails with virtual thread factory
  • ... and 19 more: https://git.openjdk.org/jdk/compare/b4cd3b12967688d78028f548db76d24cfe654614...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jan 15, 2025

@coleenp Pushed as commit c36200b.

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

@coleenp coleenp deleted the zmod-share-compiler branch January 15, 2025 12:19
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 hotspot-runtime hotspot-runtime-dev@openjdk.org integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

3 participants