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

8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297 #5819

Closed
wants to merge 2 commits into from

Conversation

theRealAph
Copy link
Contributor

@theRealAph theRealAph commented Oct 5, 2021

The recent AES/GCM acceleration on AArch64 was broken by https://bugs.openjdk.java.net/browse/JDK-8273297 . This was entirely expected, and I approved the patch, but now we must make AArch64 acceleration work again.
The only significant change from the point of view of this patch is that one argument was added to the call to the intrinsic, and that argument caused another argument to spill onto the stack.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297

Reviewers

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 5819

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

Using diff file

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

@bridgekeeper
Copy link

bridgekeeper bot commented Oct 5, 2021

👋 Welcome back aph! 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 label Oct 5, 2021
@openjdk
Copy link

openjdk bot commented Oct 5, 2021

@theRealAph 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 label Oct 5, 2021
@mlbridge
Copy link

mlbridge bot commented Oct 5, 2021

Webrevs

adinn
adinn approved these changes Oct 5, 2021
Copy link
Contributor

@adinn adinn left a comment

Changes look good.

@openjdk
Copy link

openjdk bot commented Oct 5, 2021

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

8274730: AArch64: AES/GCM acceleration is broken by the fix for JDK-8273297

Reviewed-by: adinn, roland, kvn

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 27 new commits pushed to 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 label Oct 5, 2021
Copy link
Contributor

@rwestrel rwestrel left a comment

c2 change looks good to me.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Looks good with just 2 small comments.
I will test changes and approve it after that.

subkeyHtbl_48_entries_start
= array_element_address(subkeyHtbl_48_entries, intcon(0), T_LONG);
Copy link
Contributor

@vnkozlov vnkozlov Oct 5, 2021

Choose a reason for hiding this comment

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

Please, don't split such line.

@@ -6794,14 +6794,20 @@ bool LibraryCallKit::inline_galoisCounterMode_AESCrypt() {
ciKlass* klass = ciTypeArrayKlass::make(T_LONG);
Node* klass_node = makecon(TypeKlassPtr::make(klass));

// htbl entries is set to 96 only fox x86-64
// Does this target support this intrinsic?
if (Matcher::htbl_entries == -1) return false;

// new array to hold 48 computed htbl entries
Copy link
Contributor

@vnkozlov vnkozlov Oct 5, 2021

Choose a reason for hiding this comment

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

Move this comment under (Matcher::htbl_entries != 0) check.

Copy link
Contributor

@vnkozlov vnkozlov left a comment

Good. And my testing passed.

@theRealAph
Copy link
Contributor Author

theRealAph commented Oct 6, 2021

/integrate

@openjdk
Copy link

openjdk bot commented Oct 6, 2021

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

  • 2faced0: 8274738: ZGC: Use relaxed atomic load when reading bits in the live map
  • 8a4d2b4: 8274680: Remove unnecessary conversion to String in java.desktop
  • 986ee5d: 8274670: Improve version string handling in SA
  • df7b0c7: 8274715: Implement forEach in Collections.CopiesList
  • d4e8712: 8274797: ProblemList resourcehogs/serviceability/sa/TestHeapDumpForLargeArray.java on macosx-x64
  • 4726267: 8274642: jdk/jshell/CommandCompletionTest.java fails with NoSuchElementException after JDK-8271287
  • 83b2219: 8273612: Fix for JDK-8272873 causes timeout in running some tests with -Xcomp
  • d34ec6c: 8274793: Suppress warnings on non-serializable non-transient instance fields in sun.net
  • 332f067: 8274729: Define Position.NOPOS == Diagnostic.NOPOS
  • 1e75203: 8274656: Remove default_checksum and safe_checksum_type from krb5.conf
  • ... and 26 more: https://git.openjdk.java.net/jdk/compare/7eb0372e55f23275b12470593adc97f1b79bc965...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot closed this Oct 6, 2021
@openjdk openjdk bot added integrated and removed ready rfr labels Oct 6, 2021
@openjdk
Copy link

openjdk bot commented Oct 6, 2021

@theRealAph Pushed as commit c74726d.

💡 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 integrated
4 participants