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

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

Closed
wants to merge 2 commits into from

Conversation

nick-arm
Copy link
Member

@nick-arm nick-arm commented Aug 2, 2021

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

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
Copy link

bridgekeeper bot commented Aug 2, 2021

👋 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
Copy link

openjdk bot commented Aug 2, 2021

@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
Copy link
Member Author

nick-arm commented Aug 2, 2021

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

@mlbridge
Copy link

mlbridge bot commented Aug 2, 2021

Webrevs

Copy link
Member

@chhagedorn chhagedorn left a comment

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

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

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;
Copy link
Member

@chhagedorn chhagedorn Aug 3, 2021

Choose a reason for hiding this comment

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

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

@TobiHartmann
Copy link
Member

TobiHartmann commented Aug 3, 2021

Testing looks good.

@nick-arm
Copy link
Member Author

nick-arm commented Aug 3, 2021

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
Copy link
Member Author

nick-arm commented Aug 4, 2021

/integrate

@openjdk openjdk bot added the sponsor label Aug 4, 2021
@openjdk
Copy link

openjdk bot commented Aug 4, 2021

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

@TobiHartmann
Copy link
Member

TobiHartmann commented Aug 4, 2021

/sponsor

@openjdk
Copy link

openjdk bot commented Aug 4, 2021

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 openjdk bot closed this Aug 4, 2021
@openjdk
Copy link

openjdk bot commented Aug 4, 2021

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
3 participants