From patchwork Wed May 17 06:09:28 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Kewen.Lin" X-Patchwork-Id: 95061 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp909158vqo; Tue, 16 May 2023 23:10:27 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5mPfBjfkIkopgIIQvSboU+IQl2qpIkZTshYQYLb4DQ7QB4xKIT3uIYkaRtXmW/V83VUgnW X-Received: by 2002:a17:907:928e:b0:94e:8cdb:bcee with SMTP id bw14-20020a170907928e00b0094e8cdbbceemr34165537ejc.70.1684303827769; Tue, 16 May 2023 23:10:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1684303827; cv=none; d=google.com; s=arc-20160816; b=ClSFR66HCRwbeRBHzMw3plBDfqTwG7Gd7rp1/6+an3NKhy2U4pzH0tsMiwJFupa+h8 kIbfpdisqzjh3HdjgZhWgxO7Hv7KoxqpqYa0ASn+Po7mgyDScZy8MwlvdpCj9KE3qr5q K9awlBJr64vtUiEp3FUrFzey7HjLUWxTgylOGw3itM1PrAASm9nq0GJQsyWBAE3UKC/V b9jcQ7YYgdNrYncODcgFiupabWAYWX7eskrLC3N5eLi/nodkRvoD4I40M5NUMT+SSYIS cowHtXyxr+S8K+MhAEEYKIdfUEHEYP4cvVG6eQeo6jFnr5KfWtSssQtWUpi43uIY+0Zr /K0Q== 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:cc:to:subject:content-language:user-agent :mime-version:date:message-id:dmarc-filter:delivered-to :dkim-signature:dkim-filter; bh=mN24Sx7pdDwNBJ9JB3pT/IuDNSggRCo+beg62xR7dbU=; b=jtAMn0N4rLvtCDDRAn9qgcZdscoNjDg5i1ulh0NWSVe/16t8i1tAtnM35fcFykNqVr h6ov+kScM7UghL6Rdv8uWskbqgCAyuooacMerj011arZH6PNV45jPrOSdx+gT+0AYaBx +BuK/GqcxzN7S8u89oBOr2nNYXm+PUbAUGzif1peFtythXO5wOWbT3CYH2aHY9hO4oPa HY3rhUZzhboMIboCuZaLle4Ad2Ayh+NqLs0Ffm8xEYd5Z4FbJj4NW3KkceQkQQM7tLNP 1cfykIQ3uVVORQ5RqIpJPRIJzrY3icXOvgx9o5q3NfYNM+9nRMmpeHYiWPu9WrQ+WV37 pTsw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=EXKKsqx+; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id tl11-20020a170907c30b00b00965d6b52385si16438787ejc.180.2023.05.16.23.10.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 16 May 2023 23:10:27 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=EXKKsqx+; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c 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 6FC393856DDF for ; Wed, 17 May 2023 06:10:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 6FC393856DDF DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1684303826; bh=mN24Sx7pdDwNBJ9JB3pT/IuDNSggRCo+beg62xR7dbU=; h=Date:Subject:To:Cc:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=EXKKsqx+oupxwLpa+/hDQV0awWPI25IqknPWstesDUBi2dVsPMKOmhVQ2UrZKAwuL H0XTBGswItHFoPxUqQB3Q5U0aOLp0/xDxhFZ8CGrXzITP3vR9xhb/639/C44zXggAM CXKPmkVbe7mStM/3EoZoy8zoNQqKR+R+9hZjU0N8= 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 344DB3858D1E for ; Wed, 17 May 2023 06:09:42 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 344DB3858D1E 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 34H5nr5Q002755; Wed, 17 May 2023 06:09:38 GMT Received: from pps.reinject (localhost [127.0.0.1]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qms4cggtv-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 May 2023 06:09:38 +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 34H5tbKD021326; Wed, 17 May 2023 06:09:38 GMT Received: from ppma06ams.nl.ibm.com (66.31.33a9.ip4.static.sl-reverse.com [169.51.49.102]) by mx0a-001b2d01.pphosted.com (PPS) with ESMTPS id 3qms4cggs3-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 May 2023 06:09:37 +0000 Received: from pps.filterd (ppma06ams.nl.ibm.com [127.0.0.1]) by ppma06ams.nl.ibm.com (8.17.1.19/8.17.1.19) with ESMTP id 34H5hGW7019589; Wed, 17 May 2023 06:09:35 GMT Received: from smtprelay07.fra02v.mail.ibm.com ([9.218.2.229]) by ppma06ams.nl.ibm.com (PPS) with ESMTPS id 3qj1tdt03q-1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Wed, 17 May 2023 06:09:35 +0000 Received: from smtpav05.fra02v.mail.ibm.com (smtpav05.fra02v.mail.ibm.com [10.20.54.104]) by smtprelay07.fra02v.mail.ibm.com (8.14.9/8.14.9/NCO v10.0) with ESMTP id 34H69VWt28836260 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=OK); Wed, 17 May 2023 06:09:32 GMT Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id D6CC02005A; Wed, 17 May 2023 06:09:31 +0000 (GMT) Received: from smtpav05.fra02v.mail.ibm.com (unknown [127.0.0.1]) by IMSVA (Postfix) with ESMTP id B5AAB20040; Wed, 17 May 2023 06:09:29 +0000 (GMT) Received: from [9.177.81.160] (unknown [9.177.81.160]) by smtpav05.fra02v.mail.ibm.com (Postfix) with ESMTP; Wed, 17 May 2023 06:09:29 +0000 (GMT) Message-ID: <72a5c5db-bc06-eded-d229-82af34342515@linux.ibm.com> Date: Wed, 17 May 2023 14:09:28 +0800 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Macintosh; Intel Mac OS X 10.15; rv:91.0) Gecko/20100101 Thunderbird/91.6.1 Content-Language: en-US Subject: [PATCH 1/2] vect: Refactor code for index == count in vect_transform_slp_perm_load_1 To: GCC Patches Cc: Richard Biener , Richard Sandiford , Segher Boessenkool , Peter Bergner X-TM-AS-GCONF: 00 X-Proofpoint-GUID: YjUu2TzCbZEedqcZtUqgnJurKmh4mSz1 X-Proofpoint-ORIG-GUID: BIsk0BwUULKTKalPn38Zwfkyogd58uKn X-Proofpoint-Virus-Version: vendor=baseguard engine=ICAP:2.0.254,Aquarius:18.0.957,Hydra:6.0.573,FMLib:17.11.170.22 definitions=2023-05-16_14,2023-05-16_01,2023-02-09_01 X-Proofpoint-Spam-Details: rule=outbound_notspam policy=outbound score=0 malwarescore=0 adultscore=0 priorityscore=1501 mlxscore=0 lowpriorityscore=0 phishscore=0 suspectscore=0 impostorscore=0 mlxlogscore=999 spamscore=0 bulkscore=0 clxscore=1015 classifier=spam adjust=0 reason=mlx scancount=1 engine=8.12.0-2304280000 definitions=main-2305170051 X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_EF, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_MSPIKE_H2, 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: "Kewen.Lin via Gcc-patches" From: "Kewen.Lin" Reply-To: "Kewen.Lin" 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?1766120570540689099?= X-GMAIL-MSGID: =?utf-8?q?1766120570540689099?= Hi, This patch is to refactor the handlings for the case (index == count) in a loop of vect_transform_slp_perm_load_1, in order to prepare a subsequent adjustment on *nperm. This patch doesn't have any functional changes. Bootstrapped and regtested on x86_64-redhat-linux, aarch64-linux-gnu and powerpc64{,le}-linux-gnu. BR, Kewen ----- gcc/ChangeLog: * tree-vect-slp.cc (vect_transform_slp_perm_load_1): Refactor the handling on the case index == count. --- gcc/tree-vect-slp.cc | 89 ++++++++++++++++++++++---------------------- 1 file changed, 44 insertions(+), 45 deletions(-) -- 2.39.1 diff --git a/gcc/tree-vect-slp.cc b/gcc/tree-vect-slp.cc index 3b7a21724ec..e5c9d7e766e 100644 --- a/gcc/tree-vect-slp.cc +++ b/gcc/tree-vect-slp.cc @@ -8230,59 +8230,50 @@ vect_transform_slp_perm_load_1 (vec_info *vinfo, slp_tree node, noop_p = false; mask[index++] = mask_element; - if (index == count && !noop_p) + if (index == count) { - indices.new_vector (mask, second_vec_index == -1 ? 1 : 2, nunits); - if (!can_vec_perm_const_p (mode, mode, indices)) + if (!noop_p) { - if (dump_p) + indices.new_vector (mask, second_vec_index == -1 ? 1 : 2, nunits); + if (!can_vec_perm_const_p (mode, mode, indices)) { - dump_printf_loc (MSG_MISSED_OPTIMIZATION, - vect_location, - "unsupported vect permute { "); - for (i = 0; i < count; ++i) + if (dump_p) { - dump_dec (MSG_MISSED_OPTIMIZATION, mask[i]); - dump_printf (MSG_MISSED_OPTIMIZATION, " "); + dump_printf_loc (MSG_MISSED_OPTIMIZATION, vect_location, + "unsupported vect permute { "); + for (i = 0; i < count; ++i) + { + dump_dec (MSG_MISSED_OPTIMIZATION, mask[i]); + dump_printf (MSG_MISSED_OPTIMIZATION, " "); + } + dump_printf (MSG_MISSED_OPTIMIZATION, "}\n"); } - dump_printf (MSG_MISSED_OPTIMIZATION, "}\n"); + gcc_assert (analyze_only); + return false; } - gcc_assert (analyze_only); - return false; - } - ++*n_perms; - } + ++*n_perms; - if (index == count) - { - if (!analyze_only) - { - tree mask_vec = NULL_TREE; - - if (! noop_p) - mask_vec = vect_gen_perm_mask_checked (vectype, indices); + if (!analyze_only) + { + tree mask_vec = vect_gen_perm_mask_checked (vectype, indices); - if (second_vec_index == -1) - second_vec_index = first_vec_index; + if (second_vec_index == -1) + second_vec_index = first_vec_index; - for (unsigned int ri = 0; ri < nvectors_per_build; ++ri) - { - /* Generate the permute statement if necessary. */ - tree first_vec = dr_chain[first_vec_index + ri]; - tree second_vec = dr_chain[second_vec_index + ri]; - gimple *perm_stmt; - if (! noop_p) + for (unsigned int ri = 0; ri < nvectors_per_build; ++ri) { - gassign *stmt = as_a (stmt_info->stmt); + /* Generate the permute statement if necessary. */ + tree first_vec = dr_chain[first_vec_index + ri]; + tree second_vec = dr_chain[second_vec_index + ri]; + gassign *stmt = as_a (stmt_info->stmt); tree perm_dest = vect_create_destination_var (gimple_assign_lhs (stmt), vectype); perm_dest = make_ssa_name (perm_dest); - perm_stmt + gimple *perm_stmt = gimple_build_assign (perm_dest, VEC_PERM_EXPR, - first_vec, second_vec, - mask_vec); + first_vec, second_vec, mask_vec); vect_finish_stmt_generation (vinfo, stmt_info, perm_stmt, gsi); if (dce_chain) @@ -8290,15 +8281,23 @@ vect_transform_slp_perm_load_1 (vec_info *vinfo, slp_tree node, bitmap_set_bit (used_defs, first_vec_index + ri); bitmap_set_bit (used_defs, second_vec_index + ri); } + + /* Store the vector statement in NODE. */ + SLP_TREE_VEC_STMTS (node) [vect_stmts_counter++] + = perm_stmt; } - else - { - /* If mask was NULL_TREE generate the requested - identity transform. */ - perm_stmt = SSA_NAME_DEF_STMT (first_vec); - if (dce_chain) - bitmap_set_bit (used_defs, first_vec_index + ri); - } + } + } + else if (!analyze_only) + { + for (unsigned int ri = 0; ri < nvectors_per_build; ++ri) + { + tree first_vec = dr_chain[first_vec_index + ri]; + /* If mask was NULL_TREE generate the requested + identity transform. */ + gimple *perm_stmt = SSA_NAME_DEF_STMT (first_vec); + if (dce_chain) + bitmap_set_bit (used_defs, first_vec_index + ri); /* Store the vector statement in NODE. */ SLP_TREE_VEC_STMTS (node)[vect_stmts_counter++] = perm_stmt;