From patchwork Sun Jul 16 02:16:22 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Li, Pan2 via Gcc-patches" X-Patchwork-Id: 120869 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:c923:0:b0:3e4:2afc:c1 with SMTP id j3csp419567vqt; Sat, 15 Jul 2023 19:19:27 -0700 (PDT) X-Google-Smtp-Source: APBJJlHCL1/VQZHgDSntVQirQqLQHv9kiVMmhJZ7HRBENGpwaHrxKxxXKv7/8VbjpJ94CcsjsgSD X-Received: by 2002:a17:907:91c5:b0:991:f6d0:9bc1 with SMTP id h5-20020a17090791c500b00991f6d09bc1mr7356467ejz.66.1689473967688; Sat, 15 Jul 2023 19:19:27 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1689473967; cv=none; d=google.com; s=arc-20160816; b=Y8caCjfgdpzU228f022qmPld/WYLNm9A9dCuzip199PksrwMPds4zEu1iuuQpJA28D oHDWSJxSzflM5c0gtm4DZsTaYlydPF0L8zL9I9AfwDQWpJ9Haocnfd7ANbsa3/obLJJR ZcM1x86r1hxfhhiVHyN/VAnJmTfuisICXLNqf3Dtq+8yasaSQY00fKKlfP+0UtnRV67y /UxmIIjle2l48mmk521i3fi/nmjOtURhZSStTLnVc2XzTU9EGh+ql13JLJjOxVtKp4We 7o/LmtVjim21Pnx1Ne1/mm09OwbLR4wfQoP5tjk+9GwAF3cUnjwvlmbKPBEvKJDTxAB0 lFKw== 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:mime-version:message-id:date:subject:cc :to:dmarc-filter:delivered-to:dkim-signature:dkim-filter; bh=IMN+XNjwMESLqrA18sxGgKv8i4lU9aINAjBoSPX7wBg=; fh=3GeNZbY2XMGio7EGNqNKolHiFfCckKCyzWZ8mhznR4w=; b=N77Ip/U6EnIgE9o8WWDOmjcOl+hjf4/iaUGPnKR6XqzNeoHWE5Ey0Occq0ALZClt3Z ElpW9POFXRy9f+sWQeJZSQeWEOAa4xz9KzYM9ZWazyKXlnP0DZQ99wCM/Qv7QcNVfEaW dcppBt956VhiCb0X6zTCVVE49LzsaYqTEguT6PuezH0I7axltD4njdGyTHHqUVPmwOLh Qt0qzvmQG3h/qiTrd4mB4mQvgzwRP4Qly1/xlp+uRQGWgs2wr8o6HvzID0oMW/VZnZJ8 Lu2tmTcyT98ooJH4Rt/0+OkUolQWIcZem7wredqyUaBCl+EYGayfTInzjnCxaABVUv+g ZgsQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=T47MnWyr; 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 (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id z12-20020a1709063acc00b0098ed8b2adf7si3130292ejd.105.2023.07.15.19.19.27 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sat, 15 Jul 2023 19:19:27 -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=T47MnWyr; 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 3EDD23858289 for ; Sun, 16 Jul 2023 02:19:26 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 3EDD23858289 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1689473966; bh=IMN+XNjwMESLqrA18sxGgKv8i4lU9aINAjBoSPX7wBg=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=T47MnWyrIxn/L80bOnA2GtR4t9MU1IKeFw1Xs5gyOqHDUhqPjG+S0EDnu//rOQ9Uz WsbpZ31Qo9NrHMjT3CqbZUHkYRhcxwXVWnGie8jC+DVQYKgmpTtG+khyhVNtyGtXjy ng8VwTh1HhTTLU8vS3gGnJ/9ll1epkHGb30/o5AA= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by sourceware.org (Postfix) with ESMTPS id D4D1C3858D35 for ; Sun, 16 Jul 2023 02:16:36 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org D4D1C3858D35 X-IronPort-AV: E=McAfee;i="6600,9927,10772"; a="365764658" X-IronPort-AV: E=Sophos;i="6.01,209,1684825200"; d="scan'208";a="365764658" Received: from orsmga003.jf.intel.com ([10.7.209.27]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Jul 2023 19:16:34 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6600,9927,10772"; a="673120876" X-IronPort-AV: E=Sophos;i="6.01,209,1684825200"; d="scan'208";a="673120876" Received: from shvmail03.sh.intel.com ([10.239.245.20]) by orsmga003.jf.intel.com with ESMTP; 15 Jul 2023 19:16:31 -0700 Received: from pli-ubuntu.sh.intel.com (pli-ubuntu.sh.intel.com [10.239.159.47]) by shvmail03.sh.intel.com (Postfix) with ESMTP id 6BBE3100562E; Sun, 16 Jul 2023 10:16:30 +0800 (CST) To: gcc-patches@gcc.gnu.org Cc: juzhe.zhong@rivai.ai, pan2.li@intel.com, kito.cheng@gmail.com Subject: [PATCH v1|GCC-13] RISC-V: Bugfix for riscv-vsetvl pass. Date: Sun, 16 Jul 2023 10:16:22 +0800 Message-Id: <20230716021622.2831938-1-pan2.li@intel.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Spam-Status: No, score=-11.0 required=5.0 tests=BAYES_00, DKIMWL_WL_HIGH, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, KAM_SHORT, 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 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: Pan Li via Gcc-patches From: "Li, Pan2 via Gcc-patches" Reply-To: pan2.li@intel.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1771541855125913038 X-GMAIL-MSGID: 1771541855125913038 From: Ju-Zhe Zhong This patch comes from part of below change, which locate one bug of rvv vsetvel pass when auto-vectorization. https://gcc.gnu.org/pipermail/gcc-patches/2023-July/624523.html Unforunately, It is not easy to reproduce this bug by intrinsic APIs but it is worth to backport to GCC 13. Signed-off-by: Ju-Zhe Zhong gcc/ChangeLog: * config/riscv/riscv-vsetvl.cc (gen_vsetvl_pat): Add vl parameter. (change_vsetvl_insn): Ditto. (change_insn): Add validate change as well as assert. (pass_vsetvl::backward_demand_fusion): Allow forward. --- gcc/config/riscv/riscv-vsetvl.cc | 29 +++++++++++++++++++++++------ 1 file changed, 23 insertions(+), 6 deletions(-) diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc index 3355ca4e3fb..fbd26988106 100644 --- a/gcc/config/riscv/riscv-vsetvl.cc +++ b/gcc/config/riscv/riscv-vsetvl.cc @@ -633,7 +633,8 @@ gen_vsetvl_pat (enum vsetvl_type insn_type, const vl_vtype_info &info, rtx vl) } static rtx -gen_vsetvl_pat (rtx_insn *rinsn, const vector_insn_info &info) +gen_vsetvl_pat (rtx_insn *rinsn, const vector_insn_info &info, + rtx vl = NULL_RTX) { rtx new_pat; vl_vtype_info new_info = info; @@ -644,7 +645,7 @@ gen_vsetvl_pat (rtx_insn *rinsn, const vector_insn_info &info) if (vsetvl_insn_p (rinsn) || vlmax_avl_p (info.get_avl ())) { rtx dest = get_vl (rinsn); - new_pat = gen_vsetvl_pat (VSETVL_NORMAL, new_info, dest); + new_pat = gen_vsetvl_pat (VSETVL_NORMAL, new_info, vl ? vl : dest); } else if (INSN_CODE (rinsn) == CODE_FOR_vsetvl_vtype_change_only) new_pat = gen_vsetvl_pat (VSETVL_VTYPE_CHANGE_ONLY, new_info, NULL_RTX); @@ -926,7 +927,8 @@ change_insn (rtx_insn *rinsn, rtx new_pat) print_rtl_single (dump_file, PATTERN (rinsn)); } - validate_change (rinsn, &PATTERN (rinsn), new_pat, false); + bool change_p = validate_change (rinsn, &PATTERN (rinsn), new_pat, false); + gcc_assert (change_p); if (dump_file) { @@ -1039,7 +1041,8 @@ change_insn (function_info *ssa, insn_change change, insn_info *insn, } static void -change_vsetvl_insn (const insn_info *insn, const vector_insn_info &info) +change_vsetvl_insn (const insn_info *insn, const vector_insn_info &info, + rtx vl = NULL_RTX) { rtx_insn *rinsn; if (vector_config_insn_p (insn->rtl ())) @@ -1053,7 +1056,7 @@ change_vsetvl_insn (const insn_info *insn, const vector_insn_info &info) rinsn = PREV_INSN (insn->rtl ()); gcc_assert (vector_config_insn_p (rinsn)); } - rtx new_pat = gen_vsetvl_pat (rinsn, info); + rtx new_pat = gen_vsetvl_pat (rinsn, info, vl); change_insn (rinsn, new_pat); } @@ -3331,7 +3334,21 @@ pass_vsetvl::backward_demand_fusion (void) new_info)) continue; - change_vsetvl_insn (new_info.get_insn (), new_info); + rtx vl = NULL_RTX; + /* Backward VLMAX VL: + bb 3: + vsetivli zero, 1 ... -> vsetvli t1, zero + vmv.s.x + bb 5: + vsetvli t1, zero ... -> to be elided. + vlse16.v + + We should forward "t1". */ + if (!block_info.reaching_out.has_avl_reg () + && vlmax_avl_p (new_info.get_avl ())) + vl = get_vl (prop.get_insn ()->rtl ()); + change_vsetvl_insn (new_info.get_insn (), new_info, vl); + if (block_info.local_dem == block_info.reaching_out) block_info.local_dem = new_info; block_info.reaching_out = new_info;