8271528: [lworld] [TESTBUG] Several C2 IR tests fail on AArch64 #515

nick-arm · 2021-08-02T06:45:48Z

The regexes just need to be adjusted slightly for the different opto assembly output. Also removed an unnecessary extra black line after some loadConP instructions which caused match failures.

Test hotspot_valhalla on x86 and AArch64.

Progress

Change must not contain extraneous whitespace

Issue

JDK-8271528: [lworld] [TESTBUG] Several C2 IR tests fail on AArch64

Reviewers

Christian Hagedorn (@chhagedorn - no project role)
Tobias Hartmann (@TobiHartmann - Committer)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/valhalla pull/515/head:pull/515
$ git checkout pull/515

Update a local copy of the PR:
$ git checkout pull/515
$ git pull https://git.openjdk.java.net/valhalla pull/515/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 515

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/valhalla/pull/515.diff

The regexes just need to be adjusted slightly for the different opto assembly output. Also removed an unnecessary extra black line after some loadConP instructions which caused match failures. Test hotspot_valhalla on x86 and AArch64.

bridgekeeper · 2021-08-02T06:46:55Z

👋 Welcome back ngasson! A progress list of the required criteria for merging this PR into lworld will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

openjdk · 2021-08-02T06:48:31Z

@nick-arm 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:

8271528: [lworld] [TESTBUG] Several C2 IR tests fail on AArch64

Reviewed-by: chagedorn, thartmann

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 3 new commits pushed to the lworld branch:

709cb06: 8271234: [lworld] InlineTypeBaseNode::merge_with fails with assert(i < _cnt)
ca9a0bc: 8264340: [lworld] [AArch64] TestLWorld.java assertion failure in OopFlow::build_oop_map
9fe2304: 8271405: [lworld] Redo test/jdk/java/lang/invoke/VarHandles changes for JDK-8269956

Please see this link for an up-to-date comparison between the source branch of this pull request and the lworld branch.
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 (@TobiHartmann) 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).

nick-arm · 2021-08-02T06:48:39Z

@chhagedorn I tried to align this with the changes you made in openjdk/jdk@9856ace

mlbridge · 2021-08-02T06:52:26Z

Webrevs

01: Full - Incremental (6e3412e3)
00: Full (2d646c1e)

chhagedorn

The adaptations look good! @TobiHartmann additionally submitted some testing.

I've just seen that TestUnloadedInlineTypeField is not enabled for aarch64. Was that one missed?

chhagedorn · 2021-08-03T08:34:04Z

test/hotspot/jtreg/compiler/valhalla/inlinetypes/InlineTypes.java

-        protected static final String CHECKCAST_ARRAY = "(cmp.*precise klass \\[(L|Q)compiler/valhalla/inlinetypes/MyValue.*" + END;
-        protected static final String CHECKCAST_ARRAYCOPY = "(.*call_leaf_nofp,runtime  checkcast_arraycopy.*" + END;
-        protected static final String JLONG_ARRAYCOPY = "(.*call_leaf_nofp,runtime  jlong_disjoint_arraycopy.*" + END;
+        protected static final String CHECKCAST_ARRAY = "(((?i:cmp|CLFI|CLR).*" + MYVALUE_KLASS + ".*;:|.*(?i:mov|or).*" + MYVALUE_KLASS + ".*;:.*\\R.*(cmp|CMP|CLR))" + END;


CLFI and CLR is only used for s390 and PPC, respectively. But I guess it does not hurt to keep it that way.

test/hotspot/jtreg/compiler/valhalla/inlinetypes/InlineTypes.java

TobiHartmann · 2021-08-03T09:01:35Z

Testing looks good.

nick-arm · 2021-08-03T10:49:52Z

I've just seen that TestUnloadedInlineTypeField is not enabled for aarch64. Was that one missed?

Thanks, I missed that one. I've enabled too now (passes on AArch64).

nick-arm · 2021-08-04T01:54:11Z

/integrate

openjdk · 2021-08-04T01:55:51Z

@nick-arm
Your change (at version 6e3412e) is now ready to be sponsored by a Committer.

TobiHartmann · 2021-08-04T05:51:49Z

/sponsor

openjdk · 2021-08-04T05:53:17Z

Going to push as commit e13315a.
Since your change was applied there have been 3 commits pushed to the lworld branch:

709cb06: 8271234: [lworld] InlineTypeBaseNode::merge_with fails with assert(i < _cnt)
ca9a0bc: 8264340: [lworld] [AArch64] TestLWorld.java assertion failure in OopFlow::build_oop_map
9fe2304: 8271405: [lworld] Redo test/jdk/java/lang/invoke/VarHandles changes for JDK-8269956

Your commit was automatically rebased without conflicts.

openjdk · 2021-08-04T05:53:35Z

@TobiHartmann @nick-arm Pushed as commit e13315a.

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

openjdk bot added ready rfr labels Aug 2, 2021

chhagedorn approved these changes Aug 3, 2021

View changes

TobiHartmann approved these changes Aug 3, 2021

View changes

Rename variable and add missing test

6e3412e

chhagedorn approved these changes Aug 3, 2021

View changes

TobiHartmann approved these changes Aug 3, 2021

View changes

openjdk bot added the sponsor label Aug 4, 2021

openjdk bot closed this Aug 4, 2021

openjdk bot added integrated and removed ready rfr sponsor labels Aug 4, 2021

8271528: [lworld] [TESTBUG] Several C2 IR tests fail on AArch64 #515

8271528: [lworld] [TESTBUG] Several C2 IR tests fail on AArch64 #515

nick-arm commented Aug 2, 2021 •

edited by openjdk[bot] bot

bridgekeeper bot commented Aug 2, 2021

openjdk bot commented Aug 2, 2021 •

edited

nick-arm commented Aug 2, 2021

mlbridge bot commented Aug 2, 2021 •

edited

chhagedorn left a comment

chhagedorn Aug 3, 2021

TobiHartmann commented Aug 3, 2021

nick-arm commented Aug 3, 2021

nick-arm commented Aug 4, 2021

openjdk bot commented Aug 4, 2021

TobiHartmann commented Aug 4, 2021

openjdk bot commented Aug 4, 2021

openjdk bot commented Aug 4, 2021

8271528: [lworld] [TESTBUG] Several C2 IR tests fail on AArch64 #515

8271528: [lworld] [TESTBUG] Several C2 IR tests fail on AArch64 #515

Conversation

nick-arm commented Aug 2, 2021 • edited by openjdk[bot] bot

Progress

Issue

Reviewers

Reviewing

bridgekeeper bot commented Aug 2, 2021

openjdk bot commented Aug 2, 2021 • edited

nick-arm commented Aug 2, 2021

mlbridge bot commented Aug 2, 2021 • edited

Webrevs

chhagedorn left a comment

chhagedorn Aug 3, 2021

Choose a reason for hiding this comment

TobiHartmann commented Aug 3, 2021

nick-arm commented Aug 3, 2021

nick-arm commented Aug 4, 2021

openjdk bot commented Aug 4, 2021

TobiHartmann commented Aug 4, 2021

openjdk bot commented Aug 4, 2021

openjdk bot commented Aug 4, 2021

nick-arm commented Aug 2, 2021 •

edited by openjdk[bot] bot

openjdk bot commented Aug 2, 2021 •

edited

mlbridge bot commented Aug 2, 2021 •

edited