diff options
author | Jakub Jelinek <jakub@redhat.com> | 2024-02-28 09:59:45 +0100 |
---|---|---|
committer | Jakub Jelinek <jakub@redhat.com> | 2024-02-28 09:59:45 +0100 |
commit | d6479050ecef10fd5e67b4da989229e4cfac53ee (patch) | |
tree | ea1431e480d654a2f52fd5eb7ea35965c2296153 | |
parent | cc383e9702897dd783657ea3dce4aecf48318441 (diff) | |
download | gcc-d6479050ecef10fd5e67b4da989229e4cfac53ee.zip gcc-d6479050ecef10fd5e67b4da989229e4cfac53ee.tar.gz gcc-d6479050ecef10fd5e67b4da989229e4cfac53ee.tar.bz2 |
graphite: Fix non-INTEGER_TYPE integral comparison handling [PR114041]
The following testcases are miscompiled, because graphite ignores boolean,
enumerated or _BitInt comparisons, rewrites the code as if the comparisons
were always true or always false.
The INTEGER_TYPE checks were initially added in r6-2239 but at that point
it was both in add_conditions_to_domain and in parameter_index_in_region.
Later on the check was also added to stmt_simple_for_scop_p, and finally
r8-3931 changed the stmt_simple_for_scop_p check to INTEGRAL_TYPE_P
and turned the parameter_index_in_region -> assign_parameter_index_in_region
into INTEGRAL_TYPE_P assertion, but the add_conditions_to_domain check
for INTEGER_TYPE remained.
The following patch uses INTEGRAL_TYPE_P to complete the change.
2024-02-28 Jakub Jelinek <jakub@redhat.com>
PR tree-optimization/114041
* graphite-sese-to-poly.cc (add_conditions_to_domain): Check for
INTEGRAL_TYPE_P check rather than INTEGER_TYPE.
* gcc.dg/graphite/run-id-pr114041-1.c: New test.
* gcc.dg/graphite/run-id-pr114041-2.c: New test.
-rw-r--r-- | gcc/graphite-sese-to-poly.cc | 5 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/graphite/run-id-pr114041-1.c | 23 | ||||
-rw-r--r-- | gcc/testsuite/gcc.dg/graphite/run-id-pr114041-2.c | 27 |
3 files changed, 53 insertions, 2 deletions
diff --git a/gcc/graphite-sese-to-poly.cc b/gcc/graphite-sese-to-poly.cc index 547d661..4f614a3 100644 --- a/gcc/graphite-sese-to-poly.cc +++ b/gcc/graphite-sese-to-poly.cc @@ -391,8 +391,9 @@ add_conditions_to_domain (poly_bb_p pbb) { case GIMPLE_COND: { - /* Don't constrain on anything else than INTEGER_TYPE. */ - if (TREE_CODE (TREE_TYPE (gimple_cond_lhs (stmt))) != INTEGER_TYPE) + /* Don't constrain on anything else than INTEGRAL_TYPE_P. */ + tree cmp_type = TREE_TYPE (gimple_cond_lhs (stmt)); + if (!INTEGRAL_TYPE_P (cmp_type)) break; gcond *cond_stmt = as_a <gcond *> (stmt); diff --git a/gcc/testsuite/gcc.dg/graphite/run-id-pr114041-1.c b/gcc/testsuite/gcc.dg/graphite/run-id-pr114041-1.c new file mode 100644 index 0000000..1ffdd74 --- /dev/null +++ b/gcc/testsuite/gcc.dg/graphite/run-id-pr114041-1.c @@ -0,0 +1,23 @@ +/* PR tree-optimization/114041 */ +/* { dg-require-effective-target bitint } */ +/* { dg-options "-O -fgraphite-identity" } */ + +unsigned a[24], b[24]; + +__attribute__((noipa)) unsigned +foo (unsigned _BitInt(8) x) +{ + for (int i = 0; i < 24; ++i) + a[i] = i; + unsigned e = __builtin_stdc_bit_ceil (x); + for (int i = 0; i < 24; ++i) + b[i] = i; + return e; +} + +int +main () +{ + if (foo (0) != 1) + __builtin_abort (); +} diff --git a/gcc/testsuite/gcc.dg/graphite/run-id-pr114041-2.c b/gcc/testsuite/gcc.dg/graphite/run-id-pr114041-2.c new file mode 100644 index 0000000..c935255 --- /dev/null +++ b/gcc/testsuite/gcc.dg/graphite/run-id-pr114041-2.c @@ -0,0 +1,27 @@ +/* PR tree-optimization/114041 */ +/* { dg-options "-O -fgraphite-identity" } */ + +unsigned a[24], b[24]; +enum E { E0 = 0, E1 = 1, E42 = 42, E56 = 56 }; + +__attribute__((noipa)) unsigned +foo (enum E x) +{ + for (int i = 0; i < 24; ++i) + a[i] = i; + unsigned e; + if (x >= E42) + e = __builtin_clz ((unsigned) x); + else + e = 42; + for (int i = 0; i < 24; ++i) + b[i] = i; + return e; +} + +int +main () +{ + if (foo (E1) != 42 || foo (E56) != __SIZEOF_INT__ * __CHAR_BIT__ - 6) + __builtin_abort (); +} |