From patchwork Thu Jun 1 07:20:08 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ajit Agarwal X-Patchwork-Id: 101787 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp108845vqr; Thu, 1 Jun 2023 00:21:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4byqAYR2gaShZYWboVGxA2EQ/TmIkiUo8QaOKUrUzdiALQp6kA+v6YObKdonGLPb8RzGg9 X-Received: by 2002:a17:907:6e0e:b0:974:1eba:dfd6 with SMTP id sd14-20020a1709076e0e00b009741ebadfd6mr6402634ejc.1.1685604076671; Thu, 01 Jun 2023 00:21:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1685604076; cv=none; d=google.com; s=arc-20160816; b=SCOdMV6FZi0qfQf1eM+S6lHCg5AD9u3VNePHir3cjp8jC7ap4vQ0l4Ha23QUxcr9tj hFGGCfCIz/VjOaOUac1991kM45vb2eWbA5IVXn2aCDwoxvU2zjwpsr06vr9uINAFgaX+ DLgCwgE1iSdf8CUVUIy0dY/QsVlc6lz2Rd8iBVrrJQyngfOuGGD/mQuTGW7cjOdlB8eZ wl8iPwYrvt53oQtTlvoq5Juc1N7o5VLke/ti9gYAIZQwzdwFb0MKafif1Cd3WPGY4bwr jhfEUOaUMTLXaJmImdkxNAlVC3wfhjMMsB7HQEOi3WzqQOstDFuPU8JDkIapIIe8V4IR wbHA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence :content-transfer-encoding:subject:cc:to:content-language:user-agent :mime-version:date:message-id:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=Wo6Hx0bpJPWUYDA2tyUUbk5ZLmt2T76oLyHOl7t5UEw=; b=aiPHaORhHDIPVnuaPgX8DZMbPtxDIGjB8Dk+U0Y564swxDgbBhqBwodJ3W4SJPKxqN HAISZSkgiSQb8Fe3TgPLj45F8uBCblDPbvMqbmnuMiIOqZRB3ibkjdqpzuH0FrgIbVGa VRVDUdBpmTQulX356pDgbmmVIj2Ctm1f1VneQNe2d6faxm5u8fqhXe00wuDccWhPWjSg 7cQD0W/z0HClPoXfRyLlezfIu8s2IH097ejVlJ/zn2wDQQvfj0B2o0hPZ9DgfF5IaJl2 cMszU+S3DDaUKEA2Xlo+lFbNB6kaLQjg5jnqBW0zNedRJ4Lx/jWeE0Irbv+/0+ke/kZz mKKw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ulVGkxlV; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id a21-20020a17090640d500b0096f59445af0si4291021ejk.864.2023.06.01.00.21.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Jun 2023 00:21:16 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=ulVGkxlV; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5B2493857720 for ; Thu, 1 Jun 2023 07:21:07 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5B2493857720 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1685604067; bh=Wo6Hx0bpJPWUYDA2tyUUbk5ZLmt2T76oLyHOl7t5UEw=; h=Date:To:Cc:Subject:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=ulVGkxlVUQRKAZDrZn/n59JU2n9ux59EU2YmyA3CI0PuXdK6XoCpTL4hSMBhfDnN2 ecn6aPsOKFcAmDEkwDHCL+Rio4rR7Dlr95zeLxC02bl1E2Bz70bW2+U8JyG7Z9DX6E cohcsDhxdby5YuxkVlufoNNBUJnMiDN6HAMKrl+Y= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx0a-001b2d01.pphosted.com (mx0a-001b2d01.pphosted.com [148.163.156.1]) by sourceware.org (Postfix) with ESMTPS id C7EAA385770A for ; Thu, 1 Jun 2023 07:20:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org C7EAA385770A Received: from pps.filterd (m0353729.ppops.net [127.0.0.1]) by mx0a-001b2d01.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id 3517B40k007650; Thu, 1 Jun 2023 07:20:19 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qxpdb18ks-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 01 Jun 2023 07:20:18 +0000 Received: from m0353729.ppops.net (m0353729.ppops.net [127.0.0.1]) by pps.reinject (8.17.1.5/8.17.1.5) with ESMTP id 3516xHSo013055; Thu, 1 Jun 2023 07:20:17 GMT Received: from ppma01dal.us.ibm.com (83.d6.3fa9.ip4.static.sl-reverse.com [169.63.214.131]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qxpdb18k4-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 01 Jun 2023 07:20:17 +0000 Received: from pps.filterd (ppma01dal.us.ibm.com [127.0.0.1]) by ppma01dal.us.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 3515xk06019388; Thu, 1 Jun 2023 07:20:16 GMT Received: from smtprelay06.dal12v.mail.ibm.com ([9.208.130.100]) by ppma01dal.us.ibm.com (PPS) with ESMTPS id 3qu9g6wbxk-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Thu, 01 Jun 2023 07:20:16 +0000 Received: from smtpav01.dal12v.mail.ibm.com (smtpav01.dal12v.mail.ibm.com [10.241.53.100]) by smtprelay06.dal12v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 3517KFR866060676 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Thu, 1 Jun 2023 07:20:15 GMT Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 19F8658059; Thu, 1 Jun 2023 07:20:15 +0000 (GMT) Received: from smtpav01.dal12v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id 66DAD5805D; Thu, 1 Jun 2023 07:20:11 +0000 (GMT) Received: from [9.43.34.33] (unknown [9.43.34.33]) by smtpav01.dal12v.mail.ibm.com (Postfix) with ESMTP; Thu, 1 Jun 2023 07:20:10 +0000 (GMT) Message-ID: Date: Thu, 1 Jun 2023 12:50:08 +0530 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:102.0) Gecko/20100101 Thunderbird/102.11.2 Content-Language: en-US To: gcc-patches Cc: Richard Biener , Segher Boessenkool , Peter Bergner , Jeff Law , Bernhard Reutner-Fischer Subject: [PATCH v5] tree-ssa-sink: Improve code sinking pass X-TM-AS-GCONF: 00 X-Proofpoint-ORIG-GUID: p9vxEZjMXQ7DHwl2KlSEThNs5dmrNy4n X-Proofpoint-GUID: _rSJ1oDmkdL5ohRjjdR0WSBFFS5L41Me X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.176.26 definitions=2023-06-01_04,2023-05-31_03,2023-05-22_02 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 priorityscore=1501 impostorscore=0 mlxlogscore=999 mlxscore=0 lowpriorityscore=0 suspectscore=0 spamscore=0 adultscore=0 malwarescore=0 clxscore=1015 bulkscore=0 phishscore=0 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2306010062 X-Spam-Status: No, score=-12.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_MSPIKE_H5, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Ajit Agarwal via Gcc-patches From: Ajit Agarwal Reply-To: Ajit Agarwal Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1767392294987516745?= X-GMAIL-MSGID: =?utf-8?q?1767483980178160760?= Hello All: This patch improves code sinking pass to sink statements before call to reduce register pressure. Review comments are incorporated. For example : void bar(); int j; void foo(int a, int b, int c, int d, int e, int f) { int l; l = a + b + c + d +e + f; if (a != 5) { bar(); j = l; } } Code Sinking does the following: void bar(); int j; void foo(int a, int b, int c, int d, int e, int f) { int l; if (a != 5) { l = a + b + c + d +e + f; bar(); j = l; } } Bootstrapped regtested on powerpc64-linux-gnu. Thanks & Regards Ajit tree-ssa-sink: Improve code sinking pass Currently, code sinking will sink code after function calls. This increases register pressure for callee-saved registers. The following patch improves code sinking by placing the sunk code before calls in the use block or in the immediate dominator of the use blocks. 2023-06-01 Ajit Kumar Agarwal gcc/ChangeLog: PR tree-optimization/81953 * tree-ssa-sink.cc (statement_sink_location): Move statements before calls. (def_use_same_block): New function. (select_best_block): Add heuristics to select the best blocks in the immediate post dominator. gcc/testsuite/ChangeLog: PR tree-optimization/81953 * gcc.dg/tree-ssa/ssa-sink-20.c: New testcase. * gcc.dg/tree-ssa/ssa-sink-21.c: New testcase. --- gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-20.c | 15 +++++ gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-21.c | 19 ++++++ gcc/tree-ssa-sink.cc | 71 ++++++++++++++++++--- 3 files changed, 95 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-20.c create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-21.c diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-20.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-20.c new file mode 100644 index 00000000000..d3b79ca5803 --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-20.c @@ -0,0 +1,15 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-sink-stats" } */ +void bar(); +int j; +void foo(int a, int b, int c, int d, int e, int f) +{ + int l; + l = a + b + c + d +e + f; + if (a != 5) + { + bar(); + j = l; + } +} +/* { dg-final { scan-tree-dump {l_12\s+=\s+_4\s+\+\s+f_11\(D\);\n\s+bar\s+\(\)} sink1 } } */ diff --git a/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-21.c b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-21.c new file mode 100644 index 00000000000..84e7938c54f --- /dev/null +++ b/gcc/testsuite/gcc.dg/tree-ssa/ssa-sink-21.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fdump-tree-sink-stats" } */ +void bar(); +int j, x; +void foo(int a, int b, int c, int d, int e, int f) +{ + int l; + l = a + b + c + d +e + f; + if (a != 5) + { + bar(); + if (b != 3) + x = 3; + else + x = 5; + j = l; + } +} +/* { dg-final { scan-tree-dump {l_13\s+=\s+_4\s+\+\s+f_12\(D\);\n\s+bar\s+\(\)} sink1 } } */ diff --git a/gcc/tree-ssa-sink.cc b/gcc/tree-ssa-sink.cc index b1ba7a2ad6c..f1d25f1a0f8 100644 --- a/gcc/tree-ssa-sink.cc +++ b/gcc/tree-ssa-sink.cc @@ -171,9 +171,28 @@ nearest_common_dominator_of_uses (def_operand_p def_p, bool *debug_stmts) return commondom; } +/* Return TRUE if immediate uses of the defs in + STMT occur in the same block as STMT, FALSE otherwise. */ + +static bool +def_use_same_block (gimple *stmt) +{ + def_operand_p def; + ssa_op_iter iter; + + FOR_EACH_SSA_DEF_OPERAND (def, stmt, iter, SSA_OP_DEF) + { + gimple *def_stmt = SSA_NAME_DEF_STMT (DEF_FROM_PTR (def)); + if ((gimple_bb (def_stmt) == gimple_bb (stmt))) + return true; + } + return false; +} + /* Given EARLY_BB and LATE_BB, two blocks in a path through the dominator tree, return the best basic block between them (inclusive) to place - statements. + statements. The best basic block should be an immediate dominator of + best basic block if the use stmt is after the call. We want the most control dependent block in the shallowest loop nest. @@ -190,7 +209,8 @@ nearest_common_dominator_of_uses (def_operand_p def_p, bool *debug_stmts) static basic_block select_best_block (basic_block early_bb, basic_block late_bb, - gimple *stmt) + gimple *stmt, + gimple *use) { basic_block best_bb = late_bb; basic_block temp_bb = late_bb; @@ -237,7 +257,40 @@ select_best_block (basic_block early_bb, /* If result of comparsion is unknown, prefer EARLY_BB. Thus use !(...>=..) rather than (...<...) */ && !(best_bb->count * 100 >= early_bb->count * threshold)) - return best_bb; + { + basic_block new_best_bb = get_immediate_dominator (CDI_DOMINATORS, best_bb); + /* Return best_bb if def and use are in same block otherwise new_best_bb. + + Things to consider: + + new_best_bb is not equal to best_bb and early_bb. + + stmt is not call. + + new_best_bb doesnt have any phis. + + use basic block is not equal to early_bb. + + use basic block post dominates to new_best_bb. + + new_best_bb dominates early_bb. */ + if (new_best_bb && use + && new_best_bb != best_bb + && new_best_bb != early_bb + && !is_gimple_call (stmt) + && gsi_end_p (gsi_start_phis (new_best_bb)) + && gimple_bb (use) != early_bb + && !is_gimple_call (use) + && dominated_by_p (CDI_POST_DOMINATORS, new_best_bb, gimple_bb (use)) + && dominated_by_p (CDI_DOMINATORS, new_best_bb, early_bb)) + { + if (def_use_same_block (use)) + return best_bb; + + return new_best_bb; + } + return best_bb; + } /* No better block found, so return EARLY_BB, which happens to be the statement's original block. */ @@ -439,7 +492,7 @@ statement_sink_location (gimple *stmt, basic_block frombb, if (!dominated_by_p (CDI_DOMINATORS, commondom, frombb)) return false; - commondom = select_best_block (frombb, commondom, stmt); + commondom = select_best_block (frombb, commondom, stmt, NULL); if (commondom == frombb) return false; @@ -456,19 +509,17 @@ statement_sink_location (gimple *stmt, basic_block frombb, continue; break; } + use = USE_STMT (one_use); if (gimple_code (use) != GIMPLE_PHI) { - sinkbb = select_best_block (frombb, gimple_bb (use), stmt); + sinkbb = select_best_block (frombb, gimple_bb (use), stmt, use); if (sinkbb == frombb) return false; - if (sinkbb == gimple_bb (use)) - *togsi = gsi_for_stmt (use); - else - *togsi = gsi_after_labels (sinkbb); + *togsi = gsi_after_labels (sinkbb); return true; } @@ -480,7 +531,7 @@ statement_sink_location (gimple *stmt, basic_block frombb, if (!sinkbb) return false; - sinkbb = select_best_block (frombb, sinkbb, stmt); + sinkbb = select_best_block (frombb, sinkbb, stmt, NULL); if (!sinkbb || sinkbb == frombb) return false;