diff mbox series

[v2] MATCH: Simplify (a ? x : y) eq/ne (b ? x : y) [PR111150]

Message ID 20240716133518.628-1-quic_eikagupt@quicinc.com
State New
Headers show
Series [v2] MATCH: Simplify (a ? x : y) eq/ne (b ? x : y) [PR111150] | expand

Commit Message

Eikansh Gupta July 16, 2024, 1:35 p.m. UTC
This patch adds match pattern for `(a ? x : y) eq/ne (b ? x : y)`.
In forwprop1 pass, depending on the type of `a` and `b`, GCC produces
`vec_cond` or `cond_expr`. Based on the observation that `(x != y)` is
TRUE, the pattern can be optimized to produce `(a^b ? TRUE : FALSE)`.

The patch adds match pattern for a, b:
(a ? x : y) != (b ? x : y) --> (a^b) ? TRUE  : FALSE
(a ? x : y) == (b ? x : y) --> (a^b) ? FALSE : TRUE
(a ? x : y) != (b ? y : x) --> (a^b) ? TRUE  : FALSE
(a ? x : y) == (b ? y : x) --> (a^b) ? FALSE : TRUE

	PR tree-optimization/111150

gcc/ChangeLog:

	* match.pd (`(a ? x : y) eq/ne (b ? x : y)`): New pattern.
	(`(a ? x : y) eq/ne (b ? y : x)`): New pattern.

gcc/testsuite/ChangeLog:

	* gcc.dg/tree-ssa/pr111150.c: New test.
        * gcc.dg/tree-ssa/pr111150-1.c: New test.
        * g++.dg/tree-ssa/pr111150.C: New test.

Signed-off-by: Eikansh Gupta <quic_eikagupt@quicinc.com>
---
 gcc/match.pd                               | 15 +++++
 gcc/testsuite/g++.dg/tree-ssa/pr111150.C   | 33 ++++++++++
 gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c | 72 ++++++++++++++++++++++
 gcc/testsuite/gcc.dg/tree-ssa/pr111150.c   | 22 +++++++
 4 files changed, 142 insertions(+)
 create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr111150.C
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c
 create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr111150.c

Comments

Richard Biener July 17, 2024, 12:23 p.m. UTC | #1
On Tue, Jul 16, 2024 at 3:36 PM Eikansh Gupta <quic_eikagupt@quicinc.com> wrote:
>
> This patch adds match pattern for `(a ? x : y) eq/ne (b ? x : y)`.
> In forwprop1 pass, depending on the type of `a` and `b`, GCC produces
> `vec_cond` or `cond_expr`. Based on the observation that `(x != y)` is
> TRUE, the pattern can be optimized to produce `(a^b ? TRUE : FALSE)`.
>
> The patch adds match pattern for a, b:
> (a ? x : y) != (b ? x : y) --> (a^b) ? TRUE  : FALSE
> (a ? x : y) == (b ? x : y) --> (a^b) ? FALSE : TRUE
> (a ? x : y) != (b ? y : x) --> (a^b) ? TRUE  : FALSE
> (a ? x : y) == (b ? y : x) --> (a^b) ? FALSE : TRUE

OK.

Richard.

