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

8307651: RISC-V: stringL_indexof_char instruction has wrong format string #13881

Closed
wants to merge 2 commits into from

Conversation

feilongjiang
Copy link
Member

@feilongjiang feilongjiang commented May 9, 2023

Hi.

Can I have reviews for this trivial patch that fixes a typo in the format of stringL_indexof_char instruction? It should be StringLatin1 instead of StringUTF16 for StrIntrinsicNode::L.

instruct stringL_indexof_char(iRegP_R11 str1, iRegI_R12 cnt1, iRegI_R13 ch,
                              iRegI_R10 result, iRegINoSp tmp1, iRegINoSp tmp2,
                              iRegINoSp tmp3, iRegINoSp tmp4, rFlagsReg cr)
%{
  match(Set result (StrIndexOfChar (Binary str1 cnt1) ch));
  predicate(!UseRVV && (((StrIndexOfCharNode*)n)->encoding() == StrIntrinsicNode::L));
  effect(USE_KILL str1, USE_KILL cnt1, USE_KILL ch, TEMP_DEF result,
         TEMP tmp1, TEMP tmp2, TEMP tmp3, TEMP tmp4, KILL cr);

  format %{ "StringUTF16 IndexOf char[] $str1,$cnt1,$ch -> $result" %} ====> Should be StringLatin1 here.
  ins_encode %{
    __ string_indexof_char($str1$$Register, $cnt1$$Register, $ch$$Register,
                           $result$$Register, $tmp1$$Register, $tmp2$$Register,
                           $tmp3$$Register, $tmp4$$Register, true /* isL */);
  %}
  ins_pipe(pipe_class_memory);
%}

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-8307651: RISC-V: stringL_indexof_char instruction has wrong format string

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 13881

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented May 9, 2023

👋 Welcome back fjiang! 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 openjdk bot added the rfr Pull request is ready for review label May 9, 2023
@openjdk
Copy link

openjdk bot commented May 9, 2023

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

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label May 9, 2023
@mlbridge
Copy link

mlbridge bot commented May 9, 2023

Webrevs

Copy link
Member

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

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

Looks good. You might want to leave a space among the operands both for 'stringU_indexof_char' and 'stringL_indexof_char'.

@openjdk
Copy link

openjdk bot commented May 9, 2023

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

8307651: RISC-V: stringL_indexof_char instruction has wrong format string

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

  • f5a6b7f: 8306027: Clarify JVMTI heap functions spec about virtual thread stack.
  • a1c3adb: 8307370: Add tier1 testing with thread factory in CI
  • 356667f: 8307466: java.time.Instant calculation bug in until and between methods
  • 723582c: 8306881: Update FreeType to 2.13.0
  • 9829424: 8307128: Open source some drag and drop tests 4
  • 7f05f6f: 8307307: Improve ProcessTools.java to don't try to run Virtual wrapper for incompatible processes
  • dde557e: 8304148: Remapping a class with Invokedynamic constant loses static bootstrap arguments
  • 82bcee7: 8159337: Introduce a method in Locale class to return the language tags as per RFC 5646 convention
  • 3aff5ea: 8307486: ProcessTools.java should wait until vthread is completed before checking exceptions
  • 44fa12e: 8303830: update for deprecated sprintf for jdk.accessibility
  • ... and 9 more: https://git.openjdk.org/jdk/compare/07f55c5ea280032b72247049223f676424aa44c0...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 (@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).

@openjdk openjdk bot added the ready Pull request is ready to be integrated label May 9, 2023
@feilongjiang
Copy link
Member Author

Looks good. You might want to leave a space among the operands both for 'stringU_indexof_char' and 'stringL_indexof_char'.

Thanks for the review! I have added some spaces among the operands.

Copy link
Member

@RealFYang RealFYang left a comment

Choose a reason for hiding this comment

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

Thanks for the update.

@feilongjiang feilongjiang changed the title 8307651: RISC-V: Correct format typo for stringL_indexof_char instruction 8307651: RISC-V: stringL_indexof_char instruction has wrong format string May 9, 2023
@openjdk openjdk bot added ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated labels May 9, 2023
@feilongjiang
Copy link
Member Author

/integrate

@openjdk openjdk bot added the sponsor Pull request is ready to be sponsored label May 10, 2023
@openjdk
Copy link

openjdk bot commented May 10, 2023

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

@openjdk openjdk bot added ready Pull request is ready to be integrated and removed ready Pull request is ready to be integrated labels May 10, 2023
@RealFYang
Copy link
Member

/sponsor

@openjdk
Copy link

openjdk bot commented May 10, 2023

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

  • 2be1f10: 8307399: get rid of compatibility ThreadStart/ThreadEnd events for virtual threads
  • f5a6b7f: 8306027: Clarify JVMTI heap functions spec about virtual thread stack.
  • a1c3adb: 8307370: Add tier1 testing with thread factory in CI
  • 356667f: 8307466: java.time.Instant calculation bug in until and between methods
  • 723582c: 8306881: Update FreeType to 2.13.0
  • 9829424: 8307128: Open source some drag and drop tests 4
  • 7f05f6f: 8307307: Improve ProcessTools.java to don't try to run Virtual wrapper for incompatible processes
  • dde557e: 8304148: Remapping a class with Invokedynamic constant loses static bootstrap arguments
  • 82bcee7: 8159337: Introduce a method in Locale class to return the language tags as per RFC 5646 convention
  • 3aff5ea: 8307486: ProcessTools.java should wait until vthread is completed before checking exceptions
  • ... and 10 more: https://git.openjdk.org/jdk/compare/07f55c5ea280032b72247049223f676424aa44c0...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label May 10, 2023
@openjdk openjdk bot closed this May 10, 2023
@openjdk 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 May 10, 2023
@openjdk
Copy link

openjdk bot commented May 10, 2023

@RealFYang @feilongjiang Pushed as commit d3e6d04.

💡 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
Labels
hotspot-compiler hotspot-compiler-dev@openjdk.org integrated Pull request has been integrated
2 participants