8311923: TestIRMatching.java fails on RISC-V #14848

zifeihan · 2023-07-12T08:39:11Z

Hi, we are experiencing test failures in test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java using fastdebug:

One or more @IR rules failed:

Failed IR Rules (1) of Methods (1)
----------------------------------
1) Method "public java.lang.Object[] ir_framework.tests.CheckCastArray.arrayCopy(java.lang.Object[],java.lang.Class)" - [Failed IR rules: 1]:
   * @IR rule 1: "@compiler.lib.ir_framework.IR(phase={DEFAULT}, applyIfCPUFeatureAnd={}, applyIf={}, applyIfCPUFeatureOr={}, applyIfCPUFeature={}, counts={}, failOn={"_#CHECKCAST_ARRAYCOPY#_"}, applyIfAnd={}, applyIfOr={}, applyIfNot={})"
     > Phase "PrintOptoAssembly":
       - failOn: Graph contains forbidden nodes:
         * Constraint 1: "(.*((?i:call_leaf_nofp,runtime)|CALL,\\s?runtime leaf nofp|BCTRL.*.leaf call).*checkcast_arraycopy.*)"
           - Matched forbidden node:
             * 15a +   CALL, runtime leaf nofp 0x0000003f7fbd9600	#@CallLeafNoFPDirect checkcast_arraycopy

>>> Check stdout for compilation output of the failed methods

Through the description of the problem in the JBS issue, to fix this, we modified the matching rules in test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java and added the mv directive to the matching rules.

Testing:

qemu system and unmatched board:

test/hotspot/jtreg/testlibrary_tests/ir_framework/tests/TestIRMatching.java (fastdebug)

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-8311923: TestIRMatching.java fails on RISC-V (Bug - P4)

Reviewers

Fei Yang (@RealFYang - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 14848

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

Using diff file

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

Webrev

Link to Webrev Comment

bridgekeeper · 2023-07-12T08:40:39Z

👋 Welcome back gcao! 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-07-12T08:41:28Z

@zifeihan 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 · 2023-07-12T08:45:33Z

Webrevs

RealFYang · 2023-07-17T03:48:07Z

test/hotspot/jtreg/compiler/lib/ir_framework/IRNode.java

        String regex = "(.*precise .*" + IS_REPLACED + ":.*\\R((.*(?i:mov|xorl|nop|spill).*|\\s*)\\R)*.*(?i:call,static).*wrapper for: _new_instance_Java" + END;
        optoOnly(ALLOC_OF, regex);
    }



Suggestion: I think it will be safer and more consistent to update regex for ALLOC and ALLOC_OF adding matching for RISC-V mv at the same time.

Suggestion: I think it will be safer and more consistent to update regex for ALLOC and ALLOC_OF adding matching for RISC-V mv at the same time.

Thanks for your review, Fixed.

openjdk · 2023-07-17T04:06:49Z

⚠️ @zifeihan This pull request contains merges that bring in commits not present in the target repository. Since this is not a "merge style" pull request, these changes will be squashed when this pull request in integrated. If this is your intention, then please ignore this message. If you want to preserve the commit structure, you must change the title of this pull request to Merge <project>:<branch> where <project> is the name of another project in the OpenJDK organization (for example Merge jdk:master).

openjdk · 2023-07-17T04:09:59Z

@zifeihan Please do not rebase or force-push to an active PR as it invalidates existing review comments. Note for future reference, the bots always squash all changes into a single commit automatically as part of the integration. See OpenJDK Developers’ Guide for more information.

RealFYang

LGTM.

openjdk · 2023-07-17T06:38:44Z

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

8311923: TestIRMatching.java fails on RISC-V

Reviewed-by: fyang

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 1 new commit pushed to the master branch:

c6ab9c2: 8308103: Massive (up to ~30x) increase in C2 compilation time since JDK 17

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

zifeihan · 2023-07-18T01:34:14Z

@RealFYang Thanks for your review.
/integrate

openjdk · 2023-07-18T01:34:31Z

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