>         PR tree-optimization/111150
>
> gcc/ChangeLog:
>
>         * match.pd (`(a ? x : y) eq/ne (b ? x : y)`): New pattern.
>         (`(a ? x : y) eq/ne (b ? y : x)`): New pattern.
>
> gcc/testsuite/ChangeLog:
>
>         * gcc.dg/tree-ssa/pr111150.c: New test.
>         * gcc.dg/tree-ssa/pr111150-1.c: New test.
>         * g++.dg/tree-ssa/pr111150.C: New test.
>
> Signed-off-by: Eikansh Gupta <quic_eikagupt@quicinc.com>
> ---
>  gcc/match.pd                               | 15 +++++
>  gcc/testsuite/g++.dg/tree-ssa/pr111150.C   | 33 ++++++++++
>  gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c | 72 ++++++++++++++++++++++
>  gcc/testsuite/gcc.dg/tree-ssa/pr111150.c   | 22 +++++++
>  4 files changed, 142 insertions(+)
>  create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr111150.C
>  create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c
>  create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr111150.c
>
> diff --git a/gcc/match.pd b/gcc/match.pd
> index 3759c64d461..7c125255ea3 100644
> --- a/gcc/match.pd
> +++ b/gcc/match.pd
> @@ -5577,6 +5577,21 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
>    (vec_cond (bit_and (bit_not @0) @1) @2 @3)))
>  #endif
>
> +/* (a ? x : y) != (b ? x : y) --> (a^b) ? TRUE  : FALSE */
> +/* (a ? x : y) == (b ? x : y) --> (a^b) ? FALSE : TRUE  */
> +/* (a ? x : y) != (b ? y : x) --> (a^b) ? FALSE : TRUE  */
> +/* (a ? x : y) == (b ? y : x) --> (a^b) ? TRUE  : FALSE */
> +(for cnd (cond vec_cond)
> + (for eqne (eq ne)
> +  (simplify
> +   (eqne:c (cnd @0 @1 @2) (cnd @3 @1 @2))
> +    (cnd (bit_xor @0 @3) { constant_boolean_node (eqne == NE_EXPR, type); }
> +     { constant_boolean_node (eqne != NE_EXPR, type); }))
> +  (simplify
> +   (eqne:c (cnd @0 @1 @2) (cnd @3 @2 @1))
> +    (cnd (bit_xor @0 @3) { constant_boolean_node (eqne != NE_EXPR, type); }
> +     { constant_boolean_node (eqne == NE_EXPR, type); }))))
> +
>  /* Canonicalize mask ? { 0, ... } : { -1, ...} to ~mask if the mask
>     types are compatible.  */
>  (simplify
> diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr111150.C b/gcc/testsuite/g++.dg/tree-ssa/pr111150.C
> new file mode 100644
> index 00000000000..ca02d8dc51e
> --- /dev/null
> +++ b/gcc/testsuite/g++.dg/tree-ssa/pr111150.C
> @@ -0,0 +1,33 @@
> +/* PR tree-optimization/111150 */
> +/* { dg-do compile } */
> +/* { dg-options "-O1 -fdump-tree-forwprop1" } */
> +typedef int v4si __attribute((__vector_size__(4 * sizeof(int))));
> +
> +/* Before the patch, VEC_COND_EXPR was generated for each statement in the
> +   function. This resulted in 3 VEC_COND_EXPR. */
> +v4si f1_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
> +  v4si X = a == b ? e : f;
> +  v4si Y = c == d ? e : f;
> +  return (X != Y);
> +}
> +
> +v4si f2_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
> +  v4si X = a == b ? e : f;
> +  v4si Y = c == d ? e : f;
> +  return (X == Y);
> +}
> +
> +v4si f3_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
> +  v4si X = a == b ? e : f;
> +  v4si Y = c == d ? f : e;
> +  return (X != Y);
> +}
> +
> +v4si f4_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
> +  v4si X = a == b ? e : f;
> +  v4si Y = c == d ? f : e;
> +  return (X == Y);
> +}
> +
> +/* For each testcase, should produce only one VEC_COND_EXPR for X^Y. */
> +/* { dg-final { scan-tree-dump-times " VEC_COND_EXPR " 4 "forwprop1" } } */
> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c
> new file mode 100644
> index 00000000000..6f4b21ac6bc
> --- /dev/null
> +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c
> @@ -0,0 +1,72 @@
> +/* PR tree-optimization/111150 */
> +/* { dg-do compile } */
> +/* { dg-options "-O1 -fgimple -fdump-tree-forwprop1-raw" } */
> +
> +/* Checks if pattern (X ? e : f) == (Y ? e : f) gets optimized. */
> +__GIMPLE()
> +_Bool f1_(int a, int b, int c, int d, int e, int f) {
> +  _Bool X;
> +  _Bool Y;
> +  _Bool t;
> +  int t1;
> +  int t2;
> +  X = a == b;
> +  Y = c == d;
> +  /* Before the patch cond_expr was generated for these 2 statements. */
> +  t1 = X ? e : f;
> +  t2 = Y ? e : f;
> +  t = t1 == t2;
> +  return t;
> +}
> +
> +/* Checks if pattern (X ? e : f) != (Y ? e : f) gets optimized. */
> +__GIMPLE()
> +_Bool f2_(int a, int b, int c, int d, int e, int f) {
> +  _Bool X;
> +  _Bool Y;
> +  _Bool t;
> +  int t1;
> +  int t2;
> +  X = a == b;
> +  Y = c == d;
> +  t1 = X ? e : f;
> +  t2 = Y ? e : f;
> +  t = t1 != t2;
> +  return t;
> +}
> +
> +/* Checks if pattern (X ? e : f) == (Y ? f : e) gets optimized. */
> +__GIMPLE()
> +_Bool f3_(int a, int b, int c, int d, int e, int f) {
> +  _Bool X;
> +  _Bool Y;
> +  _Bool t;
> +  int t1;
> +  int t2;
> +  X = a == b;
> +  Y = c == d;
> +  t1 = X ? e : f;
> +  t2 = Y ? f : e;
> +  t = t1 == t2;
> +  return t;
> +}
> +
> +/* Checks if pattern (X ? e : f) != (Y ? f : e) gets optimized. */
> +__GIMPLE()
> +_Bool f4_(int a, int b, int c, int d, int e, int f) {
> +  _Bool X;
> +  _Bool Y;
> +  _Bool t;
> +  int t1;
> +  int t2;
> +  X = a == b;
> +  Y = c == d;
> +  t1 = X ? e : f;
> +  t2 = Y ? f : e;
> +  t = t1 != t2;
> +  return t;
> +}
> +
> +/* Should generate one bit_xor_expr for each testcase. */
> +/* { dg-final { scan-tree-dump-not "cond_expr, "  "forwprop1" } } */
> +/* { dg-final { scan-tree-dump-times "bit_xor_expr, " 4 "forwprop1" } } */
> diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr111150.c b/gcc/testsuite/gcc.dg/tree-ssa/pr111150.c
> new file mode 100644
> index 00000000000..cf25c5d758c
> --- /dev/null
> +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr111150.c
> @@ -0,0 +1,22 @@
> +/* PR tree-optimization/111150 */
> +/* { dg-do compile } */
> +/* { dg-options "-O1 -fdump-tree-forwprop1" } */
> +
> +typedef int v4si __attribute((__vector_size__(4 * sizeof(int))));
> +
> +/* Before the patch, VEC_COND_EXPR was generated for each statement in the
> +   function. This resulted in 3 VEC_COND_EXPR. */
> +v4si f1_(v4si a, v4si b, v4si c, v4si d) {
> +  v4si X = a == b;
> +  v4si Y = c == d;
> +  return (X != Y);
> +}
> +
> +v4si f2_(v4si a, v4si b, v4si c, v4si d) {
> +  v4si X = a == b;
> +  v4si Y = c == d;
> +  return (X == Y);
> +}
> +
> +/* For each testcase, should produce only one VEC_COND_EXPR for X^Y. */
> +/* { dg-final { scan-tree-dump-times " VEC_COND_EXPR " 2 "forwprop1" } } */
> --
> 2.17.1
>
Andrew Pinski July 17, 2024, 5 p.m. UTC | #2
On Wed, Jul 17, 2024 at 5:24 AM Richard Biener
<richard.guenther@gmail.com> wrote:
>
> On Tue, Jul 16, 2024 at 3:36 PM Eikansh Gupta <quic_eikagupt@quicinc.com> wrote:
> >
> > This patch adds match pattern for `(a ? x : y) eq/ne (b ? x : y)`.
> > In forwprop1 pass, depending on the type of `a` and `b`, GCC produces
> > `vec_cond` or `cond_expr`. Based on the observation that `(x != y)` is
> > TRUE, the pattern can be optimized to produce `(a^b ? TRUE : FALSE)`.
> >
> > The patch adds match pattern for a, b:
> > (a ? x : y) != (b ? x : y) --> (a^b) ? TRUE  : FALSE
> > (a ? x : y) == (b ? x : y) --> (a^b) ? FALSE : TRUE
> > (a ? x : y) != (b ? y : x) --> (a^b) ? TRUE  : FALSE
> > (a ? x : y) == (b ? y : x) --> (a^b) ? FALSE : TRUE
>
> OK.

