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:vector-unstable #4

Closed

Conversation

nsjian
Copy link

@nsjian nsjian commented Sep 17, 2020

Merge


Progress

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

Reviewers

Download

$ git fetch https://git.openjdk.java.net/panama-vector pull/4/head:pull/4
$ git checkout pull/4

Sorry, something went wrong.

Ningsheng Jian and others added 23 commits September 2, 2020 09:45
Co-authored-by: Joshua Zhu <joshua.zhu@arm.com>
Co-authored-by: Yang Zhang <yang.zhang@arm.com>
Reviewed-by: adinn, pli, ihse, vlivanov, eosterlund
…ption when supplied non strings

Reviewed-by: lancea, naoto
Reviewed-by: aph, vlivanov, adinn
…ler/optimizations tests

Reviewed-by: thartmann
Reviewed-by: erikj, jvernee, ehelin
Updated CheckGraalIntrinsics.java test

Reviewed-by: dcubed
…er/HugeCapacity.java tests shouldn't be @Ignore-d

Remove @ignore since @requires os.maxMemory is enough to ensure tests will not be executed if memory requirements are not satisfied

Reviewed-by: coffeys
Cleanup code for jlink classes generation, move parsing file work to java.lang.invoke and add a new API in interface JavaLangInvokeAccess to generate holder classes, remove old APIs. The new API is used both by JLI and CDS.

Reviewed-by: mchung, sundar
Reviewed-by: dcubed, dholmes, pchilanomate, rehn, sspitsyn
@bridgekeeper
Copy link

bridgekeeper bot commented Sep 17, 2020

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

@nsjian nsjian changed the title Merge with vector-unstable Merge openjdk/panama-vector:vector-unstable Sep 17, 2020
@openjdk openjdk bot added the rfr label Sep 17, 2020
@mlbridge
Copy link

mlbridge bot commented Sep 17, 2020

@nsjian
Copy link
Author

nsjian commented Sep 17, 2020

This is a clean merge, no conflicts.

@PaulSandoz
Copy link
Member

@nsjian thank you for your understanding and working on vectorIntrinsics for now. Once we integrate the Vector API i hope we can follow up quickly.

@nsjian nsjian force-pushed the merge-with-vector-unstable branch 2 times, most recently from 52559fb to e91da6c Compare September 18, 2020 01:38
@nsjian nsjian changed the title Merge panama-vector:vector-unstable Merge Sep 18, 2020
@nsjian
Copy link
Author

nsjian commented Sep 18, 2020

/integrate

@openjdk openjdk bot removed the rfr label Sep 18, 2020
@openjdk
Copy link

openjdk bot commented Sep 18, 2020

@nsjian Your merge request cannot be fulfilled at this time, as the status check jcheck did not complete successfully

@nsjian nsjian changed the title Merge Merge panama-vector:vector-unstable Sep 18, 2020
@openjdk openjdk bot added the rfr label Sep 18, 2020
@nsjian
Copy link
Author

nsjian commented Sep 18, 2020

@PaulSandoz any idea how can I merge this? The jcheck always reports error. Either:

"Merge commit message is not Merge, but: Merge panama-vector:vector-unstable",

or

"Could not determine the source for this merge. A Merge PR title must be specified on the format: Merge project:branch to allow verification of the merge contents."

@PaulSandoz
Copy link
Member

PaulSandoz commented Sep 18, 2020

@nsjian I think there is an issue with the contents of the .jcheck/conf file. The [Merge] check message might need to be "message=Merge .*".

See this change made to the panama-foreign repo: openjdk/panama-foreign@64294f3#diff-916bf78a0828e8bef329c874c16980bf

I am checking with other engineers.

@nsjian nsjian closed this Sep 18, 2020
@nsjian
Copy link
Author

nsjian commented Sep 18, 2020

See this change made to the panama-foreign repo: openjdk/panama-foreign@64294f3#diff-916bf78a0828e8bef329c874c16980bf

I am checking with other engineers.

Thanks!

@nsjian nsjian reopened this Sep 18, 2020
@nsjian nsjian force-pushed the merge-with-vector-unstable branch from e91da6c to e332482 Compare September 18, 2020 03:01
@nsjian
Copy link
Author

nsjian commented Sep 18, 2020

I have rebased my code, but the jcheck still failed.

@nsjian
Copy link
Author

nsjian commented Sep 18, 2020

/integrate

@openjdk
Copy link

openjdk bot commented Sep 18, 2020

@nsjian Your merge request cannot be fulfilled at this time, as your changes failed the final jcheck:

  • Merge commit message is not Merge .*, but: Merge panama-vector:vector-unstable

Reviewed-by: psandoz

@PaulSandoz
Copy link
Member

@nsjian I updated the .jcheck/conf file again as recommended (direct push rather than go through the pull request ceremony). Can you try again?

@openjdk
Copy link

openjdk bot commented Sep 18, 2020

@nsjian This change now passes all automated pre-integration checks. In addition to the automated checks, the change must also fulfill all project specific requirements

After integration, the commit message will be:

Merge panama-vector:vector-unstable

Reviewed-by: psandoz
  • If you would like to add a summary, use the /summary command.
  • To credit additional contributors, use the /contributor command.
  • To add additional solved issues, use the /issue command.

Since the source branch of this PR was last updated there has been 1 commit pushed to the vectorIntrinsics branch:

As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid automatic rebasing, please merge vectorIntrinsics into your branch, and then specify the current head hash when integrating, like this: /integrate d6763b5408ed7fa7ea035b20ab78758130972768.

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

@openjdk openjdk bot added the ready label Sep 18, 2020
@nsjian
Copy link
Author

nsjian commented Sep 19, 2020

/integrate

@openjdk openjdk bot closed this Sep 19, 2020
@openjdk openjdk bot added integrated and removed ready rfr labels Sep 19, 2020
@openjdk
Copy link

openjdk bot commented Sep 19, 2020

@nsjian Since your change was applied there has been 1 commit pushed to the vectorIntrinsics branch:

Your commit was automatically rebased without conflicts.

Pushed as commit 925350f.

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

@nsjian
Copy link
Author

nsjian commented Sep 19, 2020

@nsjian I updated the .jcheck/conf file again as recommended (direct push rather than go through the pull request ceremony). Can you try again?

@PaulSandoz Thanks! It works!

@nsjian nsjian deleted the merge-with-vector-unstable branch November 20, 2020 06:20
@mlbridge mlbridge bot mentioned this pull request Sep 3, 2021
2 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Development

Successfully merging this pull request may close these issues.

None yet