diff mbox series

expr: Limit the store flag optimization for single bit to non-vectors [PR113322]

Message ID 20240111103217.1306207-1-quic_apinski@quicinc.com
State Committed
Commit a2be4e155992151b60fca6969a97d6efd91e82b5
Headers
Series expr: Limit the store flag optimization for single bit to non-vectors [PR113322] |

Checks

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

Commit Message

Andrew Pinski Jan. 11, 2024, 10:32 a.m. UTC 
  The problem here is after the recent vectorizer improvements, we end up
with a comparison against a vector bool 0 which then tries expand_single_bit_test
which is not expecting vector comparisons at all.

The IR was:
  vector(4) <signed-boolean:1> mask_patt_5.13;
  _Bool _12;

  mask_patt_5.13_44 = vect_perm_even_41 != { 0.0, 1.0e+0, 2.0e+0, 3.0e+0 };
  _12 = mask_patt_5.13_44 == { 0, 0, 0, 0 };

and we tried to call expand_single_bit_test for the last comparison.
Rejecting the vector comparison is needed.

Bootstrapped and tested on x86_64-linux-gnu with no regressions.

	PR middle-end/113322

gcc/ChangeLog:

	* expr.cc (do_store_flag): Don't try single bit tests with
	comparison on vector types.

gcc/testsuite/ChangeLog:

	* gcc.c-torture/compile/pr113322-1.c: New test.

Signed-off-by: Andrew Pinski <quic_apinski@quicinc.com>
---
 gcc/expr.cc                                      |  2 ++
 gcc/testsuite/gcc.c-torture/compile/pr113322-1.c | 14 ++++++++++++++
 2 files changed, 16 insertions(+)
 create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr113322-1.c

Comments

Richard Biener Jan. 11, 2024, 10:39 a.m. UTC | #1 
On Thu, Jan 11, 2024 at 11:34 AM Andrew Pinski <quic_apinski@quicinc.com> wrote:
>
> The problem here is after the recent vectorizer improvements, we end up
> with a comparison against a vector bool 0 which then tries expand_single_bit_test
> which is not expecting vector comparisons at all.
>
> The IR was:
>   vector(4) <signed-boolean:1> mask_patt_5.13;
>   _Bool _12;
>
>   mask_patt_5.13_44 = vect_perm_even_41 != { 0.0, 1.0e+0, 2.0e+0, 3.0e+0 };
>   _12 = mask_patt_5.13_44 == { 0, 0, 0, 0 };
>
> and we tried to call expand_single_bit_test for the last comparison.
> Rejecting the vector comparison is needed.
>
> Bootstrapped and tested on x86_64-linux-gnu with no regressions.

OK

>         PR middle-end/113322
>
> gcc/ChangeLog:
>
>         * expr.cc (do_store_flag): Don't try single bit tests with
>         comparison on vector types.
>
> gcc/testsuite/ChangeLog:
>
>         * gcc.c-torture/compile/pr113322-1.c: New test.
>
> Signed-off-by: Andrew Pinski <quic_apinski@quicinc.com>
> ---
>  gcc/expr.cc                                      |  2 ++
>  gcc/testsuite/gcc.c-torture/compile/pr113322-1.c | 14 ++++++++++++++
>  2 files changed, 16 insertions(+)
>  create mode 100644 gcc/testsuite/gcc.c-torture/compile/pr113322-1.c
>
> diff --git a/gcc/expr.cc b/gcc/expr.cc
> index dc816bc20fa..ae32fdda02b 100644
> --- a/gcc/expr.cc
> +++ b/gcc/expr.cc
> @@ -13619,6 +13619,8 @@ do_store_flag (sepops ops, rtx target, machine_mode mode)
>    if ((code == NE || code == EQ)
>        && (integer_zerop (arg1)
>           || integer_pow2p (arg1))
> +      /* vector types are not handled here. */
> +      && TREE_CODE (TREE_TYPE (arg1)) != VECTOR_TYPE
>        && (TYPE_PRECISION (ops->type) != 1 || TYPE_UNSIGNED (ops->type)))
>      {
>        tree narg0 = arg0;
> diff --git a/gcc/testsuite/gcc.c-torture/compile/pr113322-1.c b/gcc/testsuite/gcc.c-torture/compile/pr113322-1.c
> new file mode 100644
> index 00000000000..efed9603dfd
> --- /dev/null
> +++ b/gcc/testsuite/gcc.c-torture/compile/pr113322-1.c
> @@ -0,0 +1,14 @@
> +/* { dg-additional-options "-march=sapphirerapids" { target x86_64*-*-* i?86-*-* } } */
> +/* PR middle-end/113322 */
> +
> +float a[16];
> +void
> +foo ()
> +{
> +int i;
> +for (i = 0; i < 16/2; i++)
> + {
> + if (a[2*i+((0 +1)%2)] != (3 * (2*i+((0 +1)%2)) + 2))
> +  __builtin_abort ();
> + }
> +}
> --
> 2.39.3
>
diff mbox series

Patch

diff --git a/gcc/expr.cc b/gcc/expr.cc
index dc816bc20fa..ae32fdda02b 100644
--- a/gcc/expr.cc
+++ b/gcc/expr.cc
@@ -13619,6 +13619,8 @@  do_store_flag (sepops ops, rtx target, machine_mode mode)
   if ((code == NE || code == EQ)
       && (integer_zerop (arg1)
 	  || integer_pow2p (arg1))
+      /* vector types are not handled here. */
+      && TREE_CODE (TREE_TYPE (arg1)) != VECTOR_TYPE
       && (TYPE_PRECISION (ops->type) != 1 || TYPE_UNSIGNED (ops->type)))
     {
       tree narg0 = arg0;
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr113322-1.c b/gcc/testsuite/gcc.c-torture/compile/pr113322-1.c
new file mode 100644
index 00000000000..efed9603dfd
--- /dev/null
+++ b/gcc/testsuite/gcc.c-torture/compile/pr113322-1.c
@@ -0,0 +1,14 @@ 
+/* { dg-additional-options "-march=sapphirerapids" { target x86_64*-*-* i?86-*-* } } */
+/* PR middle-end/113322 */
+
+float a[16];
+void 
+foo ()
+{
+int i;
+for (i = 0; i < 16/2; i++)
+ {
+ if (a[2*i+((0 +1)%2)] != (3 * (2*i+((0 +1)%2)) + 2))
+  __builtin_abort ();
+ }
+}