Pushed as r15-2106-g44fcc1ca11e7ea (with one small change to the
commit message in the changelog where tabs should be used before the
*; most likely a copy and paste error).

Thanks,
Andrew

>
> Richard.
>
> >         PR tree-optimization/111150
> >
> > gcc/ChangeLog:
> >
> >         * match.pd (`(a ? x : y) eq/ne (b ? x : y)`): New pattern.
> >         (`(a ? x : y) eq/ne (b ? y : x)`): New pattern.
> >
> > gcc/testsuite/ChangeLog:
> >
> >         * gcc.dg/tree-ssa/pr111150.c: New test.
> >         * gcc.dg/tree-ssa/pr111150-1.c: New test.
> >         * g++.dg/tree-ssa/pr111150.C: New test.
> >
> > Signed-off-by: Eikansh Gupta <quic_eikagupt@quicinc.com>
> > ---
> >  gcc/match.pd                               | 15 +++++
> >  gcc/testsuite/g++.dg/tree-ssa/pr111150.C   | 33 ++++++++++
> >  gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c | 72 ++++++++++++++++++++++
> >  gcc/testsuite/gcc.dg/tree-ssa/pr111150.c   | 22 +++++++
> >  4 files changed, 142 insertions(+)
> >  create mode 100644 gcc/testsuite/g++.dg/tree-ssa/pr111150.C
> >  create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c
> >  create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr111150.c
> >
> > diff --git a/gcc/match.pd b/gcc/match.pd
> > index 3759c64d461..7c125255ea3 100644
> > --- a/gcc/match.pd
> > +++ b/gcc/match.pd
> > @@ -5577,6 +5577,21 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
> >    (vec_cond (bit_and (bit_not @0) @1) @2 @3)))
> >  #endif
> >
> > +/* (a ? x : y) != (b ? x : y) --> (a^b) ? TRUE  : FALSE */
> > +/* (a ? x : y) == (b ? x : y) --> (a^b) ? FALSE : TRUE  */
> > +/* (a ? x : y) != (b ? y : x) --> (a^b) ? FALSE : TRUE  */
> > +/* (a ? x : y) == (b ? y : x) --> (a^b) ? TRUE  : FALSE */
> > +(for cnd (cond vec_cond)
> > + (for eqne (eq ne)
> > +  (simplify
> > +   (eqne:c (cnd @0 @1 @2) (cnd @3 @1 @2))
> > +    (cnd (bit_xor @0 @3) { constant_boolean_node (eqne == NE_EXPR, type); }
> > +     { constant_boolean_node (eqne != NE_EXPR, type); }))
> > +  (simplify
> > +   (eqne:c (cnd @0 @1 @2) (cnd @3 @2 @1))
> > +    (cnd (bit_xor @0 @3) { constant_boolean_node (eqne != NE_EXPR, type); }
> > +     { constant_boolean_node (eqne == NE_EXPR, type); }))))
> > +
> >  /* Canonicalize mask ? { 0, ... } : { -1, ...} to ~mask if the mask
> >     types are compatible.  */
> >  (simplify
> > diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr111150.C b/gcc/testsuite/g++.dg/tree-ssa/pr111150.C
> > new file mode 100644
> > index 00000000000..ca02d8dc51e
> > --- /dev/null
> > +++ b/gcc/testsuite/g++.dg/tree-ssa/pr111150.C
> > @@ -0,0 +1,33 @@
> > +/* PR tree-optimization/111150 */
> > +/* { dg-do compile } */
> > +/* { dg-options "-O1 -fdump-tree-forwprop1" } */
> > +typedef int v4si __attribute((__vector_size__(4 * sizeof(int))));
> > +
> > +/* Before the patch, VEC_COND_EXPR was generated for each statement in the
> > +   function. This resulted in 3 VEC_COND_EXPR. */
> > +v4si f1_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
> > +  v4si X = a == b ? e : f;
> > +  v4si Y = c == d ? e : f;
> > +  return (X != Y);
> > +}
> > +
> > +v4si f2_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
> > +  v4si X = a == b ? e : f;
> > +  v4si Y = c == d ? e : f;
> > +  return (X == Y);
> > +}
> > +
> > +v4si f3_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
> > +  v4si X = a == b ? e : f;
> > +  v4si Y = c == d ? f : e;
> > +  return (X != Y);
> > +}
> > +
> > +v4si f4_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
> > +  v4si X = a == b ? e : f;
> > +  v4si Y = c == d ? f : e;
> > +  return (X == Y);
> > +}
> > +
> > +/* For each testcase, should produce only one VEC_COND_EXPR for X^Y. */
> > +/* { dg-final { scan-tree-dump-times " VEC_COND_EXPR " 4 "forwprop1" } } */
> > diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c
> > new file mode 100644
> > index 00000000000..6f4b21ac6bc
> > --- /dev/null
> > +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c
> > @@ -0,0 +1,72 @@
> > +/* PR tree-optimization/111150 */
> > +/* { dg-do compile } */
> > +/* { dg-options "-O1 -fgimple -fdump-tree-forwprop1-raw" } */
> > +
> > +/* Checks if pattern (X ? e : f) == (Y ? e : f) gets optimized. */
> > +__GIMPLE()
> > +_Bool f1_(int a, int b, int c, int d, int e, int f) {
> > +  _Bool X;
> > +  _Bool Y;
> > +  _Bool t;
> > +  int t1;
> > +  int t2;
> > +  X = a == b;
> > +  Y = c == d;
> > +  /* Before the patch cond_expr was generated for these 2 statements. */
> > +  t1 = X ? e : f;
> > +  t2 = Y ? e : f;
> > +  t = t1 == t2;
> > +  return t;
> > +}
> > +
> > +/* Checks if pattern (X ? e : f) != (Y ? e : f) gets optimized. */
> > +__GIMPLE()
> > +_Bool f2_(int a, int b, int c, int d, int e, int f) {
> > +  _Bool X;
> > +  _Bool Y;
> > +  _Bool t;
> > +  int t1;
> > +  int t2;
> > +  X = a == b;
> > +  Y = c == d;
> > +  t1 = X ? e : f;
> > +  t2 = Y ? e : f;
> > +  t = t1 != t2;
> > +  return t;
> > +}
> > +
> > +/* Checks if pattern (X ? e : f) == (Y ? f : e) gets optimized. */
> > +__GIMPLE()
> > +_Bool f3_(int a, int b, int c, int d, int e, int f) {
> > +  _Bool X;
> > +  _Bool Y;
> > +  _Bool t;
> > +  int t1;
> > +  int t2;
> > +  X = a == b;
> > +  Y = c == d;
> > +  t1 = X ? e : f;
> > +  t2 = Y ? f : e;
> > +  t = t1 == t2;
> > +  return t;
> > +}
> > +
> > +/* Checks if pattern (X ? e : f) != (Y ? f : e) gets optimized. */
> > +__GIMPLE()
> > +_Bool f4_(int a, int b, int c, int d, int e, int f) {
> > +  _Bool X;
> > +  _Bool Y;
> > +  _Bool t;
> > +  int t1;
> > +  int t2;
> > +  X = a == b;
> > +  Y = c == d;
> > +  t1 = X ? e : f;
> > +  t2 = Y ? f : e;
> > +  t = t1 != t2;
> > +  return t;
> > +}
> > +
> > +/* Should generate one bit_xor_expr for each testcase. */
> > +/* { dg-final { scan-tree-dump-not "cond_expr, "  "forwprop1" } } */
> > +/* { dg-final { scan-tree-dump-times "bit_xor_expr, " 4 "forwprop1" } } */
> > diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr111150.c b/gcc/testsuite/gcc.dg/tree-ssa/pr111150.c
> > new file mode 100644
> > index 00000000000..cf25c5d758c
> > --- /dev/null
> > +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr111150.c
> > @@ -0,0 +1,22 @@
> > +/* PR tree-optimization/111150 */
> > +/* { dg-do compile } */
> > +/* { dg-options "-O1 -fdump-tree-forwprop1" } */
> > +
> > +typedef int v4si __attribute((__vector_size__(4 * sizeof(int))));
> > +
> > +/* Before the patch, VEC_COND_EXPR was generated for each statement in the
> > +   function. This resulted in 3 VEC_COND_EXPR. */
> > +v4si f1_(v4si a, v4si b, v4si c, v4si d) {
> > +  v4si X = a == b;
> > +  v4si Y = c == d;
> > +  return (X != Y);
> > +}
> > +
> > +v4si f2_(v4si a, v4si b, v4si c, v4si d) {
> > +  v4si X = a == b;
> > +  v4si Y = c == d;
> > +  return (X == Y);
> > +}
> > +
> > +/* For each testcase, should produce only one VEC_COND_EXPR for X^Y. */
> > +/* { dg-final { scan-tree-dump-times " VEC_COND_EXPR " 2 "forwprop1" } } */
> > --
> > 2.17.1
> >
Adhemerval Zanella July 25, 2024, 7 p.m. UTC | #3
On 17/07/24 14:00, Andrew Pinski wrote:
> On Wed, Jul 17, 2024 at 5:24 AM Richard Biener
> <richard.guenther@gmail.com> wrote:
>>
>> On Tue, Jul 16, 2024 at 3:36 PM Eikansh Gupta <quic_eikagupt@quicinc.com> wrote:
>>>
>>> This patch adds match pattern for `(a ? x : y) eq/ne (b ? x : y)`.
>>> In forwprop1 pass, depending on the type of `a` and `b`, GCC produces
>>> `vec_cond` or `cond_expr`. Based on the observation that `(x != y)` is
>>> TRUE, the pattern can be optimized to produce `(a^b ? TRUE : FALSE)`.
>>>
>>> The patch adds match pattern for a, b:
>>> (a ? x : y) != (b ? x : y) --> (a^b) ? TRUE  : FALSE
>>> (a ? x : y) == (b ? x : y) --> (a^b) ? FALSE : TRUE
>>> (a ? x : y) != (b ? y : x) --> (a^b) ? TRUE  : FALSE
>>> (a ? x : y) == (b ? y : x) --> (a^b) ? FALSE : TRUE
>>
>> OK.
> 
> Pushed as r15-2106-g44fcc1ca11e7ea (with one small change to the
> commit message in the changelog where tabs should be used before the
> *; most likely a copy and paste error).

