Prohibit SHA/KEYLOCKER usage of EGPR when APX enabled
Checks
Context |
Check |
Description |
linaro-tcwg-bot/tcwg_gcc_build--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gcc_check--master-arm |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 |
success
|
Testing passed
|
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 |
success
|
Testing passed
|
Commit Message
The latest APX spec announced removal of SHA/KEYLOCKER evex promotion [1],
which means the SHA/KEYLOCKER insn does not support EGPR when APX
enabled. Update the corresponding constraints to their EGPR-disabled
counterparts.
Bootstrapped and regtested on x86-64-pc-linux-gnu.
Ok for trunk?
[1].https://www.intel.com/content/www/us/en/developer/articles/technical/advanced-performance-extensions-apx.html
gcc/ChangeLog:
* config/i386/sse.md (sha1msg1): Use "ja" instead of "Bm" for
memory constraint.
(sha1msg2): Likewise.
(sha1nexte): Likewise.
(sha1rnds4): Likewise.
(sha256msg1): Likewise.
(sha256msg2): Likewise.
(sha256rnds2): Likewise.
(aes<aesklvariant>u8): Use "jm" instead of "m" for memory
constraint.
(*aes<aeswideklvariant>u8): Likewise.
(*encodekey128u32): Use "jr" instead of "r" for register
constraints.
(*encodekey256u32): Likewise.
---
gcc/config/i386/sse.md | 26 +++++++++++++-------------
1 file changed, 13 insertions(+), 13 deletions(-)
Comments
On Tue, Apr 9, 2024 at 3:05 PM Hongyu Wang <hongyu.wang@intel.com> wrote:
>
> The latest APX spec announced removal of SHA/KEYLOCKER evex promotion [1],
> which means the SHA/KEYLOCKER insn does not support EGPR when APX
> enabled. Update the corresponding constraints to their EGPR-disabled
> counterparts.
>
> Bootstrapped and regtested on x86-64-pc-linux-gnu.
>
> Ok for trunk?
Ok.
>
> [1].https://www.intel.com/content/www/us/en/developer/articles/technical/advanced-performance-extensions-apx.html
>
> gcc/ChangeLog:
>
> * config/i386/sse.md (sha1msg1): Use "ja" instead of "Bm" for
> memory constraint.
> (sha1msg2): Likewise.
> (sha1nexte): Likewise.
> (sha1rnds4): Likewise.
> (sha256msg1): Likewise.
> (sha256msg2): Likewise.
> (sha256rnds2): Likewise.
> (aes<aesklvariant>u8): Use "jm" instead of "m" for memory
> constraint.
> (*aes<aeswideklvariant>u8): Likewise.
> (*encodekey128u32): Use "jr" instead of "r" for register
> constraints.
> (*encodekey256u32): Likewise.
> ---
> gcc/config/i386/sse.md | 26 +++++++++++++-------------
> 1 file changed, 13 insertions(+), 13 deletions(-)
>
> diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md
> index 3286d3a4fac..4b8d5342707 100644
> --- a/gcc/config/i386/sse.md
> +++ b/gcc/config/i386/sse.md
> @@ -29104,7 +29104,7 @@ (define_insn "sha1msg1"
> [(set (match_operand:V4SI 0 "register_operand" "=x")
> (unspec:V4SI
> [(match_operand:V4SI 1 "register_operand" "0")
> - (match_operand:V4SI 2 "vector_operand" "xBm")]
> + (match_operand:V4SI 2 "vector_operand" "xja")]
> UNSPEC_SHA1MSG1))]
> "TARGET_SHA"
> "sha1msg1\t{%2, %0|%0, %2}"
> @@ -29115,7 +29115,7 @@ (define_insn "sha1msg2"
> [(set (match_operand:V4SI 0 "register_operand" "=x")
> (unspec:V4SI
> [(match_operand:V4SI 1 "register_operand" "0")
> - (match_operand:V4SI 2 "vector_operand" "xBm")]
> + (match_operand:V4SI 2 "vector_operand" "xja")]
> UNSPEC_SHA1MSG2))]
> "TARGET_SHA"
> "sha1msg2\t{%2, %0|%0, %2}"
> @@ -29126,7 +29126,7 @@ (define_insn "sha1nexte"
> [(set (match_operand:V4SI 0 "register_operand" "=x")
> (unspec:V4SI
> [(match_operand:V4SI 1 "register_operand" "0")
> - (match_operand:V4SI 2 "vector_operand" "xBm")]
> + (match_operand:V4SI 2 "vector_operand" "xja")]
> UNSPEC_SHA1NEXTE))]
> "TARGET_SHA"
> "sha1nexte\t{%2, %0|%0, %2}"
> @@ -29137,7 +29137,7 @@ (define_insn "sha1rnds4"
> [(set (match_operand:V4SI 0 "register_operand" "=x")
> (unspec:V4SI
> [(match_operand:V4SI 1 "register_operand" "0")
> - (match_operand:V4SI 2 "vector_operand" "xBm")
> + (match_operand:V4SI 2 "vector_operand" "xja")
> (match_operand:SI 3 "const_0_to_3_operand")]
> UNSPEC_SHA1RNDS4))]
> "TARGET_SHA"
> @@ -29150,7 +29150,7 @@ (define_insn "sha256msg1"
> [(set (match_operand:V4SI 0 "register_operand" "=x")
> (unspec:V4SI
> [(match_operand:V4SI 1 "register_operand" "0")
> - (match_operand:V4SI 2 "vector_operand" "xBm")]
> + (match_operand:V4SI 2 "vector_operand" "xja")]
> UNSPEC_SHA256MSG1))]
> "TARGET_SHA"
> "sha256msg1\t{%2, %0|%0, %2}"
> @@ -29161,7 +29161,7 @@ (define_insn "sha256msg2"
> [(set (match_operand:V4SI 0 "register_operand" "=x")
> (unspec:V4SI
> [(match_operand:V4SI 1 "register_operand" "0")
> - (match_operand:V4SI 2 "vector_operand" "xBm")]
> + (match_operand:V4SI 2 "vector_operand" "xja")]
> UNSPEC_SHA256MSG2))]
> "TARGET_SHA"
> "sha256msg2\t{%2, %0|%0, %2}"
> @@ -29172,7 +29172,7 @@ (define_insn "sha256rnds2"
> [(set (match_operand:V4SI 0 "register_operand" "=x")
> (unspec:V4SI
> [(match_operand:V4SI 1 "register_operand" "0")
> - (match_operand:V4SI 2 "vector_operand" "xBm")
> + (match_operand:V4SI 2 "vector_operand" "xja")
> (match_operand:V4SI 3 "register_operand" "Yz")]
> UNSPEC_SHA256RNDS2))]
> "TARGET_SHA"
> @@ -30575,9 +30575,9 @@ (define_expand "encodekey128u32"
>
> (define_insn "*encodekey128u32"
> [(match_parallel 2 "encodekey128_operation"
> - [(set (match_operand:SI 0 "register_operand" "=r")
> + [(set (match_operand:SI 0 "register_operand" "=jr")
> (unspec_volatile:SI
> - [(match_operand:SI 1 "register_operand" "r")
> + [(match_operand:SI 1 "register_operand" "jr")
> (reg:V2DI XMM0_REG)]
> UNSPECV_ENCODEKEY128U32))])]
> "TARGET_KL"
> @@ -30632,9 +30632,9 @@ (define_expand "encodekey256u32"
>
> (define_insn "*encodekey256u32"
> [(match_parallel 2 "encodekey256_operation"
> - [(set (match_operand:SI 0 "register_operand" "=r")
> + [(set (match_operand:SI 0 "register_operand" "=jr")
> (unspec_volatile:SI
> - [(match_operand:SI 1 "register_operand" "r")
> + [(match_operand:SI 1 "register_operand" "jr")
> (reg:V2DI XMM0_REG)
> (reg:V2DI XMM1_REG)]
> UNSPECV_ENCODEKEY256U32))])]
> @@ -30655,7 +30655,7 @@ (define_int_attr aesklvariant
> (define_insn "aes<aesklvariant>u8"
> [(set (match_operand:V2DI 0 "register_operand" "=x")
> (unspec_volatile:V2DI [(match_operand:V2DI 1 "register_operand" "0")
> - (match_operand:BLK 2 "memory_operand" "m")]
> + (match_operand:BLK 2 "memory_operand" "jm")]
> AESDECENCKL))
> (set (reg:CCZ FLAGS_REG)
> (unspec_volatile:CCZ [(match_dup 1) (match_dup 2)] AESDECENCKL))]
> @@ -30719,7 +30719,7 @@ (define_insn "*aes<aeswideklvariant>u8"
> [(match_parallel 1 "aeswidekl_operation"
> [(set (reg:CCZ FLAGS_REG)
> (unspec_volatile:CCZ
> - [(match_operand:BLK 0 "memory_operand" "m")]
> + [(match_operand:BLK 0 "memory_operand" "jm")]
> AESDECENCWIDEKL))])]
> "TARGET_WIDEKL"
> "aes<aeswideklvariant>\t%0"
> --
> 2.31.1
>
@@ -29104,7 +29104,7 @@ (define_insn "sha1msg1"
[(set (match_operand:V4SI 0 "register_operand" "=x")
(unspec:V4SI
[(match_operand:V4SI 1 "register_operand" "0")
- (match_operand:V4SI 2 "vector_operand" "xBm")]
+ (match_operand:V4SI 2 "vector_operand" "xja")]
UNSPEC_SHA1MSG1))]
"TARGET_SHA"
"sha1msg1\t{%2, %0|%0, %2}"
@@ -29115,7 +29115,7 @@ (define_insn "sha1msg2"
[(set (match_operand:V4SI 0 "register_operand" "=x")
(unspec:V4SI
[(match_operand:V4SI 1 "register_operand" "0")
- (match_operand:V4SI 2 "vector_operand" "xBm")]
+ (match_operand:V4SI 2 "vector_operand" "xja")]
UNSPEC_SHA1MSG2))]
"TARGET_SHA"
"sha1msg2\t{%2, %0|%0, %2}"
@@ -29126,7 +29126,7 @@ (define_insn "sha1nexte"
[(set (match_operand:V4SI 0 "register_operand" "=x")
(unspec:V4SI
[(match_operand:V4SI 1 "register_operand" "0")
- (match_operand:V4SI 2 "vector_operand" "xBm")]
+ (match_operand:V4SI 2 "vector_operand" "xja")]
UNSPEC_SHA1NEXTE))]
"TARGET_SHA"
"sha1nexte\t{%2, %0|%0, %2}"
@@ -29137,7 +29137,7 @@ (define_insn "sha1rnds4"
[(set (match_operand:V4SI 0 "register_operand" "=x")
(unspec:V4SI
[(match_operand:V4SI 1 "register_operand" "0")
- (match_operand:V4SI 2 "vector_operand" "xBm")
+ (match_operand:V4SI 2 "vector_operand" "xja")
(match_operand:SI 3 "const_0_to_3_operand")]
UNSPEC_SHA1RNDS4))]
"TARGET_SHA"
@@ -29150,7 +29150,7 @@ (define_insn "sha256msg1"
[(set (match_operand:V4SI 0 "register_operand" "=x")
(unspec:V4SI
[(match_operand:V4SI 1 "register_operand" "0")
- (match_operand:V4SI 2 "vector_operand" "xBm")]
+ (match_operand:V4SI 2 "vector_operand" "xja")]
UNSPEC_SHA256MSG1))]
"TARGET_SHA"
"sha256msg1\t{%2, %0|%0, %2}"
@@ -29161,7 +29161,7 @@ (define_insn "sha256msg2"
[(set (match_operand:V4SI 0 "register_operand" "=x")
(unspec:V4SI
[(match_operand:V4SI 1 "register_operand" "0")
- (match_operand:V4SI 2 "vector_operand" "xBm")]
+ (match_operand:V4SI 2 "vector_operand" "xja")]
UNSPEC_SHA256MSG2))]
"TARGET_SHA"
"sha256msg2\t{%2, %0|%0, %2}"
@@ -29172,7 +29172,7 @@ (define_insn "sha256rnds2"
[(set (match_operand:V4SI 0 "register_operand" "=x")
(unspec:V4SI
[(match_operand:V4SI 1 "register_operand" "0")
- (match_operand:V4SI 2 "vector_operand" "xBm")
+ (match_operand:V4SI 2 "vector_operand" "xja")
(match_operand:V4SI 3 "register_operand" "Yz")]
UNSPEC_SHA256RNDS2))]
"TARGET_SHA"
@@ -30575,9 +30575,9 @@ (define_expand "encodekey128u32"
(define_insn "*encodekey128u32"
[(match_parallel 2 "encodekey128_operation"
- [(set (match_operand:SI 0 "register_operand" "=r")
+ [(set (match_operand:SI 0 "register_operand" "=jr")
(unspec_volatile:SI
- [(match_operand:SI 1 "register_operand" "r")
+ [(match_operand:SI 1 "register_operand" "jr")
(reg:V2DI XMM0_REG)]
UNSPECV_ENCODEKEY128U32))])]
"TARGET_KL"
@@ -30632,9 +30632,9 @@ (define_expand "encodekey256u32"
(define_insn "*encodekey256u32"
[(match_parallel 2 "encodekey256_operation"
- [(set (match_operand:SI 0 "register_operand" "=r")
+ [(set (match_operand:SI 0 "register_operand" "=jr")
(unspec_volatile:SI
- [(match_operand:SI 1 "register_operand" "r")
+ [(match_operand:SI 1 "register_operand" "jr")
(reg:V2DI XMM0_REG)
(reg:V2DI XMM1_REG)]
UNSPECV_ENCODEKEY256U32))])]
@@ -30655,7 +30655,7 @@ (define_int_attr aesklvariant
(define_insn "aes<aesklvariant>u8"
[(set (match_operand:V2DI 0 "register_operand" "=x")
(unspec_volatile:V2DI [(match_operand:V2DI 1 "register_operand" "0")
- (match_operand:BLK 2 "memory_operand" "m")]
+ (match_operand:BLK 2 "memory_operand" "jm")]
AESDECENCKL))
(set (reg:CCZ FLAGS_REG)
(unspec_volatile:CCZ [(match_dup 1) (match_dup 2)] AESDECENCKL))]
@@ -30719,7 +30719,7 @@ (define_insn "*aes<aeswideklvariant>u8"
[(match_parallel 1 "aeswidekl_operation"
[(set (reg:CCZ FLAGS_REG)
(unspec_volatile:CCZ
- [(match_operand:BLK 0 "memory_operand" "m")]
+ [(match_operand:BLK 0 "memory_operand" "jm")]
AESDECENCWIDEKL))])]
"TARGET_WIDEKL"
"aes<aeswideklvariant>\t%0"