aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Pinski <apinski@marvell.com>2023-09-10 21:58:12 -0700
committerAndrew Pinski <apinski@marvell.com>2023-09-11 07:24:29 -0700
commitb59e9de990a17bfd5fa7252b76339c35bff7f2e8 (patch)
tree1cfb79537e207fe0e311cdd4a46c36cc92e126b8
parentf1dd83b720e0e7ce4e419f33a692a6df684708df (diff)
downloadgcc-b59e9de990a17bfd5fa7252b76339c35bff7f2e8.zip
gcc-b59e9de990a17bfd5fa7252b76339c35bff7f2e8.tar.gz
gcc-b59e9de990a17bfd5fa7252b76339c35bff7f2e8.tar.bz2
MATCH: [PR111349] add missing :c to cmp in the `(a CMP CST1) ? max<a,CST2> : a` pattern
When I added this pattern in r14-1411-g17cca3c43e2f49, I had missed the :c on the cmp part of the pattern meaning there might be some missing optimizations happening. The testcase shows an example of the missed optmization. Committed as obvious after a bootstrap/test on x86_64-linux-gnu. PR tree-optimization/111349 gcc/ChangeLog: * match.pd (`(a CMP CST1) ? max<a,CST2> : a`): Add :c on the cmp part of the pattern. gcc/testsuite/ChangeLog: * gcc.dg/tree-ssa/minmax-25.c: New test.
-rw-r--r--gcc/match.pd2
-rw-r--r--gcc/testsuite/gcc.dg/tree-ssa/minmax-25.c21
2 files changed, 22 insertions, 1 deletions
diff --git a/gcc/match.pd b/gcc/match.pd
index a60fe04..209b059 100644
--- a/gcc/match.pd
+++ b/gcc/match.pd
@@ -5431,7 +5431,7 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT)
(for cmp (gt ge lt le)
minmax (min min max max)
(simplify
- (cond (cmp @0 @1) (minmax:c@2 @0 @3) @4)
+ (cond (cmp:c @0 @1) (minmax:c@2 @0 @3) @4)
(with
{
tree_code code = minmax_from_comparison (cmp, @0, @1, @0, @4);
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/minmax-25.c b/gcc/testsuite/gcc.dg/tree-ssa/minmax-25.c
new file mode 100644
index 0000000..b7a5bfd
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/minmax-25.c
@@ -0,0 +1,21 @@
+/* { dg-do compile } */
+/* { dg-options "-O1 -fdump-tree-optimized -fdump-tree-original" } */
+/* PR tree-optimization/111349 */
+
+int f();
+int g();
+
+int test1(int a, int b)
+{
+ return (a > b) ? ((a > b) ? a : b) : a;
+}
+
+int test1_(int a, int b)
+{
+ return (b < a) ? ((a > b) ? a : b) : a;
+}
+
+/* test1 and test1_ should be able to optimize to `return a;` during fold. */
+/* { dg-final { scan-tree-dump-times "return a;" 2 "original" } } */
+/* { dg-final { scan-tree-dump-not " MAX_EXPR " "original" } } */
+/* { dg-final { scan-tree-dump-times "return a" 2 "optimized" } } */