It seems that this change triggered with Linaro CI on arm 32 bit [1]:

--
Executing on host: /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/destdir/x86_64-pc-linux-gnu/bin/arm-eabi-g++   /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C  -mthumb -march=armv8.1-m.main+mve.fp+fp.dp -mtune=cortex-m55 -mfloat-abi=hard -mfpu=auto   -fdiagnostics-plain-output  -nostdinc++ -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/x86_64-pc-linux-gnu/arm-eabi/gcc-gcc.git~master-stage2/arm-eabi/libstdc++-v3/include/arm-eabi -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/x86_64-pc-linux-gnu/arm-eabi/gcc-gcc.git~master-stage2/arm-eabi/libstdc++-v3/include -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/libsupc++ -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/include/backward -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/testsuite/util -fmessage-length=0  -std=gnu++98 -O1 -fdump-tree-forwprop1 -Wno-psabi  -S  -o pr111150.s    (timeout = 600)
spawn -ignore SIGHUP /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/destdir/x86_64-pc-linux-gnu/bin/arm-eabi-g++ /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C -mthumb -march=armv8.1-m.main+mve.fp+fp.dp -mtune=cortex-m55 -mfloat-abi=hard -mfpu=auto -fdiagnostics-plain-output -nostdinc++ -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/x86_64-pc-linux-gnu/arm-eabi/gcc-gcc.git~master-stage2/arm-eabi/libstdc++-v3/include/arm-eabi -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/x86_64-pc-linux-gnu/arm-eabi/gcc-gcc.git~master-stage2/arm-eabi/libstdc++-v3/include -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/libsupc++ -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/include/backward -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/testsuite/util -fmessage-length=0 -std=gnu++98 -O1 -fdump-tree-forwprop1 -Wno-psabi -S -o pr111150.s
/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C: In function 'v4si f1_(v4si, v4si, v4si, v4si, v4si, v4si)':
/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C:13:1: error: unrecognizable insn:
(insn 22 21 26 2 (set (reg:V4SI 120 [ <retval> ])
        (unspec:V4SI [
                (reg:V4SI 136)
                (reg:V4SI 137)
                (subreg:V4BI (reg:HI 135) 0)
            ] VPSELQ_S)) "/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C":12:17 -1
     (nil))
