8330806: test/hotspot/jtreg/compiler/c1/TestLargeMonitorOffset.java fails on ARM32 #18891

voitylov · 2024-04-22T14:21:09Z

TestLargeMonitorOffset was introduced by 8310844 with a fix for the AArch64 platform. The same issue needs to be fixed for ARM32. With this change, we add the large slot_offset handling to the ARM32 version of IR_Assembler::osr_entry().

Testing: jtreg hotspot, jtreg jdk tier1-3.

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-8330806: test/hotspot/jtreg/compiler/c1/TestLargeMonitorOffset.java fails on ARM32 (Bug - P3)

Reviewers

Sergey Nazarkin (@snazarkin - no project role)
Dmitry Samersoff (@dsamersoff - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 18891

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2024-04-22T14:21:40Z

👋 Welcome back avoitylov! 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 · 2024-04-22T14:21:45Z

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

8330806: test/hotspot/jtreg/compiler/c1/TestLargeMonitorOffset.java fails on ARM32

Reviewed-by: snazarki, dsamersoff

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

b83766e: 8335632: jdk/jfr/api/consumer/streaming/TestJVMExit.java failed with "Process [...] is no longer alive"
7efe160: 8335730: JFR: Clean up jdk.jfr
ff49f67: 8335775: Remove extraneous 's' in comment of rawmonitor.cpp test file
194425d: 8335645: j.u.Formatter#trailingZeros improved with String repeat
c8acea8: 8335706: G1: Remove unused G1ConcurrentRefine::RemSetSamplingClosure::_cset
bdf470b: 8335742: Problemlist gc/g1/TestMixedGCLiveThreshold.java#25percent with virtual threads
6409ec3: 8335711: G1: Remove unused bot_updates argument in G1AllocRegion constructor
4ec1ae1: 8331385: G1: Prefix HeapRegion helper classes with G1
b9d8056: 8332124: Jcmd should recognise options that look like requests for help
cff9e24: 8335493: check_gc_overhead_limit should reset SoftRefPolicy::_should_clear_all_soft_refs
... and 971 more: https://git.openjdk.org/jdk/compare/3e185c70feef3febf75c58a5d4d394a4b772105f...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.

As you do not have Committer status in this project an existing Committer must agree to sponsor your change. Possible candidates are the reviewers of this PR (@dsamersoff) but any other Committer may sponsor as well.

➡️ To flag this PR as ready for integration with the above commit message, type /integrate in a new comment. (Afterwards, your sponsor types /sponsor in a new comment to perform the integration).

openjdk · 2024-04-22T14:22:29Z

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

mlbridge · 2024-04-22T14:26:58Z

Webrevs

00: Full (9799b250)

snazarkin · 2024-04-26T15:22:25Z

src/hotspot/cpu/arm/c1_LIRAssembler_arm.cpp

-    __ ldr(R1, Address(OSR_buf, slot_offset + 0*BytesPerWord));
-    __ ldr(R2, Address(OSR_buf, slot_offset + 1*BytesPerWord));
+    if (slot_offset >= 4096 - BytesPerWord) {
+      __ add_slow(R2, OSR_buf, slot_offset);


Can't we check this once before the loop? Or does such an optimization make no sense?

Hi Sergey. Thanks for looking at this.
This is not performance critical code, and the typical number_of_locks value is 0, so IF inside the FOR loop makes sense here.

snazarkin · 2024-05-07T09:58:29Z

I've checked the patch (one may need to use a workaround ). The JDK crashes without the patch, and passes with the patch.

bridgekeeper · 2024-06-04T14:03:36Z

@voitylov This pull request has been inactive for more than 4 weeks and will be automatically closed if another 4 weeks passes without any activity. To avoid this, simply add a new comment to the pull request. Feel free to ask for assistance if you need help with progressing this pull request towards integration!

dsamersoff

Looks good to me

bulasevich · 2024-07-01T23:15:22Z

Looks good

voitylov · 2024-07-06T08:26:19Z

/integrate

openjdk · 2024-07-06T08:27:09Z

@voitylov
Your change (at version 9799b25) is now ready to be sponsored by a Committer.

dsamersoff · 2024-07-09T10:26:13Z

/sponsor

openjdk · 2024-07-09T10:27:46Z

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

f3ff4f7: 8335882: platform/cgroup/TestSystemSettings.java fails on Alpine Linux
8f62f31: 8335906: [s390x] Test Failure: GTestWrapper.java
2a29647: 8334777: Test javax/management/remote/mandatory/notif/NotifReconnectDeadlockTest.java failed with NullPointerException
564a72e: 8335955: JDK-8335742 wrongly used a "JDK-" prefix in the problemlist bug number
9c7a6ea: 8312125: Refactor CDS enum class handling
bb1f8a1: 8335904: Fix invalid comment in ShenandoahLock
babf6df: 8334757: AssertionError: Missing type variable in where clause
3733fe3: 8335789: [TESTBUG] XparColor.java test fails with Error. Parse Exception: Invalid or unrecognized bugid: @
3a87eb5: 8335126: Shenandoah: Improve OOM handling
284671a: 8335449: runtime/cds/DeterministicDump.java fails with File content different at byte ...
... and 994 more: https://git.openjdk.org/jdk/compare/3e185c70feef3febf75c58a5d4d394a4b772105f...master

Your commit was automatically rebased without conflicts.

openjdk · 2024-07-09T10:27:53Z

@dsamersoff @voitylov Pushed as commit 0e0dfca.

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

JDK-8330806

9799b25

openjdk bot added the rfr Pull request is ready for review label Apr 22, 2024

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Apr 22, 2024

snazarkin reviewed Apr 26, 2024

View reviewed changes

snazarkin approved these changes May 7, 2024

View reviewed changes

dsamersoff approved these changes Jun 25, 2024

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jun 25, 2024

openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 6, 2024

openjdk bot added the integrated Pull request has been integrated label Jul 9, 2024

openjdk bot closed this Jul 9, 2024

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review sponsor Pull request is ready to be sponsored labels Jul 9, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

8330806: test/hotspot/jtreg/compiler/c1/TestLargeMonitorOffset.java fails on ARM32 #18891

8330806: test/hotspot/jtreg/compiler/c1/TestLargeMonitorOffset.java fails on ARM32 #18891

voitylov commented Apr 22, 2024 •

edited by openjdk bot

Loading

bridgekeeper bot commented Apr 22, 2024

openjdk bot commented Apr 22, 2024 •

edited

Loading

openjdk bot commented Apr 22, 2024

mlbridge bot commented Apr 22, 2024

snazarkin Apr 26, 2024 •

edited

Loading

bulasevich May 2, 2024

snazarkin commented May 7, 2024

bridgekeeper bot commented Jun 4, 2024

dsamersoff left a comment

bulasevich commented Jul 1, 2024

voitylov commented Jul 6, 2024

openjdk bot commented Jul 6, 2024

dsamersoff commented Jul 9, 2024

openjdk bot commented Jul 9, 2024

openjdk bot commented Jul 9, 2024

8330806: test/hotspot/jtreg/compiler/c1/TestLargeMonitorOffset.java fails on ARM32 #18891

8330806: test/hotspot/jtreg/compiler/c1/TestLargeMonitorOffset.java fails on ARM32 #18891

Conversation

voitylov commented Apr 22, 2024 • edited by openjdk bot Loading

Progress

Issue

Reviewers

Reviewing

Webrev

bridgekeeper bot commented Apr 22, 2024

openjdk bot commented Apr 22, 2024 • edited Loading

openjdk bot commented Apr 22, 2024

mlbridge bot commented Apr 22, 2024

Webrevs

snazarkin Apr 26, 2024 • edited Loading

Choose a reason for hiding this comment

bulasevich May 2, 2024

Choose a reason for hiding this comment

snazarkin commented May 7, 2024

bridgekeeper bot commented Jun 4, 2024

dsamersoff left a comment

Choose a reason for hiding this comment

bulasevich commented Jul 1, 2024

voitylov commented Jul 6, 2024

openjdk bot commented Jul 6, 2024

dsamersoff commented Jul 9, 2024

openjdk bot commented Jul 9, 2024

openjdk bot commented Jul 9, 2024

voitylov commented Apr 22, 2024 •

edited by openjdk bot

Loading

openjdk bot commented Apr 22, 2024 •

edited

Loading

snazarkin Apr 26, 2024 •

edited

Loading