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: "juzhe.zhong@rivai.ai" X-Patchwork-Id: 123516 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp3506957vqt; Thu, 20 Jul 2023 19:24:35 -0700 (PDT) X-Google-Smtp-Source: APBJJlGrED9tYalP5IkMGwNwB++ia6WSk0XjycmKCCWwM1KsLs7TADIYMU6gC9ET/nkO+8k7kk8N X-Received: by 2002:a17:906:58d4:b0:988:565f:bf46 with SMTP id e20-20020a17090658d400b00988565fbf46mr7441155ejs.32.1689906275448; Thu, 20 Jul 2023 19:24:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689906275; cv=none; d=google.com; s=arc-20160816; b=yOzPWAWiTylxddZUpIATcc7zlxYLsXERDeKmhEpBprj5XhJRTdgzu4YEw88WSu2iCH Lce66ke9/ivP0oS2YTZMMuPWyJZf9THX7d0Hewt9/dPMrgtYdfHtomK05XvLY1Fl8aDq iBVYZvVXGbx9RwBKriLIsB3jeAaIXA4ze5v8g5cRokXfcCq8Zcl9g5SMe77TLhh/5PVC JvVdKR32S391yUd6iOPyKgUXRXDilDJAG9X9KYXChbB5lEHjvOmHb7DebS3ydYTAWkZe x4wZJVvM4DXWv95rC2Er8N7uCQfuquCiMWz3dW9RVMRQDxCujUdF1rQ8XX/43An/svt6 HEhw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:feedback-id :content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:dmarc-filter:delivered-to; bh=13YGjP/02oXcKZ2jLscc0ZvC95M+zNE0ZnH9SK3azvk=; fh=bFGt8bvBdss4RDVNwtoG4vql1cbNszblsxOGwrQqCdA=; b=PszcgshRzhWSokuQvpTy3f+AfUEtC9uC8vgz/Ja1XhstLK0tOW/ndvm5rUpPpTuVbA v6pVgCkvVj7rYSFtL7vaDC2awXrpCOEGpbHIHrGM9NqmP6RcDIWvO+YOl4SJg8Ki3y2q UxWu+rQI/9ON9XPMRkKkuqaVyCTyILEEDYE5xre9eaG/HlSlKMNaNW176X2aqwzt0cen 7sKz5myoyptROdEm+hqlJ0fKmHESL1LYISOHYWWmuXS+X567m+MgTm8SK4sy7EfU7R9z aF5LHzOp8z2j/O86uoT+bEfoGWUdixca71M54eRKOZQEsObTmX5OBSK2zGj9YcGje10/ 233A== ARC-Authentication-Results: i=1; mx.google.com; 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" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id b15-20020a170906490f00b0098ed8b2adf7si1478165ejq.105.2023.07.20.19.24.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 20 Jul 2023 19:24:35 -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; 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" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F322E385E009 for ; Fri, 21 Jul 2023 02:24:20 +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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771995162957111742 X-GMAIL-MSGID: 1771995162957111742 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 ())