during RTL pass: vregs
/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C:13:1: internal compiler error: in extract_insn, at recog.cc:2848
0x21fd635 internal_error(char const*, ...)
	../../../../../../gcc/gcc/diagnostic-global-context.cc:491
0x9a0958 fancy_abort(char const*, int, char const*)
	../../../../../../gcc/gcc/diagnostic.cc:1725
0x840e4d _fatal_insn(char const*, rtx_def const*, char const*, int, char const*)
	../../../../../../gcc/gcc/rtl-error.cc:108
0x840e6f _fatal_insn_not_found(rtx_def const*, char const*, int, char const*)
	../../../../../../gcc/gcc/rtl-error.cc:116
0x83f76b extract_insn(rtx_insn*)
	../../../../../../gcc/gcc/recog.cc:2848
0xf1a805 instantiate_virtual_regs_in_insn
	../../../../../../gcc/gcc/function.cc:1612
0xf1a805 instantiate_virtual_regs
	../../../../../../gcc/gcc/function.cc:1995
0xf1a805 execute
	../../../../../../gcc/gcc/function.cc:2042
--

Should I open a bug report?

[1] https://ci.linaro.org/job/tcwg_gnu_embed_check_gcc--master-thumb_m55_hard_eabi-build/517/artifact/artifacts/00-sumfiles/
Andrew Pinski July 25, 2024, 7:19 p.m. UTC | #4
On Thu, Jul 25, 2024 at 12:01 PM Adhemerval Zanella Netto
<adhemerval.zanella@linaro.org> wrote:
>
>
>
> On 17/07/24 14:00, Andrew Pinski wrote:
> > On Wed, Jul 17, 2024 at 5:24 AM Richard Biener
> > <richard.guenther@gmail.com> wrote:
> >>
> >> On Tue, Jul 16, 2024 at 3:36 PM Eikansh Gupta <quic_eikagupt@quicinc.com> wrote:
> >>>
> >>> This patch adds match pattern for `(a ? x : y) eq/ne (b ? x : y)`.
> >>> In forwprop1 pass, depending on the type of `a` and `b`, GCC produces
> >>> `vec_cond` or `cond_expr`. Based on the observation that `(x != y)` is
> >>> TRUE, the pattern can be optimized to produce `(a^b ? TRUE : FALSE)`.
> >>>
> >>> The patch adds match pattern for a, b:
> >>> (a ? x : y) != (b ? x : y) --> (a^b) ? TRUE  : FALSE
> >>> (a ? x : y) == (b ? x : y) --> (a^b) ? FALSE : TRUE
> >>> (a ? x : y) != (b ? y : x) --> (a^b) ? TRUE  : FALSE
> >>> (a ? x : y) == (b ? y : x) --> (a^b) ? FALSE : TRUE
> >>
> >> OK.
> >
> > Pushed as r15-2106-g44fcc1ca11e7ea (with one small change to the
> > commit message in the changelog where tabs should be used before the
> > *; most likely a copy and paste error).
>
> It seems that this change triggered with Linaro CI on arm 32 bit [1]:
>
> --
> Executing on host: /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/destdir/x86_64-pc-linux-gnu/bin/arm-eabi-g++   /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C  -mthumb -march=armv8.1-m.main+mve.fp+fp.dp -mtune=cortex-m55 -mfloat-abi=hard -mfpu=auto   -fdiagnostics-plain-output  -nostdinc++ -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/x86_64-pc-linux-gnu/arm-eabi/gcc-gcc.git~master-stage2/arm-eabi/libstdc++-v3/include/arm-eabi -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/x86_64-pc-linux-gnu/arm-eabi/gcc-gcc.git~master-stage2/arm-eabi/libstdc++-v3/include -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/libsupc++ -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/include/backward -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/testsuite/util -fmessage-length=0  -std=gnu++98 -O1 -fdump-tree-forwprop1 -Wno-psabi  -S  -o pr111150.s    (timeout = 600)
> spawn -ignore SIGHUP /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/destdir/x86_64-pc-linux-gnu/bin/arm-eabi-g++ /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C -mthumb -march=armv8.1-m.main+mve.fp+fp.dp -mtune=cortex-m55 -mfloat-abi=hard -mfpu=auto -fdiagnostics-plain-output -nostdinc++ -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/x86_64-pc-linux-gnu/arm-eabi/gcc-gcc.git~master-stage2/arm-eabi/libstdc++-v3/include/arm-eabi -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/builds/x86_64-pc-linux-gnu/arm-eabi/gcc-gcc.git~master-stage2/arm-eabi/libstdc++-v3/include -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/libsupc++ -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/include/backward -I/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/libstdc++-v3/testsuite/util -fmessage-length=0 -std=gnu++98 -O1 -fdump-tree-forwprop1 -Wno-psabi -S -o pr111150.s
> /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C: In function 'v4si f1_(v4si, v4si, v4si, v4si, v4si, v4si)':
> /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C:13:1: error: unrecognizable insn:
> (insn 22 21 26 2 (set (reg:V4SI 120 [ <retval> ])
>         (unspec:V4SI [
>                 (reg:V4SI 136)
>                 (reg:V4SI 137)
>                 (subreg:V4BI (reg:HI 135) 0)
>             ] VPSELQ_S)) "/home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C":12:17 -1
>      (nil))
> during RTL pass: vregs
> /home/tcwg-buildslave/workspace/tcwg_gnu_1/abe/snapshots/gcc.git~master/gcc/testsuite/g++.dg/tree-ssa/pr111150.C:13:1: internal compiler error: in extract_insn, at recog.cc:2848
> 0x21fd635 internal_error(char const*, ...)
>         ../../../../../../gcc/gcc/diagnostic-global-context.cc:491
> 0x9a0958 fancy_abort(char const*, int, char const*)
>         ../../../../../../gcc/gcc/diagnostic.cc:1725
> 0x840e4d _fatal_insn(char const*, rtx_def const*, char const*, int, char const*)
>         ../../../../../../gcc/gcc/rtl-error.cc:108
> 0x840e6f _fatal_insn_not_found(rtx_def const*, char const*, int, char const*)
>         ../../../../../../gcc/gcc/rtl-error.cc:116
> 0x83f76b extract_insn(rtx_insn*)
>         ../../../../../../gcc/gcc/recog.cc:2848
> 0xf1a805 instantiate_virtual_regs_in_insn
>         ../../../../../../gcc/gcc/function.cc:1612
> 0xf1a805 instantiate_virtual_regs
>         ../../../../../../gcc/gcc/function.cc:1995
> 0xf1a805 execute
>         ../../../../../../gcc/gcc/function.cc:2042
> --
>
> Should I open a bug report?

