diff mbox series

[x86,avx512] Optimize maskstore when mask is 0 or -1 in UNSPEC_MASKMOV

Message ID 20240717012504.654910-1-hongtao.liu@intel.com
State New
Headers
Series [x86,avx512] Optimize maskstore when mask is 0 or -1 in UNSPEC_MASKMOV |

Checks

Context Check Description
linaro-tcwg-bot/tcwg_gcc_build--master-arm success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-arm success Test passed
linaro-tcwg-bot/tcwg_gcc_build--master-aarch64 success Build passed
linaro-tcwg-bot/tcwg_gcc_check--master-aarch64 success Test passed

Commit Message

liuhongt July 17, 2024, 1:25 a.m. UTC 
  Bootstrapped and regtested on x86_64-pc-linux-gnu{-m32,}.
Ready push to trunk.

gcc/ChangeLog:

	PR target/115843
	* config/i386/predicates.md (const0_or_m1_operand): New
	predicate.
	* config/i386/sse.md (*<avx512>_store<mode>_mask_1): New
	pre_reload define_insn_and_split.
	(V): Add V32BF,V16BF,V8BF.
	(V4SF_V8BF): Rename to ..
	(V24F_128): .. this.
	(*vec_concat<mode>): Adjust with V24F_128.
	(*vec_concat<mode>_0): Ditto.

gcc/testsuite/ChangeLog:

	* gcc.target/i386/pr115843.c: New test.
---
 gcc/config/i386/predicates.md            |  5 ++++
 gcc/config/i386/sse.md                   | 32 ++++++++++++++++----
 gcc/testsuite/gcc.target/i386/pr115843.c | 38 ++++++++++++++++++++++++
 3 files changed, 69 insertions(+), 6 deletions(-)
 create mode 100644 gcc/testsuite/gcc.target/i386/pr115843.c

Comments

