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

8320209: VectorMaskGen clobbers rflags on x86_64 #16680

Closed
wants to merge 1 commit into from

Conversation

sviswa7
Copy link

@sviswa7 sviswa7 commented Nov 15, 2023

VectorMaskGen clobbers rflags on x86_64 but the corresponding instruct in x86.ad file doesn't list the rflags as being killed.
Adding rFlagsReg cr as being killed in effects for vmask_gen instruct.


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-8320209: VectorMaskGen clobbers rflags on x86_64 (Bug - P3)

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 16680

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

Using diff file

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

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Nov 15, 2023

👋 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 Nov 15, 2023

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

@openjdk openjdk bot added the hotspot-compiler hotspot-compiler-dev@openjdk.org label Nov 15, 2023
@sviswa7 sviswa7 marked this pull request as ready for review November 15, 2023 23:27
@openjdk openjdk bot added the rfr Pull request is ready for review label Nov 15, 2023
@mlbridge
Copy link

mlbridge bot commented Nov 15, 2023

Webrevs

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.

@openjdk
Copy link

openjdk bot commented Nov 15, 2023

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

8320209: VectorMaskGen clobbers rflags on x86_64

Reviewed-by: kvn, qamai, jbhateja

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

  • f0b7eb5: 8304020: Speed up test/jdk/java/util/zip/ZipFile/TestTooManyEntries.java and clarify its purpose
  • ffa35d8: 8301997: Move method resolution information out of the cpCache
  • 891d8cf: 8319986: Invalid/inconsistent description and example for DateFormat
  • 536b1ce: 8320130: Problemlist 2 vmTestbase/nsk/jdi/StepRequest/addClassFilter_rt tests with Xcomp

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.

➡️ 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 Nov 15, 2023
@sviswa7
Copy link
Author

sviswa7 commented Nov 16, 2023

Thanks a lot @vnkozlov for the review.

Copy link
Member

@merykitty merykitty left a comment

Choose a reason for hiding this comment

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

Looks trivial

@sviswa7
Copy link
Author

sviswa7 commented Nov 16, 2023

Thanks for the reviews!

/integrate

@openjdk
Copy link

openjdk bot commented Nov 16, 2023

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

  • f3ed275: 8319103: Popups that request focus are not shown on Linux with Wayland
  • 9e7a3ae: 8319630: Monitor final audit log lacks separator
  • 87be6b6: 8318757: VM_ThreadDump asserts in interleaved ObjectMonitor::deflate_monitor calls
  • 9faead1: 8319927: Log that IEEE rounding mode was corrupted by loading a library
  • f33c874: 8319764: C2 compilation asserts during incremental inlining because Phi input is out of bounds
  • 6868b37: 8318826: C2: "Bad graph detected in build_loop_late" with incremental inlining
  • 1d96886: 8319531: FileServerHandler::discardRequestBody could be improved
  • 73e19f6: 8319825: jdk.net/jdk.net.ExtendedSocketOptions::IP_DONTFRAGMENT is missing @SInCE 19
  • faeea07: 8319747: galoisCounterMode_AESCrypt stack walking broken
  • b4c2d1c: 8319542: Fix boundaries of region to be tested with os::is_readable_range
  • ... and 8 more: https://git.openjdk.org/jdk/compare/0bda467f6e29c866c661e88a76a9fe3efc0a0d19...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Nov 16, 2023

@sviswa7 Pushed as commit b05e69f.

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

@sviswa7
Copy link
Author

sviswa7 commented Nov 16, 2023

/backport JDK21u

@openjdk
Copy link

openjdk bot commented Nov 16, 2023

@sviswa7 The target repository JDK21u is not a valid target for backports.
List of valid target repositories: openjdk/jdk, openjdk/jdk11u, openjdk/jdk11u-dev, openjdk/jdk17u, openjdk/jdk17u-dev, openjdk/jdk19u, openjdk/jdk20u, openjdk/jdk21, openjdk/jdk21u, openjdk/jdk7u, openjdk/jdk8u, openjdk/jdk8u-dev, openjdk/jfx, openjdk/jfx20u, openjdk/jfx21u, openjdk/lilliput-jdk17u, openjdk/lilliput-jdk21u, openjdk/shenandoah-jdk21u, openjdk/shenandoah-jdk8u, openjdk/shenandoah-jdk8u-dev.
Supplying the organization/group prefix is optional.

@sviswa7
Copy link
Author

sviswa7 commented Nov 16, 2023

/backport jdk21u

@openjdk
Copy link

openjdk bot commented Nov 16, 2023

@sviswa7 the backport was successfully created on the branch sviswa7-backport-b05e69f7 in my personal fork of openjdk/jdk21u. To create a pull request with this backport targeting openjdk/jdk21u:master, just click the following link:

➡️ Create pull request

The title of the pull request is automatically filled in correctly and below you find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit b05e69f7 from the openjdk/jdk repository.

The commit being backported was authored by Sandhya Viswanathan on 16 Nov 2023 and was reviewed by Vladimir Kozlov, Quan Anh Mai and Jatin Bhateja.

Thanks!

If you need to update the source branch of the pull then run the following commands in a local clone of your personal fork of openjdk/jdk21u:

$ git fetch https://github.com/openjdk-bots/jdk21u.git sviswa7-backport-b05e69f7:sviswa7-backport-b05e69f7
$ git checkout sviswa7-backport-b05e69f7
# make changes
$ git add paths/to/changed/files
$ git commit --message 'Describe additional changes made'
$ git push https://github.com/openjdk-bots/jdk21u.git sviswa7-backport-b05e69f7

@sviswa7
Copy link
Author

sviswa7 commented Nov 16, 2023

/backport jdk17u-dev

@sviswa7 sviswa7 deleted the rflags branch June 3, 2024 21:26
@openjdk
Copy link

openjdk bot commented Jun 3, 2024

@sviswa7 Could not automatically backport b05e69f7 to openjdk/jdk17u-dev due to conflicts in the following files:

  • src/hotspot/cpu/x86/x86.ad

Please fetch the appropriate branch/commit and manually resolve these conflicts by using the following commands in your personal fork of openjdk/jdk17u-dev. Note: these commands are just some suggestions and you can use other equivalent commands you know.

# Fetch the up-to-date version of the target branch
$ git fetch --no-tags https://git.openjdk.org/jdk17u-dev.git master:master

# Check out the target branch and create your own branch to backport
$ git checkout master
$ git checkout -b backport-sviswa7-b05e69f7-master

# Fetch the commit you want to backport
$ git fetch --no-tags https://git.openjdk.org/jdk.git b05e69f789fa8c9a5320be5a841317abd3b3a235

# Backport the commit
$ git cherry-pick --no-commit b05e69f789fa8c9a5320be5a841317abd3b3a235
# Resolve conflicts now

# Commit the files you have modified
$ git add files/with/resolved/conflicts
$ git commit -m 'Backport b05e69f789fa8c9a5320be5a841317abd3b3a235'

Once you have resolved the conflicts as explained above continue with creating a pull request towards the openjdk/jdk17u-dev with the title Backport b05e69f789fa8c9a5320be5a841317abd3b3a235.

Below you can find a suggestion for the pull request body:

Hi all,

This pull request contains a backport of commit b05e69f7 from the openjdk/jdk repository.

The commit being backported was authored by Sandhya Viswanathan on 16 Nov 2023 and was reviewed by Vladimir Kozlov, Quan Anh Mai and Jatin Bhateja.

Thanks!

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.

4 participants