8304681: compiler/sharedstubs/SharedStubToInterpTest.java fails after JDK-8304387 by zhengxiaolinX · Pull Request #13135 · openjdk/jdk

zhengxiaolinX · 2023-03-22T05:14:21Z

Please review this test fix for JDK-8304387 after RFR.

Instead of specifying shared stubs' locations in this test, we could check if two or more relocations combined with each of them in this test, same as the other test SharedTrampolineTest.java. The counting logic is aligned with SharedTrampolineTest.java. Printing relocation stuff requires debug version vm, so this test is changed to debug only. Also some minor cleanups for the tests.

Apologies for the tier2 failure. I mainly focused on if there were new hs_errs when working on JDK-8304387. :-(

I am now confirming if the comment "Static stubs must be created at the end of the Stub section" could be removed, which needs a little extra time - though I think we can relax such limitations in SharedStubToInterpTest.java.
-- Update on March 27th: comfirmed; please see the JBS issue for the discussion.

Tested x86_64, AArch64 and RISC-V for tests under compiler/sharedstubs folder, and now all passed (release, fastdebug).

Thanks,
Xiaolin

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-8304681: compiler/sharedstubs/SharedStubToInterpTest.java fails after JDK-8304387

Reviewers

Evgeny Astigeevich (@eastig - Committer) ⚠️ Review applies to 3f343c2b
Vladimir Kozlov (@vnkozlov - Reviewer) ⚠️ Review applies to 3f343c2b
Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13135

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

Using diff file

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

bridgekeeper · 2023-03-22T05:15:52Z

👋 Welcome back xlinzheng! 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 · 2023-03-22T05:18:10Z

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

zhengxiaolinX · 2023-03-27T03:56:26Z

Hi @eastig, would you mind having a look at this simple change of test SharedStubToInterpTest.java? Thank you.

eastig

LGTM

zhengxiaolinX · 2023-03-27T11:53:35Z

Thank you for the review, Evgeny!

mlbridge · 2023-03-27T12:01:28Z

Webrevs

01: Full - Incremental (d5573ac3)
00: Full (3f343c2b)

vnkozlov

Looks good to me too.

openjdk · 2023-03-29T00:26:48Z

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

8304681: compiler/sharedstubs/SharedStubToInterpTest.java fails after JDK-8304387

Reviewed-by: eastigeevich, kvn, shade

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

ff368d5: 8304867: Explicitly disable dtrace for ppc builds
96fa275: 8305112: RISC-V: Typo fix for RVC description
7239150: 8305094: typo (missing *) in doc comment
3fbbfd1: 8301995: Move invokedynamic resolution information out of ConstantPoolCacheEntry
50a995f: 8304927: Update java/net/httpclient/BasicAuthTest.java to check basic auth over HTTP/2
ca745cb: 8291598: Matcher.appendReplacement should not create new StringBuilder instances
1683a63: 8305098: [Backout] JDK-8303912 Clean up JavadocTokenizer
fab2357: 8304498: JShell does not switch to raw mode when there is no /bin/test
1fc218c: 8303912: Clean up JavadocTokenizer
c1f5ca1: 8303623: Compiler should disallow non-standard UTF-8 string encodings
... and 80 more: https://git.openjdk.org/jdk/compare/0deb648985b018653ccdaf193dc13b3cf21c088a...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 (@eastig, @vnkozlov, @shipilev) 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).

zhengxiaolinX · 2023-03-29T02:11:35Z

Thank you for the review, Vladimir!

Only a test fix.
/integrate

openjdk · 2023-03-29T02:13:20Z

@zhengxiaolinX
Your change (at version 3f343c2) is now ready to be sponsored by a Committer.

shipilev · 2023-03-28T16:41:13Z

test/hotspot/jtreg/compiler/sharedstubs/SharedStubToInterpTest.java

+        List<String> addrs = Pattern.compile("\\(static_stub\\) addr=(\\w+) .*\\[static_call=")
+            .matcher(output.getStdout())
+            .results()
+            .map(m -> m.group(1)).toList();


Suggested change

.map(m -> m.group(1)).toList();

.map(m -> m.group(1))

.toList();

shipilev · 2023-03-28T16:41:23Z

test/hotspot/jtreg/compiler/sharedstubs/SharedTrampolineTest.java

            .results()
-            .map(m -> m.group(1))
-            .collect(Collectors.toList());
+            .map(m -> m.group(1)).toList();


Suggested change

.map(m -> m.group(1)).toList();

.map(m -> m.group(1))

.toList();

zhengxiaolinX · 2023-03-29T08:16:12Z

Thank you for the review, Aleksey!

Done; tests still pass on three platforms with the latest change (release and fastdebug build).

Adding the label back.
/integrate

openjdk · 2023-03-29T08:18:27Z

@zhengxiaolinX
Your change (at version d5573ac) is now ready to be sponsored by a Committer.

shipilev · 2023-03-29T08:26:41Z

/sponsor

openjdk · 2023-03-29T08:29:13Z

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

ff368d5: 8304867: Explicitly disable dtrace for ppc builds
96fa275: 8305112: RISC-V: Typo fix for RVC description
7239150: 8305094: typo (missing *) in doc comment
3fbbfd1: 8301995: Move invokedynamic resolution information out of ConstantPoolCacheEntry
50a995f: 8304927: Update java/net/httpclient/BasicAuthTest.java to check basic auth over HTTP/2
ca745cb: 8291598: Matcher.appendReplacement should not create new StringBuilder instances
1683a63: 8305098: [Backout] JDK-8303912 Clean up JavadocTokenizer
fab2357: 8304498: JShell does not switch to raw mode when there is no /bin/test
1fc218c: 8303912: Clean up JavadocTokenizer
c1f5ca1: 8303623: Compiler should disallow non-standard UTF-8 string encodings
... and 80 more: https://git.openjdk.org/jdk/compare/0deb648985b018653ccdaf193dc13b3cf21c088a...master

Your commit was automatically rebased without conflicts.

openjdk · 2023-03-29T08:29:31Z

@shipilev @zhengxiaolinX Pushed as commit 0985288.

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

Test fixes after JDK-8304387

3f343c2

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Mar 22, 2023

zhengxiaolinX changed the title ~~compiler/sharedstubs/SharedStubToInterpTest.java fails after JDK-8304387~~ 8304681: compiler/sharedstubs/SharedStubToInterpTest.java fails after JDK-8304387 Mar 22, 2023

eastig approved these changes Mar 27, 2023

View reviewed changes

zhengxiaolinX marked this pull request as ready for review March 27, 2023 11:53

openjdk bot added the rfr Pull request is ready for review label Mar 27, 2023

vnkozlov approved these changes Mar 29, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Mar 29, 2023

openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 29, 2023

shipilev approved these changes Mar 29, 2023

View reviewed changes

Aleksey's code style suggestions

d5573ac

openjdk bot removed the sponsor Pull request is ready to be sponsored label Mar 29, 2023

shipilev approved these changes Mar 29, 2023

View reviewed changes

openjdk bot added the sponsor Pull request is ready to be sponsored label Mar 29, 2023

openjdk bot added the integrated Pull request has been integrated label Mar 29, 2023

openjdk bot closed this Mar 29, 2023

openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Mar 29, 2023

openjdk bot removed the sponsor Pull request is ready to be sponsored label Mar 29, 2023

	.map(m -> m.group(1)).toList();
	.map(m -> m.group(1))
	.toList();

Conversation

zhengxiaolinX commented Mar 22, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Progress

Issue

Reviewers

Reviewing

Uh oh!

bridgekeeper bot commented Mar 22, 2023

Uh oh!

openjdk bot commented Mar 22, 2023

Uh oh!

zhengxiaolinX commented Mar 27, 2023

Uh oh!

eastig left a comment

Choose a reason for hiding this comment

Uh oh!

zhengxiaolinX commented Mar 27, 2023

Uh oh!

mlbridge bot commented Mar 27, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Webrevs

Uh oh!

vnkozlov left a comment

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Mar 29, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

zhengxiaolinX commented Mar 29, 2023

Uh oh!

openjdk bot commented Mar 29, 2023

Uh oh!

shipilev Mar 28, 2023

Choose a reason for hiding this comment

Uh oh!

shipilev Mar 28, 2023

Choose a reason for hiding this comment

Uh oh!

zhengxiaolinX commented Mar 29, 2023

Uh oh!

openjdk bot commented Mar 29, 2023

Uh oh!

shipilev commented Mar 29, 2023

Uh oh!

openjdk bot commented Mar 29, 2023

Uh oh!

openjdk bot commented Mar 29, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

4 participants

zhengxiaolinX commented Mar 22, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Mar 27, 2023 •

edited

Loading

openjdk bot commented Mar 29, 2023 •

edited

Loading