Uros Bizjak July 17, 2024, 6:51 a.m. UTC | #1 
On Wed, Jul 17, 2024 at 3:27 AM liuhongt <hongtao.liu@intel.com> wrote:
>
> Bootstrapped and regtested on x86_64-pc-linux-gnu{-m32,}.
> Ready push to trunk.
>
> gcc/ChangeLog:
>
>         PR target/115843
>         * config/i386/predicates.md (const0_or_m1_operand): New
>         predicate.
>         * config/i386/sse.md (*<avx512>_store<mode>_mask_1): New
>         pre_reload define_insn_and_split.
>         (V): Add V32BF,V16BF,V8BF.
>         (V4SF_V8BF): Rename to ..
>         (V24F_128): .. this.
>         (*vec_concat<mode>): Adjust with V24F_128.
>         (*vec_concat<mode>_0): Ditto.
>
> gcc/testsuite/ChangeLog:
>
>         * gcc.target/i386/pr115843.c: New test.
> ---
>  gcc/config/i386/predicates.md            |  5 ++++
>  gcc/config/i386/sse.md                   | 32 ++++++++++++++++----
>  gcc/testsuite/gcc.target/i386/pr115843.c | 38 ++++++++++++++++++++++++
>  3 files changed, 69 insertions(+), 6 deletions(-)
>  create mode 100644 gcc/testsuite/gcc.target/i386/pr115843.c
>
> diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
> index 5d0bb1e0f54..680594871de 100644
> --- a/gcc/config/i386/predicates.md
> +++ b/gcc/config/i386/predicates.md
> @@ -825,6 +825,11 @@ (define_predicate "constm1_operand"
>    (and (match_code "const_int")
>         (match_test "op == constm1_rtx")))
>
> +;; Match 0 or -1.
> +(define_predicate "const0_or_m1_operand"
> +  (ior (match_operand 0 "const0_operand")
> +       (match_operand 0 "constm1_operand")))
> +
>  ;; Match exactly eight.
>  (define_predicate "const8_operand"
>    (and (match_code "const_int")
> diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md
> index e44822f705b..e11610f4b88 100644
> --- a/gcc/config/i386/sse.md
> +++ b/gcc/config/i386/sse.md
> @@ -294,6 +294,7 @@ (define_mode_iterator V
>     (V16SI "TARGET_AVX512F && TARGET_EVEX512") (V8SI "TARGET_AVX") V4SI
>     (V8DI "TARGET_AVX512F && TARGET_EVEX512")  (V4DI "TARGET_AVX") V2DI
>     (V32HF "TARGET_AVX512F && TARGET_EVEX512") (V16HF "TARGET_AVX") V8HF
> +   (V32BF "TARGET_AVX512F && TARGET_EVEX512") (V16BF "TARGET_AVX") V8BF
>     (V16SF "TARGET_AVX512F && TARGET_EVEX512") (V8SF "TARGET_AVX") V4SF
>     (V8DF "TARGET_AVX512F && TARGET_EVEX512")  (V4DF "TARGET_AVX") (V2DF "TARGET_SSE2")])
>
> @@ -430,8 +431,8 @@ (define_mode_iterator VFB_512
>     (V16SF "TARGET_EVEX512")
>     (V8DF "TARGET_EVEX512")])
>
> -(define_mode_iterator V4SF_V8HF
> -  [V4SF V8HF])
> +(define_mode_iterator V24F_128
> +  [V4SF V8HF V8BF])
>
>  (define_mode_iterator VI48_AVX512VL
>    [(V16SI "TARGET_EVEX512") (V8SI "TARGET_AVX512VL") (V4SI "TARGET_AVX512VL")
> @@ -11543,8 +11544,8 @@ (define_insn "*vec_concatv2sf_sse"
>     (set_attr "mode" "V4SF,SF,DI,DI")])
>
>  (define_insn "*vec_concat<mode>"
> -  [(set (match_operand:V4SF_V8HF 0 "register_operand"       "=x,v,x,v")
> -       (vec_concat:V4SF_V8HF
> +  [(set (match_operand:V24F_128 0 "register_operand"       "=x,v,x,v")
> +       (vec_concat:V24F_128
>           (match_operand:<ssehalfvecmode> 1 "register_operand"     " 0,v,0,v")
>           (match_operand:<ssehalfvecmode> 2 "nonimmediate_operand" " x,v,m,m")))]
>    "TARGET_SSE"
> @@ -11559,8 +11560,8 @@ (define_insn "*vec_concat<mode>"
>     (set_attr "mode" "V4SF,V4SF,V2SF,V2SF")])
>
>  (define_insn "*vec_concat<mode>_0"
> -  [(set (match_operand:V4SF_V8HF 0 "register_operand"       "=v")
> -       (vec_concat:V4SF_V8HF
> +  [(set (match_operand:V24F_128 0 "register_operand"       "=v")
> +       (vec_concat:V24F_128
>           (match_operand:<ssehalfvecmode> 1 "nonimmediate_operand" "vm")
>           (match_operand:<ssehalfvecmode> 2 "const0_operand")))]
>    "TARGET_SSE2"
> @@ -28574,6 +28575,25 @@ (define_insn "<avx512>_store<mode>_mask"
>     (set_attr "memory" "store")
>     (set_attr "mode" "<sseinsnmode>")])
>
> +(define_insn_and_split "*<avx512>_store<mode>_mask_1"
> +  [(set (match_operand:V 0 "memory_operand")
> +       (unspec:V
> +         [(match_operand:V 1 "register_operand")
> +          (match_dup 0)
> +          (match_operand:<avx512fmaskmode> 2 "const0_or_m1_operand")]
> +         UNSPEC_MASKMOV))]
> +  "TARGET_AVX512F"

Please add "ix86_pre_reload_split ()" condition to insn constraint for
instructions that have to be split before reload.

Uros.

> +  "#"
> +  "&& 1"
> +  [(const_int 0)]
> +{
> +  if (constm1_operand (operands[2], <MODE>mode))
> +  {
> +    emit_move_insn (operands[0], operands[1]);
> +    DONE;
> +  }
> +})
> +
>  (define_expand "cbranch<mode>4"
>    [(set (reg:CC FLAGS_REG)
>         (compare:CC (match_operand:VI_AVX_AVX512F 1 "register_operand")
> diff --git a/gcc/testsuite/gcc.target/i386/pr115843.c b/gcc/testsuite/gcc.target/i386/pr115843.c
> new file mode 100644
> index 00000000000..00d8605757a
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/i386/pr115843.c
> @@ -0,0 +1,38 @@
> +/* { dg-do compile } */
> +/* { dg-options "-O3 -mavx512vl --param vect-partial-vector-usage=2 -mtune=znver5 -mprefer-vector-width=512" } */
> +/* { dg-final { scan-assembler-not "kxor\[bw]" } } */
> +
> +typedef unsigned long long BITBOARD;
> +BITBOARD KingPressureMask1[64], KingSafetyMask1[64];
> +
> +void __attribute__((noinline))
> +foo()
> +{
> +  int i;
> +
> +  for (i = 0; i < 64; i++) {
> +    if ((i & 7) == 0) {
> +      KingPressureMask1[i] = KingSafetyMask1[i + 1];
> +    } else if ((i & 7) == 7) {
> +      KingPressureMask1[i] = KingSafetyMask1[i - 1];
> +    } else {
> +      KingPressureMask1[i] = KingSafetyMask1[i];
> +    }
> +  }
> +}
> +
> +BITBOARD verify[64] = {1, 1, 2, 3, 4, 5, 6, 6, 9, 9, 10, 11, 12, 13, 14, 14, 17, 17, 18, 19,
> +  20, 21, 22, 22, 25, 25, 26, 27, 28, 29, 30, 30, 33, 33, 34, 35, 36, 37, 38,
> +  38, 41, 41, 42, 43, 44, 45, 46, 46, 49, 49, 50, 51, 52, 53, 54, 54, 57, 57,
> +  58, 59, 60, 61, 62, 62};
> +
> +int main()
> +{
> +  for (int i = 0; i < 64; ++i)
> +    KingSafetyMask1[i] = i;
> +  foo ();
> +  for (int i = 0; i < 64; ++i)
> +    if (KingPressureMask1[i] != verify[i])
> +      __builtin_abort ();
> +  return 0;
> +}
> --
> 2.31.1
>
diff mbox series

Patch

diff --git a/gcc/config/i386/predicates.md b/gcc/config/i386/predicates.md
index 5d0bb1e0f54..680594871de 100644
--- a/gcc/config/i386/predicates.md
+++ b/gcc/config/i386/predicates.md
@@ -825,6 +825,11 @@  (define_predicate "constm1_operand"
   (and (match_code "const_int")
        (match_test "op == constm1_rtx")))
 
+;; Match 0 or -1.
+(define_predicate "const0_or_m1_operand"
+  (ior (match_operand 0 "const0_operand")
+       (match_operand 0 "constm1_operand")))
+
 ;; Match exactly eight.
 (define_predicate "const8_operand"
   (and (match_code "const_int")
diff --git a/gcc/config/i386/sse.md b/gcc/config/i386/sse.md
index e44822f705b..e11610f4b88 100644
--- a/gcc/config/i386/sse.md
+++ b/gcc/config/i386/sse.md
@@ -294,6 +294,7 @@  (define_mode_iterator V
    (V16SI "TARGET_AVX512F && TARGET_EVEX512") (V8SI "TARGET_AVX") V4SI
    (V8DI "TARGET_AVX512F && TARGET_EVEX512")  (V4DI "TARGET_AVX") V2DI
    (V32HF "TARGET_AVX512F && TARGET_EVEX512") (V16HF "TARGET_AVX") V8HF
+   (V32BF "TARGET_AVX512F && TARGET_EVEX512") (V16BF "TARGET_AVX") V8BF
    (V16SF "TARGET_AVX512F && TARGET_EVEX512") (V8SF "TARGET_AVX") V4SF
    (V8DF "TARGET_AVX512F && TARGET_EVEX512")  (V4DF "TARGET_AVX") (V2DF "TARGET_SSE2")])
 
@@ -430,8 +431,8 @@  (define_mode_iterator VFB_512
    (V16SF "TARGET_EVEX512")
    (V8DF "TARGET_EVEX512")])
 
-(define_mode_iterator V4SF_V8HF
-  [V4SF V8HF])
+(define_mode_iterator V24F_128
+  [V4SF V8HF V8BF])
 
 (define_mode_iterator VI48_AVX512VL
   [(V16SI "TARGET_EVEX512") (V8SI "TARGET_AVX512VL") (V4SI "TARGET_AVX512VL")
@@ -11543,8 +11544,8 @@  (define_insn "*vec_concatv2sf_sse"
    (set_attr "mode" "V4SF,SF,DI,DI")])
 
 (define_insn "*vec_concat<mode>"
-  [(set (match_operand:V4SF_V8HF 0 "register_operand"       "=x,v,x,v")
-	(vec_concat:V4SF_V8HF
+  [(set (match_operand:V24F_128 0 "register_operand"       "=x,v,x,v")
+	(vec_concat:V24F_128
 	  (match_operand:<ssehalfvecmode> 1 "register_operand"     " 0,v,0,v")
 	  (match_operand:<ssehalfvecmode> 2 "nonimmediate_operand" " x,v,m,m")))]
   "TARGET_SSE"
@@ -11559,8 +11560,8 @@  (define_insn "*vec_concat<mode>"
    (set_attr "mode" "V4SF,V4SF,V2SF,V2SF")])
 
 (define_insn "*vec_concat<mode>_0"
-  [(set (match_operand:V4SF_V8HF 0 "register_operand"       "=v")
-	(vec_concat:V4SF_V8HF
+  [(set (match_operand:V24F_128 0 "register_operand"       "=v")
+	(vec_concat:V24F_128
 	  (match_operand:<ssehalfvecmode> 1 "nonimmediate_operand" "vm")
 	  (match_operand:<ssehalfvecmode> 2 "const0_operand")))]
   "TARGET_SSE2"
@@ -28574,6 +28575,25 @@  (define_insn "<avx512>_store<mode>_mask"
    (set_attr "memory" "store")
    (set_attr "mode" "<sseinsnmode>")])
 
+(define_insn_and_split "*<avx512>_store<mode>_mask_1"
+  [(set (match_operand:V 0 "memory_operand")
+	(unspec:V
+	  [(match_operand:V 1 "register_operand")
+	   (match_dup 0)
+	   (match_operand:<avx512fmaskmode> 2 "const0_or_m1_operand")]
+	  UNSPEC_MASKMOV))]
+  "TARGET_AVX512F"
+  "#"
+  "&& 1"
+  [(const_int 0)]
+{
+  if (constm1_operand (operands[2], <MODE>mode))
+  {
+    emit_move_insn (operands[0], operands[1]);
+    DONE;
+  }
+})
+
 (define_expand "cbranch<mode>4"
   [(set (reg:CC FLAGS_REG)
 	(compare:CC (match_operand:VI_AVX_AVX512F 1 "register_operand")
diff --git a/gcc/testsuite/gcc.target/i386/pr115843.c b/gcc/testsuite/gcc.target/i386/pr115843.c
new file mode 100644
index 00000000000..00d8605757a
--- /dev/null
+++ b/gcc/testsuite/gcc.target/i386/pr115843.c
@@ -0,0 +1,38 @@ 
+/* { dg-do compile } */
+/* { dg-options "-O3 -mavx512vl --param vect-partial-vector-usage=2 -mtune=znver5 -mprefer-vector-width=512" } */
+/* { dg-final { scan-assembler-not "kxor\[bw]" } } */
+
+typedef unsigned long long BITBOARD;
+BITBOARD KingPressureMask1[64], KingSafetyMask1[64];
+
+void __attribute__((noinline))
+foo()
+{
+  int i;
+
+  for (i = 0; i < 64; i++) {
+    if ((i & 7) == 0) {
+      KingPressureMask1[i] = KingSafetyMask1[i + 1];
+    } else if ((i & 7) == 7) {
+      KingPressureMask1[i] = KingSafetyMask1[i - 1];
+    } else {
+      KingPressureMask1[i] = KingSafetyMask1[i];
+    }
+  }
+}
+
+BITBOARD verify[64] = {1, 1, 2, 3, 4, 5, 6, 6, 9, 9, 10, 11, 12, 13, 14, 14, 17, 17, 18, 19,
+  20, 21, 22, 22, 25, 25, 26, 27, 28, 29, 30, 30, 33, 33, 34, 35, 36, 37, 38,
+  38, 41, 41, 42, 43, 44, 45, 46, 46, 49, 49, 50, 51, 52, 53, 54, 54, 57, 57,
+  58, 59, 60, 61, 62, 62};
+
+int main()
+{
+  for (int i = 0; i < 64; ++i)
+    KingSafetyMask1[i] = i;
+  foo ();
+  for (int i = 0; i < 64; ++i)
+    if (KingPressureMask1[i] != verify[i])
+      __builtin_abort ();
+  return 0;
+}