This is backend bug that was exposed by the patch.

`vcond_mask_<mode><MVE_vpred>` for operand[3] uses s_register_operand
which allows subreg but then it creates a VPSELQ_S unspec which uses
vpr_register_operand as the operand which does not allow subreg and
does not forces into a register.

So you should create/open a bug report against the arm backend.

Thanks,
Andrew Pinski

>
> [1] https://ci.linaro.org/job/tcwg_gnu_embed_check_gcc--master-thumb_m55_hard_eabi-build/517/artifact/artifacts/00-sumfiles/
diff mbox series

Patch

diff --git a/gcc/match.pd b/gcc/match.pd
index 3759c64d461..7c125255ea3 100644
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -5577,6 +5577,21 @@  DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
   (vec_cond (bit_and (bit_not @0) @1) @2 @3)))
 #endif
 
+/* (a ? x : y) != (b ? x : y) --> (a^b) ? TRUE  : FALSE */
+/* (a ? x : y) == (b ? x : y) --> (a^b) ? FALSE : TRUE  */
+/* (a ? x : y) != (b ? y : x) --> (a^b) ? FALSE : TRUE  */
+/* (a ? x : y) == (b ? y : x) --> (a^b) ? TRUE  : FALSE */
+(for cnd (cond vec_cond)
+ (for eqne (eq ne)
+  (simplify
+   (eqne:c (cnd @0 @1 @2) (cnd @3 @1 @2))
+    (cnd (bit_xor @0 @3) { constant_boolean_node (eqne == NE_EXPR, type); }
+     { constant_boolean_node (eqne != NE_EXPR, type); }))
+  (simplify
+   (eqne:c (cnd @0 @1 @2) (cnd @3 @2 @1))
+    (cnd (bit_xor @0 @3) { constant_boolean_node (eqne != NE_EXPR, type); }
+     { constant_boolean_node (eqne == NE_EXPR, type); }))))
+
 /* Canonicalize mask ? { 0, ... } : { -1, ...} to ~mask if the mask
    types are compatible.  */
 (simplify
diff --git a/gcc/testsuite/g++.dg/tree-ssa/pr111150.C b/gcc/testsuite/g++.dg/tree-ssa/pr111150.C
new file mode 100644
index 00000000000..ca02d8dc51e
--- /dev/null
+++ b/gcc/testsuite/g++.dg/tree-ssa/pr111150.C
@@ -0,0 +1,33 @@ 
+/* PR tree-optimization/111150 */
+/* { dg-do compile } */
+/* { dg-options "-O1 -fdump-tree-forwprop1" } */
+typedef int v4si __attribute((__vector_size__(4 * sizeof(int))));
+
+/* Before the patch, VEC_COND_EXPR was generated for each statement in the
+   function. This resulted in 3 VEC_COND_EXPR. */
+v4si f1_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
+  v4si X = a == b ? e : f;
+  v4si Y = c == d ? e : f;
+  return (X != Y);
+}
+
+v4si f2_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
+  v4si X = a == b ? e : f;
+  v4si Y = c == d ? e : f;
+  return (X == Y);
+}
+
+v4si f3_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
+  v4si X = a == b ? e : f;
+  v4si Y = c == d ? f : e;
+  return (X != Y);
+}
+
+v4si f4_(v4si a, v4si b, v4si c, v4si d, v4si e, v4si f) {
+  v4si X = a == b ? e : f;
+  v4si Y = c == d ? f : e;
+  return (X == Y);
+}
+
+/* For each testcase, should produce only one VEC_COND_EXPR for X^Y. */
+/* { dg-final { scan-tree-dump-times " VEC_COND_EXPR " 4 "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c b/gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c
new file mode 100644
index 00000000000..6f4b21ac6bc
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr111150-1.c
@@ -0,0 +1,72 @@ 
+/* PR tree-optimization/111150 */
+/* { dg-do compile } */
+/* { dg-options "-O1 -fgimple -fdump-tree-forwprop1-raw" } */
+
+/* Checks if pattern (X ? e : f) == (Y ? e : f) gets optimized. */
+__GIMPLE()
+_Bool f1_(int a, int b, int c, int d, int e, int f) {
+  _Bool X;
+  _Bool Y;
+  _Bool t;
+  int t1;
+  int t2;
+  X = a == b;
+  Y = c == d;
+  /* Before the patch cond_expr was generated for these 2 statements. */
+  t1 = X ? e : f;
+  t2 = Y ? e : f;
+  t = t1 == t2;
+  return t;
+}
+
+/* Checks if pattern (X ? e : f) != (Y ? e : f) gets optimized. */
+__GIMPLE()
+_Bool f2_(int a, int b, int c, int d, int e, int f) {
+  _Bool X;
+  _Bool Y;
+  _Bool t;
+  int t1;
+  int t2;
+  X = a == b;
+  Y = c == d;
+  t1 = X ? e : f;
+  t2 = Y ? e : f;
+  t = t1 != t2;
+  return t;
+}
+
+/* Checks if pattern (X ? e : f) == (Y ? f : e) gets optimized. */
+__GIMPLE()
+_Bool f3_(int a, int b, int c, int d, int e, int f) {
+  _Bool X;
+  _Bool Y;
+  _Bool t;
+  int t1;
+  int t2;
+  X = a == b;
+  Y = c == d;
+  t1 = X ? e : f;
+  t2 = Y ? f : e;
+  t = t1 == t2;
+  return t;
+}
+
+/* Checks if pattern (X ? e : f) != (Y ? f : e) gets optimized. */
+__GIMPLE()
+_Bool f4_(int a, int b, int c, int d, int e, int f) {
+  _Bool X;
+  _Bool Y;
+  _Bool t;
+  int t1;
+  int t2;
+  X = a == b;
+  Y = c == d;
+  t1 = X ? e : f;
+  t2 = Y ? f : e;
+  t = t1 != t2;
+  return t;
+}
+
+/* Should generate one bit_xor_expr for each testcase. */
+/* { dg-final { scan-tree-dump-not "cond_expr, "  "forwprop1" } } */
+/* { dg-final { scan-tree-dump-times "bit_xor_expr, " 4 "forwprop1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr111150.c b/gcc/testsuite/gcc.dg/tree-ssa/pr111150.c
new file mode 100644
index 00000000000..cf25c5d758c
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/pr111150.c
@@ -0,0 +1,22 @@ 
+/* PR tree-optimization/111150 */
+/* { dg-do compile } */
+/* { dg-options "-O1 -fdump-tree-forwprop1" } */
+
+typedef int v4si __attribute((__vector_size__(4 * sizeof(int))));
+
+/* Before the patch, VEC_COND_EXPR was generated for each statement in the
+   function. This resulted in 3 VEC_COND_EXPR. */
+v4si f1_(v4si a, v4si b, v4si c, v4si d) {
+  v4si X = a == b;
+  v4si Y = c == d;
+  return (X != Y);
+}
+
+v4si f2_(v4si a, v4si b, v4si c, v4si d) {
+  v4si X = a == b;
+  v4si Y = c == d;
+  return (X == Y);
+}
+
+/* For each testcase, should produce only one VEC_COND_EXPR for X^Y. */
+/* { dg-final { scan-tree-dump-times " VEC_COND_EXPR " 2 "forwprop1" } } */