RealFYang · 2023-07-19T13:08:46Z

/sponsor

openjdk · 2023-07-19T13:10:25Z

@RealFYang The PR has been updated since the change author (@zifeihan) issued the integrate command - the author must perform this command again.

zifeihan · 2023-07-19T13:11:36Z

/integrate

openjdk · 2023-07-19T13:12:18Z

@zifeihan
Your change (at version 0c88b1d) is now ready to be sponsored by a Committer.

RealFYang · 2023-07-19T13:13:28Z

/sponsor

openjdk · 2023-07-19T13:14:08Z

Going to push as commit e7adbdb.
Since your change was applied there has been 1 commit pushed to the master branch:

c6ab9c2: 8308103: Massive (up to ~30x) increase in C2 compilation time since JDK 17

Your commit was automatically rebased without conflicts.

openjdk · 2023-07-19T13:14:17Z

@RealFYang @zifeihan Pushed as commit e7adbdb.

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

openjdk bot added the rfr Pull request is ready for review label Jul 12, 2023

openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Jul 12, 2023

RealFYang reviewed Jul 17, 2023

View reviewed changes

8311923: TestIRMatching.java fails on RISC-V

f41ed12

zifeihan force-pushed the JDK-8311923 branch from 9407daf to f41ed12 Compare July 17, 2023 04:09

RealFYang approved these changes Jul 17, 2023

View reviewed changes

openjdk bot added the ready Pull request is ready to be integrated label Jul 17, 2023

openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 18, 2023

Merge branch 'master' into JDK-8311923

56ebf19

openjdk bot removed the sponsor Pull request is ready to be sponsored label Jul 18, 2023

zifeihan added 3 commits July 19, 2023 10:12

Merge remote-tracking branch 'upstream/master' into JDK-8311923

da48fe4

Merge branch 'master' into JDK-8311923

bb46f77

Merge remote-tracking branch 'upstream/master' into JDK-8311923

0c88b1d

openjdk bot added the sponsor Pull request is ready to be sponsored label Jul 19, 2023

openjdk bot added the integrated Pull request has been integrated label Jul 19, 2023

openjdk bot closed this Jul 19, 2023

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 19, 2023

zifeihan deleted the JDK-8311923 branch July 19, 2023 14:56

8311923: TestIRMatching.java fails on RISC-V #14848

8311923: TestIRMatching.java fails on RISC-V #14848

Uh oh!

Conversation

zifeihan commented Jul 12, 2023 • edited by openjdk bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing:

Progress

Issue

Reviewers

Reviewing

Webrev

Uh oh!

bridgekeeper bot commented Jul 12, 2023

Uh oh!

openjdk bot commented Jul 12, 2023

Uh oh!

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

Uh oh!

Webrevs

Uh oh!

RealFYang Jul 17, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

zifeihan Jul 17, 2023

Choose a reason for hiding this comment

Uh oh!

openjdk bot commented Jul 17, 2023

Uh oh!

openjdk bot commented Jul 17, 2023

Uh oh!

RealFYang left a comment

Choose a reason for hiding this comment

Uh oh!

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

Uh oh!

Uh oh!

zifeihan commented Jul 18, 2023

Uh oh!

openjdk bot commented Jul 18, 2023

Uh oh!

RealFYang commented Jul 19, 2023

Uh oh!

openjdk bot commented Jul 19, 2023

Uh oh!

zifeihan commented Jul 19, 2023

Uh oh!

openjdk bot commented Jul 19, 2023

Uh oh!

RealFYang commented Jul 19, 2023

Uh oh!

openjdk bot commented Jul 19, 2023

Uh oh!

openjdk bot commented Jul 19, 2023

Uh oh!

Reviewers

Assignees

Labels

Milestone

Development

Uh oh!

2 participants

zifeihan commented Jul 12, 2023 •

edited by openjdk bot

Loading

mlbridge bot commented Jul 12, 2023 •

edited

Loading

RealFYang Jul 17, 2023 •

edited

Loading

openjdk bot commented Jul 17, 2023 •

edited

Loading