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

Merge panama-vector:master #83

Closed
wants to merge 280 commits into from

Conversation

@nsjian
Copy link
Collaborator

@nsjian nsjian commented May 18, 2021

Merge with master. Vector API tests passed on both x86 and aarch64.

Conflicts are in .ad. Resolved by moving the code to matcher_.hpp to align with openjdk/jdk#3947.


Progress

  • Change must not contain extraneous whitespace
  • Change must be properly reviewed

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/panama-vector pull/83/head:pull/83
$ git checkout pull/83

Update a local copy of the PR:
$ git checkout pull/83
$ git pull https://git.openjdk.java.net/panama-vector pull/83/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 83

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/panama-vector/pull/83.diff

Jan Lahoda and others added 30 commits Apr 29, 2021
… initializers

Reviewed-by: jfranck, vromero
…yteBuffer.byteOrder(nativeOrder()).asXBuffer.put(Xarray) are slow

Reviewed-by: alanb, psandoz, chegar
…ly Charbuffers

Reviewed-by: rriggs, alanb, chegar
…upers is too strong

Reviewed-by: vlivanov, thartmann
… on linux-aarch64 with ZGC

Reviewed-by: bpb
…read

Reviewed-by: rehn, dcubed, coleenp, dholmes
Reviewed-by: stefank, tschatzl, pliden
…d-jdk is used

Reviewed-by: dholmes, minqi, ccheung
…a needs to be updated after 8146022 got closed

Reviewed-by: jjg
…r must be initialized" when called for uninitialized class

Reviewed-by: chagedorn, thartmann
…kcs12 file if -storetype pkcs12 is specified

Reviewed-by: coffeys, hchao
…ntly failing with TestServer: start exception: java.io.IOException: Invalid preface

Reviewed-by: chegar
Reviewed-by: bpb, naoto, iris, chegar
…UsingRotatedFont.java on generic-all

Reviewed-by: mikael, prr
Reviewed-by: kvn, iveresov
prsadhuk and others added 15 commits May 17, 2021
…va failed with "ERROR: icon and imageIcon not same."

Reviewed-by: azvegint
Reviewed-by: aph, iklam, ngasson
Reviewed-by: dholmes, gziemski
Reviewed-by: mchung, erikj, dnsimon
…or should not contain suggestion to submit a bug report

Reviewed-by: stuefe, kevinw, gziemski
Vector API tests passed on both x86 and aarch64.
@bridgekeeper
Copy link

@bridgekeeper bridgekeeper bot commented May 18, 2021

👋 Welcome back njian! A progress list of the required criteria for merging this PR into vectorIntrinsics 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 openjdk bot commented May 18, 2021

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

Merge panama-vector:master

Reviewed-by: sviswanathan

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 vectorIntrinsics 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 vectorIntrinsics branch, type /integrate in a new comment.

@mlbridge
Copy link

@mlbridge mlbridge bot commented May 18, 2021

@nsjian
Copy link
Collaborator Author

@nsjian nsjian commented May 19, 2021

@sviswa7 Could you please help to take a look at manual merge changes in x86*.ad and matcher_x86.hpp? Thanks!

@sviswa7
Copy link
Collaborator

@sviswa7 sviswa7 commented May 19, 2021

@nsjian Your changes look good. Thanks for doing the merge.

@nsjian
Copy link
Collaborator Author

@nsjian nsjian commented May 20, 2021

/integrate

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

@openjdk openjdk bot commented May 20, 2021

@nsjian Pushed as commit 5f57f54.

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

@nsjian nsjian deleted the merge-with-master-May branch Sep 18, 2021
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment