From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mx0b-0016f401.pphosted.com (mx0a-0016f401.pphosted.com [67.231.148.174]) by sourceware.org (Postfix) with ESMTPS id 8E47A3858D32 for ; Sun, 7 May 2023 22:20:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8E47A3858D32 Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=marvell.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=marvell.com Received: from pps.filterd (m0045849.ppops.net [127.0.0.1]) by mx0a-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 347LtIce013245 for ; Sun, 7 May 2023 15:20:16 -0700 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com; h=from : to : cc : subject : date : message-id : mime-version : content-transfer-encoding : content-type; s=pfpt0220; bh=QKyuIs90aBUcDoXHY3qLKwszaD/qFYVxDgwE+G+/sAg=; b=Ob8NWosvyD4K/BeXLo0c/AirttweLM13XBRIoLHSaeH//JBeyesJeyKXvuRuTwjubFGS JiJ5VIG6gx3HohRzzZrumvaoTKZz46zTx4OoW4Eu7GCdBal/vnPIjH3BlCjT19TNZDj5 iECEwaydlIYL/VJFphhK8asDUqfWwFGzM/Lmx1p17959tuqdqgRL7jSkk3MO19eeVQ/P QIXT4TT4zTt9hH84peVoJP2Kg0lD8KegKhSWv1WHBb1+Jm7sNmxbPORU/pZXouMKNUd1 jEpO8B/ZXaCtyWYLgGy06RBvTE2OV05FzCje1uDcddEeW+A2uAGmIZp28ab4OJyY82t3 HA== Received: from dc5-exch01.marvell.com ([199.233.59.181]) by mx0a-0016f401.pphosted.com (PPS) with ESMTPS id 3qdm8t3v54-3 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT) for ; Sun, 07 May 2023 15:20:15 -0700 Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.48; Sun, 7 May 2023 15:20:08 -0700 Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com (10.69.176.38) with Microsoft SMTP Server id 15.0.1497.48 via Frontend Transport; Sun, 7 May 2023 15:20:08 -0700 Received: from vpnclient.wrightpinski.org.com (unknown [10.69.242.187]) by maili.marvell.com (Postfix) with ESMTP id 5432D5B692B; Sun, 7 May 2023 15:20:07 -0700 (PDT) From: Andrew Pinski To: CC: Andrew Pinski Subject: [PATCH] MATCH: Move `a <= CST1 ? MAX : a` optimization to match Date: Sun, 7 May 2023 15:19:59 -0700 Message-ID: <20230507221959.1166993-1-apinski@marvell.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Proofpoint-GUID: SvgEg_mbxWnl9FlWIoAno8UXccZ5jhdz X-Proofpoint-ORIG-GUID: SvgEg_mbxWnl9FlWIoAno8UXccZ5jhdz X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-07_08,2023-05-05_01,2023-02-09_01 X-Spam-Status: No, score=-14.6 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,SPF_HELO_NONE,SPF_NONE,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: This moves the `a <= CST1 ? MAX : a` optimization from phiopt to match. It just adds a new pattern to match.pd. There is one more change needed before being able to remove minmax_replacement from phiopt. A few notes on the testsuite changes: * phi-opt-5.c is now able to optimize at phiopt1 so remove the xfail. * pr66726-4.c can be optimized during fold before phiopt1 so need to change the scanning. * pr66726-5.c needs two phiopt passes currently to optimize to the right thing, it needed 2 phiopt passes before, the cast from int to unsigned char is the reason. * pr66726-6.c is what the original pr66726-4.c was testing before the fold was able to optimize it. OK? Bootstrapped and tested on x86_64-linux-gnu. gcc/ChangeLog: * match.pd (`(a CMP CST1) ? max : a`): New pattern. gcc/testsuite/ChangeLog: * gcc.dg/tree-ssa/phi-opt-5.c: Remove last xfail. * gcc.dg/tree-ssa/pr66726-4.c: Change how scanning works. * gcc.dg/tree-ssa/pr66726-5.c: New test. * gcc.dg/tree-ssa/pr66726-6.c: New test. --- gcc/match.pd | 18 +++++++++++++++ gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c | 2 +- gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c | 5 +++- gcc/testsuite/gcc.dg/tree-ssa/pr66726-5.c | 28 +++++++++++++++++++++++ gcc/testsuite/gcc.dg/tree-ssa/pr66726-6.c | 17 ++++++++++++++ 5 files changed, 68 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr66726-5.c create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/pr66726-6.c diff --git a/gcc/match.pd b/gcc/match.pd index ceae1c34abc..a55ede838cd 100644 --- a/gcc/match.pd +++ b/gcc/match.pd @@ -4954,6 +4954,24 @@ DEFINE_INT_AND_FLOAT_ROUND_FN (RINT) (if (code == MAX_EXPR) (minmax (max @1 @2) @4))))))) +/* Optimize (a CMP CST1) ? max : a */ +(for cmp (gt ge lt le) + minmax (min min max max) + (simplify + (cond (cmp @0 @1) (minmax:c@2 @0 @3) @4) + (with + { + tree_code code = minmax_from_comparison (cmp, @0, @1, @0, @4); + } + (if ((cmp == LT_EXPR || cmp == LE_EXPR) + && code == MIN_EXPR + && integer_nonzerop (fold_build2 (LE_EXPR, boolean_type_node, @3, @1))) + (min @2 @4) + (if ((cmp == GT_EXPR || cmp == GE_EXPR) + && code == MAX_EXPR + && integer_nonzerop (fold_build2 (GE_EXPR, boolean_type_node, @3, @1))) + (max @2 @4)))))) + /* X != C1 ? -X : C2 simplifies to -X when -C1 == C2. */ (simplify (cond (ne @0 INTEGER_CST@1) (negate@3 @0) INTEGER_CST@2) diff --git a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c index 5f78a1ba6dc..e78d9d8b83d 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/phi-opt-5.c @@ -39,7 +39,7 @@ float repl2 (float vary) /* phiopt1 confused by predictors. */ /* { dg-final { scan-tree-dump "vary.*MAX_EXPR.*0\\.0" "phiopt1" } } */ -/* { dg-final { scan-tree-dump "vary.*MIN_EXPR.*1\\.0" "phiopt1" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump "vary.*MIN_EXPR.*1\\.0" "phiopt1" } } */ /* { dg-final { scan-tree-dump "vary.*MAX_EXPR.*0\\.0" "phiopt2"} } */ /* { dg-final { scan-tree-dump "vary.*MIN_EXPR.*1\\.0" "phiopt2"} } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c b/gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c index 4e43522f3a3..930ad5fb79f 100644 --- a/gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr66726-4.c @@ -9,4 +9,7 @@ foo (unsigned char *p, int i) *p = SAT (i); } -/* { dg-final { scan-tree-dump-times "COND_EXPR .*and PHI .*converted to straightline code" 1 "phiopt1" } } */ +/* fold could optimize SAT before phiopt1 so only match on the + MIN/MAX here. */ +/* { dg-final { scan-tree-dump-times "= MIN_EXPR" 1 "phiopt1" } } */ +/* { dg-final { scan-tree-dump-times "= MAX_EXPR" 1 "phiopt1" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr66726-5.c b/gcc/testsuite/gcc.dg/tree-ssa/pr66726-5.c new file mode 100644 index 00000000000..4b5066cdb6b --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr66726-5.c @@ -0,0 +1,28 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-phiopt1-details -fdump-tree-phiopt2-details -fdump-tree-optimized" } */ + +#define SAT(x) (x < 0 ? 0 : (x > 255 ? 255 : x)) + +unsigned char +foo (unsigned char *p, int i) +{ + if (i < 0) + return 0; + { + int t; + if (i > 255) + t = 255; + else + t = i; + return t; + } +} + +/* Because of the way PHIOPT works, it only does the merging of BBs after it is done so we get the case were we can't + optimize the above until phiopt2 right now. */ +/* { dg-final { scan-tree-dump-times "COND_EXPR .*and PHI .*converted to straightline code" 2 "phiopt1" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "COND_EXPR .*and PHI .*converted to straightline code" 0 "phiopt2" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "= MIN_EXPR" 1 "phiopt1" } } */ +/* { dg-final { scan-tree-dump-times "= MAX_EXPR" 1 "phiopt1" { xfail *-*-* } } } */ +/* { dg-final { scan-tree-dump-times "= MIN_EXPR" 1 "optimized" } } */ +/* { dg-final { scan-tree-dump-times "= MAX_EXPR" 1 "optimized" } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/pr66726-6.c b/gcc/testsuite/gcc.dg/tree-ssa/pr66726-6.c new file mode 100644 index 00000000000..5c6b4992608 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/pr66726-6.c @@ -0,0 +1,17 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-phiopt1-details" } */ + + +unsigned char +foo1 (unsigned char *p, int i) +{ + if (i < 0) + return 0; + { + int t = i > 255 ? 255 : i; + return t; + } +} +/* testing to see if moving the cast out of the conditional. */ + +/* { dg-final { scan-tree-dump-times "COND_EXPR .*and PHI .*converted to straightline code" 1 "phiopt1" } } */ -- 2.31.1