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

8322816: RISC-V: Incorrect guarantee in patch_vtype #17215

Closed
wants to merge 3 commits into from

Conversation

kimbarrett
Copy link

@kimbarrett kimbarrett commented Jan 2, 2024

Please review this change that fixes a test for a guarantee. This also
removes a -Wparentheses warning when those are enabled (which is how the
problem was discovered).

The problem is that operator precedence groups the sub-expressions differently
than intended. The fix is to override the operator precedence by adding
parentheses to achieve the intended grouping.

Testing: Local (linux-x64) cross-build for linux-riscv with this change plus
-Wparentheses enabled and other changes to allow that to work.

Requesting someone from the riscv porters to properly test this.


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-8322816: RISC-V: Incorrect guarantee in patch_vtype (Bug - P4)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 17215

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 2, 2024

👋 Welcome back kbarrett! 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 Jan 2, 2024
@openjdk
Copy link

openjdk bot commented Jan 2, 2024

@kimbarrett 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 Jan 2, 2024
@mlbridge
Copy link

mlbridge bot commented Jan 2, 2024

Webrevs

@@ -1157,7 +1157,7 @@ static Assembler::SEW elemtype_to_sew(BasicType etype) {

#define patch_vtype(hsb, lsb, vlmul, vsew, vta, vma, vill) \
if (vill == 1) { \
guarantee((vlmul | vsew | vta | vma == 0), \
guarantee((vlmul | vsew | vta | vma) == 0, \
Copy link
Member

Choose a reason for hiding this comment

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

I see the vill parameter is always false in current code, which means this guarantee never gets excecuted. And I don't think we would make use of the vill field of vtype in future. So I personally perfer to remove this guarantee and its enclosing if block for now.

Copy link
Author

Choose a reason for hiding this comment

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

Rather than removing the guarantee, wouldn't it be better to guarantee/assert vill == 0?
Although looking at uses, that argument is a bool, so it should be guarantee(!vill, ...).

Copy link
Member

Choose a reason for hiding this comment

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

Hi, Yes, that's better. Maybe: guarantee(!vill, "should be");

Copy link
Author

Choose a reason for hiding this comment

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

I've changed the guarantee as discussed. There are further cleanups possible
here, but I'll leave that to the riscv port maintainers.

@openjdk
Copy link

openjdk bot commented Jan 8, 2024

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

8322816: RISC-V: Incorrect guarantee in patch_vtype

Reviewed-by: fyang, luhenry

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 no new commits pushed to the master branch. If another commit should be pushed before you perform the /integrate command, your PR will be automatically rebased. If you prefer to avoid any potential automatic rebasing, please check the documentation for the /integrate command for further details.

➡️ To integrate this PR with the above commit message to the master branch, type /integrate in a new comment.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 8, 2024
@kimbarrett
Copy link
Author

Waiting for second review.

@kimbarrett
Copy link
Author

Thanks for reviews, @RealFYang and @luhenry .

@kimbarrett
Copy link
Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 10, 2024

Going to push as commit f4ca41a.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 10, 2024
@openjdk openjdk bot closed this Jan 10, 2024
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 10, 2024
@openjdk
Copy link

openjdk bot commented Jan 10, 2024

@kimbarrett Pushed as commit f4ca41a.

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

@kimbarrett kimbarrett deleted the riscv-paren-bug branch January 10, 2024 00:21
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
Development

Successfully merging this pull request may close these issues.

3 participants