From patchwork Fri Jul 21 02:23:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?6ZKf5bGF5ZOy?= X-Patchwork-Id: 1810663 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=8.43.85.97; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Received: from server2.sourceware.org (ip-8-43-85-97.sourceware.org [8.43.85.97]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (P-384) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4R6YK91jGyz1yYc for ; Fri, 21 Jul 2023 12:24:10 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id ADFD5385C017 for ; Fri, 21 Jul 2023 02:24:08 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbg150.qq.com (smtpbg150.qq.com [18.132.163.193]) by sourceware.org (Postfix) with ESMTPS id EADCD3858C53 for ; Fri, 21 Jul 2023 02:23:51 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EADCD3858C53 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivai.ai Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivai.ai X-QQ-mid: bizesmtp82t1689906226tqw5oeho Received: from server1.localdomain ( [58.60.1.22]) by bizesmtp.qq.com (ESMTP) with id ; Fri, 21 Jul 2023 10:23:45 +0800 (CST) X-QQ-SSF: 01400000000000G0U000000A0000000 X-QQ-FEAT: eeGIu46hDGiayvDA5SUqx+ZIlqQo/Y9xPOZ+gFzqEo4uNJEh19NZmzT+IIrN4 ukF/IFRNwxC/JShKDfbcGmiJGsxaFhwc3CTP+HBG1M7MxsI4255pRE+rM+AhAwVJ52k68js cozuboZ8SLb/FZtqOLTHGakG4p9nnbNYlUiMLnCcA+xnvyD2pzTrE93Vs4TgRV2UwiZYmWN 6FTcu9kwXTmIXu8kvbdhG+mZkpuDXBfc3zzrr+8zlvY/eUCxWNb1NoQ8MFhbC4noT4+N44y BdBaI9syOwVuRxePl5o7un0b71z5/2cu033Rpwj4NElnQN3HdICefkMZEg9ciL6giTCww8F ePbdEURr39BSCVwtKsbGOKsfj0l5ziQh+Z/hzhISL/MIEcbMjaRlcMOCHOFqQ== X-QQ-GoodBg: 2 X-BIZMAIL-ID: 6601756449163196901 From: Juzhe-Zhong To: gcc-patches@gcc.gnu.org Cc: richard.sandiford@arm.com, rguenther@suse.de, Juzhe-Zhong Subject: [PATCH] cleanup: Change condition order Date: Fri, 21 Jul 2023 10:23:43 +0800 Message-Id: <20230721022343.314043-1-juzhe.zhong@rivai.ai> X-Mailer: git-send-email 2.36.1 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:rivai.ai:qybglogicsvrgz:qybglogicsvrgz7a-one-0 X-Spam-Status: No, score=-10.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, 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: , Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Hi, Richard and Richi. I have double check the recent codes for len && mask support again. Some places code structure: if (len_mask_fn) ... else if (mask_fn) ... some places code structure: if (mask_len_fn) ... else if (mask) Base on previous review comment from Richi: https://gcc.gnu.org/pipermail/gcc-patches/2023-July/625067.html len mask stuff should be checked before mask. So I reorder all condition order to check LEN MASK stuff before MASK. This is the last clean up patch. Boostrap and Regression is on the way. gcc/ChangeLog: * tree-vect-stmts.cc (check_load_store_for_partial_vectors): Change condition order. (vectorizable_operation): Ditto. --- gcc/tree-vect-stmts.cc | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/gcc/tree-vect-stmts.cc b/gcc/tree-vect-stmts.cc index d5b4f020332..2fe856db9ab 100644 --- a/gcc/tree-vect-stmts.cc +++ b/gcc/tree-vect-stmts.cc @@ -1635,17 +1635,17 @@ check_load_store_for_partial_vectors (loop_vec_info loop_vinfo, tree vectype, internal_fn len_ifn = (is_load ? IFN_MASK_LEN_GATHER_LOAD : IFN_MASK_LEN_SCATTER_STORE); - if (internal_gather_scatter_fn_supported_p (ifn, vectype, + if (internal_gather_scatter_fn_supported_p (len_ifn, vectype, gs_info->memory_type, gs_info->offset_vectype, gs_info->scale)) - vect_record_loop_mask (loop_vinfo, masks, nvectors, vectype, - scalar_mask); - else if (internal_gather_scatter_fn_supported_p (len_ifn, vectype, + vect_record_loop_len (loop_vinfo, lens, nvectors, vectype, 1); + else if (internal_gather_scatter_fn_supported_p (ifn, vectype, gs_info->memory_type, gs_info->offset_vectype, gs_info->scale)) - vect_record_loop_len (loop_vinfo, lens, nvectors, vectype, 1); + vect_record_loop_mask (loop_vinfo, masks, nvectors, vectype, + scalar_mask); else { if (dump_enabled_p ()) @@ -6596,16 +6596,16 @@ vectorizable_operation (vec_info *vinfo, && LOOP_VINFO_CAN_USE_PARTIAL_VECTORS_P (loop_vinfo) && mask_out_inactive) { - if (cond_fn != IFN_LAST - && direct_internal_fn_supported_p (cond_fn, vectype, + if (cond_len_fn != IFN_LAST + && direct_internal_fn_supported_p (cond_len_fn, vectype, OPTIMIZE_FOR_SPEED)) - vect_record_loop_mask (loop_vinfo, masks, ncopies * vec_num, - vectype, NULL); - else if (cond_len_fn != IFN_LAST - && direct_internal_fn_supported_p (cond_len_fn, vectype, - OPTIMIZE_FOR_SPEED)) vect_record_loop_len (loop_vinfo, lens, ncopies * vec_num, vectype, 1); + else if (cond_fn != IFN_LAST + && direct_internal_fn_supported_p (cond_fn, vectype, + OPTIMIZE_FOR_SPEED)) + vect_record_loop_mask (loop_vinfo, masks, ncopies * vec_num, + vectype, NULL); else { if (dump_enabled_p ())