public inbox for gcc-cvs@sourceware.org
help / color / mirror / Atom feed
* [gcc r12-9421] tree-vect-generic: Fix up expand_vector_condition [PR109176]
@ 2023-04-18  7:15 Jakub Jelinek
  0 siblings, 0 replies; only message in thread
From: Jakub Jelinek @ 2023-04-18  7:15 UTC (permalink / raw)
  To: gcc-cvs

https://gcc.gnu.org/g:0a4cf0e92cbd5f18de3195fa2deb058f2f88e77e

commit r12-9421-g0a4cf0e92cbd5f18de3195fa2deb058f2f88e77e
Author: Jakub Jelinek <jakub@redhat.com>
Date:   Thu Mar 23 10:02:25 2023 +0100

    tree-vect-generic: Fix up expand_vector_condition [PR109176]
    
    The following testcase ICEs on aarch64-linux, because
    expand_vector_condition attempts to piecewise lower SVE
      d_3 = a_1(D) < b_2(D);
      _5 = VEC_COND_EXPR <d_3, c_4(D), d_3>;
    which isn't possible - nunits_for_known_piecewise_op ICEs but
    the rest of the code assumes constant number of elements too.
    
    expand_vector_condition attempts to find if a (rhs1) is a SSA_NAME
    for comparison and calls expand_vec_cond_expr_p (type, TREE_TYPE (a1), code)
    where a1 is one of the operands of the comparison and code is the comparison
    code.  That one indeed isn't supported here, but what aarch64 SVE supports
    are the individual statements, comparison (expand_vec_cmp_expr_p) and
    expand_vec_cond_expr_p (type, TREE_TYPE (a), SSA_NAME), the latter because
    that function starts with
      if (VECTOR_BOOLEAN_TYPE_P (cmp_op_type)
          && get_vcond_mask_icode (TYPE_MODE (value_type),
                                   TYPE_MODE (cmp_op_type)) != CODE_FOR_nothing)
        return true;
    
    In an earlier version of the patch (in the PR), we did this
      if (VECTOR_BOOLEAN_TYPE_P (TREE_TYPE (a))
          && expand_vec_cond_expr_p (type, TREE_TYPE (a), ERROR_MARK))
        return true;
    before the code == SSA_NAME handling plus some further tweaks later.
    While that fixed the ICE, it broke quite a few tests on x86 and some on
    aarch64 too.  The problem is that expand_vector_comparison doesn't lower
    comparisons which aren't supported and only feed VEC_COND_EXPR first operand
    and expand_vector_condition succeeds for those, so with the above mentioned
    change we'd verify the VEC_COND_EXPR is implementable using optab alone,
    but nothing would verify the tcc_comparison which relied on
    expand_vector_condition to verify.
    
    So, the following patch instead queries whether optabs can handle the
    comparison and VEC_COND_EXPR together (if a (rhs1) is a comparison;
    otherwise as before it checks only the VEC_COND_EXPR) and if that fails,
    also checks whether the two operations could be supported individually
    and only if even that fails does the piecewise lowering.
    
    2023-03-23  Jakub Jelinek  <jakub@redhat.com>
    
            PR tree-optimization/109176
            * tree-vect-generic.cc (expand_vector_condition): If a has
            vector boolean type and is a comparison, also check if both
            the comparison and VEC_COND_EXPR could be successfully expanded
            individually.
    
            * gcc.target/aarch64/sve/pr109176.c: New test.
    
    (cherry picked from commit 484c41c747d95f9cee15a33b75b32ae2e7eb45f3)

Diff:
---
 gcc/testsuite/gcc.target/aarch64/sve/pr109176.c | 12 ++++++++++++
 gcc/tree-vect-generic.cc                        |  9 +++++++++
 2 files changed, 21 insertions(+)

diff --git a/gcc/testsuite/gcc.target/aarch64/sve/pr109176.c b/gcc/testsuite/gcc.target/aarch64/sve/pr109176.c
new file mode 100644
index 00000000000..958edb86ce3
--- /dev/null
+++ b/gcc/testsuite/gcc.target/aarch64/sve/pr109176.c
@@ -0,0 +1,12 @@
+/* PR tree-optimization/109176 */
+/* { dg-do compile } */
+/* { dg-additional-options "-O2" } */
+
+#include <arm_sve.h>
+
+svbool_t
+foo (svint8_t a, svint8_t b, svbool_t c)
+{
+  svbool_t d = svcmplt_s8 (svptrue_pat_b8 (SV_ALL), a, b);
+  return svsel_b (d, c, d);
+}
diff --git a/gcc/tree-vect-generic.cc b/gcc/tree-vect-generic.cc
index e5bd9dc7c76..a84f5e4ca78 100644
--- a/gcc/tree-vect-generic.cc
+++ b/gcc/tree-vect-generic.cc
@@ -1072,6 +1072,15 @@ expand_vector_condition (gimple_stmt_iterator *gsi, bitmap dce_ssa_names)
       return true;
     }
 
+  /* If a has vector boolean type and is a comparison, above
+     expand_vec_cond_expr_p might fail, even if both the comparison and
+     VEC_COND_EXPR could be supported individually.  See PR109176.  */
+  if (a_is_comparison
+      && VECTOR_BOOLEAN_TYPE_P (TREE_TYPE (a))
+      && expand_vec_cond_expr_p (type, TREE_TYPE (a), SSA_NAME)
+      && expand_vec_cmp_expr_p (TREE_TYPE (a1), TREE_TYPE (a), code))
+    return true;
+
   /* Handle vector boolean types with bitmasks.  If there is a comparison
      and we can expand the comparison into the vector boolean bitmask,
      or otherwise if it is compatible with type, we can transform

^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2023-04-18  7:15 UTC | newest]

Thread overview: (only message) (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2023-04-18  7:15 [gcc r12-9421] tree-vect-generic: Fix up expand_vector_condition [PR109176] Jakub Jelinek

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).