8343211: Compile error: redefinition of 'Assembler::evmovdquw(XMMRegister,KRegister,XMMRegister,bool,int)'

[sendaoYan]

Hi all,
On linux-x64 gcc generate compile error: src/hotspot/cpu/x86/assembler_x86.cpp:3646:6: error: redefinition of 'void Assembler::evmovdquw(XMMRegister, KRegister, XMMRegister, bool, int)' after JDK-8341527 and JDK-8338021.
The both PRs add the same C++ function implementation void Assembler::evmovdquw(XMMRegister, KRegister, XMMRegister, bool, int).
I think the newly added functions can be merged to one.
I choose to delete the implementation added by JDK-8341527. And I verify the releated tests of JDK-8341527, after this PR the releated tests of JDK-8341527 run passed.

Additonal testing:

• linux x64 build with release/fastdebug/slowdebug configure
• jtreg tests(include tier1/2/3 etc.) on linux x64 with release build

The releated tests of JDK-8341527 shows below:

test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256Intrinsics.java
test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA256MultiBlockIntrinsics.java
test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512Intrinsics.java
test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA512MultiBlockIntrinsics.java
test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5MultiBlockIntrinsics.java
test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA3Intrinsics.java
test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA3MultiBlockIntrinsics.java
test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1MultiBlockIntrinsics.java
test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestSHA1Intrinsics.java
test/hotspot/jtreg/compiler/intrinsics/sha/sanity/TestMD5Intrinsics.java

---

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-8343211: Compile error: redefinition of 'Assembler::evmovdquw(XMMRegister,KRegister,XMMRegister,bool,int)' (Bug - P1)

Reviewers

• Volodymyr Paprotski (@vpaprotsk - Author)
• Sandhya Viswanathan (@sviswa7 - Reviewer)
• Tobias Hartmann (@TobiHartmann - Reviewer)
• Aleksey Shipilev (@shipilev - Reviewer)

Reviewing

Using git

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

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

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 21768

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

Using diff file

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

Webrev

Link to Webrev Comment

[bridgekeeper]

👋 Welcome back syan! 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]

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

8343211: Compile error: redefinition of 'Assembler::evmovdquw(XMMRegister,KRegister,XMMRegister,bool,int)'

Reviewed-by: vpaprotski, sviswanathan, thartmann, shade

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

• 60364ef: 8341273: JVMTI is not properly hiding some continuation related methods
• 520ddac: 8331861: [PPC64] Implement load / store assembler functions which take an Address object

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]

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

[mlbridge]

Webrevs

• 00: Full (518895d2)

[vpaprotsk]

LGTM Thanks

[sviswa7]

Looks good to me as well.

[TobiHartmann]

Looks good.

[sendaoYan]

Thanks all for the review.

[vnkozlov]

So we had declaration in .hpp file for long time but not implementation?

[vnkozlov]

@jatin-bhateja which version should be chosen?

[vnkozlov]

@jatin-bhateja which version should be chosen?

My concern is about different assert's condition.

[sviswa7]

@jatin-bhateja which version should be chosen?

My concern is about different assert's condition.

Both the asserts are equivalent:

Retained:
assert(VM_Version::supports_avx512bw() && (vector_len == AVX_512bit || VM_Version::supports_avx512vl()), "");

Removed:
assert(vector_len <= AVX_256bit ? VM_Version::supports_avx512vlbw() : VM_Version::supports_avx512bw(), "");

Please note that supports_avx512vlbw() implies both supports_avx512vl() and supports_avx512bw().
So both require supports_avx512bw(). And for vector_len < AVX_512bit both in addition require supports_avx512vl().

[shipilev]

Let's do it. Current trunk is broken without this fix.

[dholmes-ora]

Why has this not been integrated? This is causing carnage in our CI.

[vnkozlov]

Why has this not been integrated? This is causing carnage in our CI.

Night in his timezone? Should we create duplicated PR with him as co-author?

[sendaoYan]

/integrate

[openjdk]

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

• 60364ef: 8341273: JVMTI is not properly hiding some continuation related methods
• 520ddac: 8331861: [PPC64] Implement load / store assembler functions which take an Address object

Your commit was automatically rebased without conflicts.

[openjdk]

@sendaoYan Pushed as commit 40f3d50.

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

[dholmes-ora]

Thanks @sendaoYan

[sendaoYan]

Sorry for the delay integration...