Skip to content

Conversation

@sviswa7
Copy link

@sviswa7 sviswa7 commented May 31, 2022

Fixed the assertion in load_iota_indices when the length passed is less than 4.
Also fixed the missing break in x86.ad match_rule_supported_vector() for PopulateIndex case.


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-8287517: C2: assert(vlen_in_bytes == 64) failed: 2

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 8961

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented May 31, 2022

👋 Welcome back sviswanathan! 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
Copy link

openjdk bot commented May 31, 2022

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

@sviswa7 sviswa7 marked this pull request as ready for review May 31, 2022 23:07
@openjdk openjdk bot added the rfr Pull request is ready for review label May 31, 2022
@mlbridge
Copy link

mlbridge bot commented May 31, 2022

Webrevs

@DamonFool
Copy link
Member

Shall we make a jtreg test for this fix?
Thanks.

@chhagedorn
Copy link
Member

Shall we make a jtreg test for this fix? Thanks.

That would be helpful. @sviswa7 I've attached a simpler reproducer to the JBS bug extracted from the full fuzzer test.

@sviswa7
Copy link
Author

sviswa7 commented Jun 2, 2022

@chhagedorn Thanks a lot. I will look into creating a jtreg based on the simpler reproducer.

Copy link
Contributor

@vnkozlov vnkozlov 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. Waiting new test.

@sviswa7
Copy link
Author

sviswa7 commented Jun 3, 2022

@vnkozlov @chhagedorn @DamonFool I have added the regression test. Please take a look.

* @bug 8287517
* @summary Test bug fix for JDK-8287517 related to fuzzer test failure in x86_64
* @requires vm.compiler2.enabled
* @requires (os.simpleArch == "x64" & vm.cpu.features ~= ".*avx2.*") |
Copy link
Member

Choose a reason for hiding this comment

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

Maybe, we can remove this require so that other platforms can also get tested.

Copy link
Author

Choose a reason for hiding this comment

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

@DamonFool I removed requires from the test as you suggested. Thanks.

Copy link
Member

@DamonFool DamonFool left a comment

Choose a reason for hiding this comment

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

LGTM
Thanks for the update.

@openjdk
Copy link

openjdk bot commented Jun 3, 2022

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

8287517: C2: assert(vlen_in_bytes == 64) failed: 2

Reviewed-by: kvn, jiefu, chagedorn, fgao

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

  • ce5ae51: 8287637: Loom: Mismatched VirtualThread::state accessor
  • 59e9700: 8252717: Integrate/merge legacy standard doclet diagnostics and doclint
  • 28c112f: 8287685: [BACKOUT] JDK-8287384 Speed up jdk.test.lib.util.ForceGC
  • 34bb0a5: 8287734: Shenandoah: Consolidate marking closures
  • 33b9d77: 8287729: Loom: Check alternative implementation on x86_32
  • a75299c: 8287686: Add assertion to ensure that disarm value offset < 128
  • 407abf5: 8233477: [Win LAF]The tooltip doesn't display correctly in Win LAF
  • 625821d: 8287661: Fix and improve BitMap::print_on(outputStream*)
  • b544b8b: 8276789: Support C++ lambda in ResourceHashtable::iterate
  • ba9ee8c: 8287748: Fix issues in java.lang.foreign package javadoc
  • ... and 45 more: https://git.openjdk.java.net/jdk/compare/97bd4c255a319ce626a316ed211ef1fd7d0f1e14...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.

➡️ 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 Jun 3, 2022
Copy link
Contributor

@vnkozlov vnkozlov 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. I submitted testing.

@sviswa7
Copy link
Author

sviswa7 commented Jun 3, 2022

Thanks a lot @vnkozlov @DamonFool.

@vnkozlov
Copy link
Contributor

vnkozlov commented Jun 3, 2022

Testing results are good. You can push.

Copy link
Member

@chhagedorn chhagedorn left a comment

Choose a reason for hiding this comment

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

Otherwise, looks good! Thanks for adding a test.


package compiler.vectorization;

public class cr8287517 {
Copy link
Member

Choose a reason for hiding this comment

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

Please rename the test to something that describes the problem you are writing this test for instead of just using the bug number.

Copy link
Author

Choose a reason for hiding this comment

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

@chhagedorn Thanks, changed test name to TestSmallVectorPopIndex.java.

@sviswa7
Copy link
Author

sviswa7 commented Jun 3, 2022

Thanks a lot @vnkozlov.

@sviswa7
Copy link
Author

sviswa7 commented Jun 3, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jun 3, 2022

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

  • ce5ae51: 8287637: Loom: Mismatched VirtualThread::state accessor
  • 59e9700: 8252717: Integrate/merge legacy standard doclet diagnostics and doclint
  • 28c112f: 8287685: [BACKOUT] JDK-8287384 Speed up jdk.test.lib.util.ForceGC
  • 34bb0a5: 8287734: Shenandoah: Consolidate marking closures
  • 33b9d77: 8287729: Loom: Check alternative implementation on x86_32
  • a75299c: 8287686: Add assertion to ensure that disarm value offset < 128
  • 407abf5: 8233477: [Win LAF]The tooltip doesn't display correctly in Win LAF
  • 625821d: 8287661: Fix and improve BitMap::print_on(outputStream*)
  • b544b8b: 8276789: Support C++ lambda in ResourceHashtable::iterate
  • ba9ee8c: 8287748: Fix issues in java.lang.foreign package javadoc
  • ... and 45 more: https://git.openjdk.java.net/jdk/compare/97bd4c255a319ce626a316ed211ef1fd7d0f1e14...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 3, 2022

@sviswa7 Pushed as commit a0219da.

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

@sviswa7 sviswa7 deleted the JDK-8287517 branch June 3, 2024 21:29
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

hotspot-compiler [email protected] integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

5 participants