From patchwork Sun Apr 23 12:18:59 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: 86701 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2167380vqo; Sun, 23 Apr 2023 05:19:35 -0700 (PDT) X-Google-Smtp-Source: AKy350Yn9dktOzHG41315CAON+DvDql2wTCklxsHAcoO7NdHCa+bVVce0HjOIzJoZb7AQ4kIgv1K X-Received: by 2002:a17:906:368f:b0:953:5ff7:7753 with SMTP id a15-20020a170906368f00b009535ff77753mr6790259ejc.11.1682252375834; Sun, 23 Apr 2023 05:19:35 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1682252375; cv=none; d=google.com; s=arc-20160816; b=f500ZDil10git4+oFfi6S4aqfoYc2y8TPifMKsSRwHhb86Ziemkpim2l6Pw3/SjK3+ EXjxiwSpP0ElyeQzE0PrfRa3BAeOvQNSda0PfDStezo8imF6LfRg0tJwLjNdRMoW6Q8c GY/rugobRkTtR8OSS+FONou5z2Div/OhTMyPYAbULH7SZaYjNuotHr315tp96cQ038Hv 8N+0GWLgL61YH1SMiizBwVsmVqjodmzqi+RWNJ7nYwulZdT1F30FqeOMxrkUUcwy8tFy o2uZOPcJbzHU54p4mJc1mJc6mIMEXfH1okzUa2xdf0CHIvmwlEVMCb3uL1WEJRLXCJLA z9YQ== 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=9Bu/7VbCRYgXf9MHZVGxYQxiOTUwq5eUPbH4AMmUQjU=; b=VMi2gTqNIUX9SfZqds3SOT7p1bMHfsi0sv+4gGEYxcy4YTbiwVnr+iIIq+cmKaAML2 vtIb+1elElrPHHZOnoLwPLwWKWrmgdIiL+yBYcX2wj4kQ8QFcmOu1j2NbIgjDwM4qy/1 6cTYqJYRX6CjOhDvZQjKGdnyFG65w71B7K5TMwpsDKdoc6Pr8ZvPYJjv3uhJf5mFd2+N SGDiB+Lq+NVIhgu/6VbY4h5P31MXYYfWEqfAh+8Nw8GV4i1c2R4LTBdsudHiGh2+Vj8M 0xnv8V2Cl5m+Tx7xJuxc0ZMhqgDNeip6HBO3tabOG+wRnAs2LABGLHg2K40bmWmn9P4F /Y9Q== ARC-Authentication-Results: i=1; mx.google.com; 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" Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id g6-20020a170906538600b0094ed126d448si6072045ejo.445.2023.04.23.05.19.35 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 23 Apr 2023 05:19:35 -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; 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" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7C65F3858C2F for ; Sun, 23 Apr 2023 12:19:30 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbguseast1.qq.com (smtpbguseast1.qq.com [54.204.34.129]) by sourceware.org (Postfix) with ESMTPS id 3E5BA3858D35 for ; Sun, 23 Apr 2023 12:19:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 3E5BA3858D35 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: bizesmtp86t1682252341t608auku Received: from server1.localdomain ( [58.60.1.22]) by bizesmtp.qq.com (ESMTP) with id ; Sun, 23 Apr 2023 20:19:00 +0800 (CST) X-QQ-SSF: 01400000000000F0P000000A0000000 X-QQ-FEAT: QityeSR92A39fei6bK3rD1fg+xNRpxmKm2o2A+NGhguske3LFZRcuRNaJHCk3 bJoxqa48DkG1PEXzh5tHYBhrjiIZlkrER/sdZolBKExck1IzqtZI/RKXClFYR9IG7JD7YTh ixyAGVNvEvnVQCVEltrlrs6af9MWSwGTq9jyhHj31Ky7DD629mmzdPWs1LPXBreDdnsXHfM SWWyTp0IwnfTxsqF7FXqVb6WS0nr8NE0/UO8yVtaK+2o4xDGYpWCJIvk9ugQHaNU11VHCF/ yZc/OdflMYMiUJP3sAAzFnrYQnODWb1ZGuukT4hzgLJncdCbfghkrTXJkUf9unPPZHYw1dC vGYklGA7M29ywVCOfaYnnXh2N4uqOJXV2JytfpGSqrBMljqzYMQ/TnuUmgGbqCIdMAysf8w iG85VZwUqjY= X-QQ-GoodBg: 2 X-BIZMAIL-ID: 16824930445473210202 From: juzhe.zhong@rivai.ai To: gcc-patches@gcc.gnu.org Cc: kito.cheng@gmail.com, palmer@dabbelt.com, jeffreyalaw@gmail.com, Juzhe-Zhong Subject: [PATCH V2] RISC-V: Eliminate redundant vsetvli for duplicate AVL def Date: Sun, 23 Apr 2023 20:18:59 +0800 Message-Id: <20230423121859.95799-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:qybglogicsvr:qybglogicsvr7 X-Spam-Status: No, score=-10.7 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H2, 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: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1763969424983773128?= X-GMAIL-MSGID: =?utf-8?q?1763969467115173046?= From: Juzhe-Zhong This patch is the V2 patch:https://patchwork.sourceware.org/project/gcc/patch/20230328010124.235703-1-juzhe.zhong@rivai.ai/ Address comments from Jeff. Add comments for all_avail_in_compatible_p and refine comments of codes. gcc/ChangeLog: * config/riscv/riscv-vsetvl.cc (vector_infos_manager::all_avail_in_compatible_p): New function. (pass_vsetvl::refine_vsetvls): Optimize vsetvls. * config/riscv/riscv-vsetvl.h: New function. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/vsetvl/avl_single-102.c: New test. --- gcc/config/riscv/riscv-vsetvl.cc | 44 +++++++++++++++++-- gcc/config/riscv/riscv-vsetvl.h | 1 + .../riscv/rvv/vsetvl/avl_single-102.c | 16 +++++++ 3 files changed, 58 insertions(+), 3 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/vsetvl/avl_single-102.c diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc index fa68b8a0462..89a45a428a4 100644 --- a/gcc/config/riscv/riscv-vsetvl.cc +++ b/gcc/config/riscv/riscv-vsetvl.cc @@ -2446,6 +2446,26 @@ vector_infos_manager::all_same_ratio_p (sbitmap bitdata) const return true; } +/* Return TRUE if the incoming vector configuration state + to CFG_BB is compatible with the vector configuration + state in CFG_BB, FALSE otherwise. */ +bool +vector_infos_manager::all_avail_in_compatible_p (const basic_block cfg_bb) const +{ + const auto &info = vector_block_infos[cfg_bb->index].local_dem; + sbitmap avin = vector_avin[cfg_bb->index]; + unsigned int bb_index; + sbitmap_iterator sbi; + EXECUTE_IF_SET_IN_BITMAP (avin, 0, bb_index, sbi) + { + const auto &avin_info + = static_cast (*vector_exprs[bb_index]); + if (!info.compatible_p (avin_info)) + return false; + } + return true; +} + bool vector_infos_manager::all_same_avl_p (const basic_block cfg_bb, sbitmap bitdata) const @@ -3816,9 +3836,27 @@ pass_vsetvl::refine_vsetvls (void) const m_vector_manager->to_refine_vsetvls.add (rinsn); continue; } - rinsn = PREV_INSN (rinsn); - rtx new_pat = gen_vsetvl_pat (VSETVL_VTYPE_CHANGE_ONLY, info, NULL_RTX); - change_insn (rinsn, new_pat); + + /* If all incoming edges to a block have a vector state that is compatbile + with the block. In such a case we need not emit a vsetvl in the current + block. */ + + gcc_assert (has_vtype_op (insn->rtl ())); + rinsn = PREV_INSN (insn->rtl ()); + gcc_assert (vector_config_insn_p (PREV_INSN (insn->rtl ()))); + if (m_vector_manager->all_avail_in_compatible_p (cfg_bb)) + { + size_t id = m_vector_manager->get_expr_id (info); + if (bitmap_bit_p (m_vector_manager->vector_del[cfg_bb->index], id)) + continue; + eliminate_insn (rinsn); + } + else + { + rtx new_pat + = gen_vsetvl_pat (VSETVL_VTYPE_CHANGE_ONLY, info, NULL_RTX); + change_insn (rinsn, new_pat); + } } } diff --git a/gcc/config/riscv/riscv-vsetvl.h b/gcc/config/riscv/riscv-vsetvl.h index 9041eee1281..d7a6c14e931 100644 --- a/gcc/config/riscv/riscv-vsetvl.h +++ b/gcc/config/riscv/riscv-vsetvl.h @@ -452,6 +452,7 @@ public: bool all_same_ratio_p (sbitmap) const; bool all_empty_predecessor_p (const basic_block) const; + bool all_avail_in_compatible_p (const basic_block) const; void release (void); void create_bitmap_vectors (void); diff --git a/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/avl_single-102.c b/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/avl_single-102.c new file mode 100644 index 00000000000..8236d4e7f18 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/avl_single-102.c @@ -0,0 +1,16 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv32gcv -mabi=ilp32 -fno-schedule-insns -fno-schedule-insns2 -fno-tree-vectorize -frename-registers" } */ + +#include "riscv_vector.h" + +void f (int8_t* base1,int8_t* base2,int8_t* out,int n) +{ + vint8mf4_t v = __riscv_vle8_v_i8mf4 (base1, 32); + for (int i = 0; i < n; i++){ + v = __riscv_vor_vx_i8mf4 (v, 101, 32); + v = __riscv_vle8_v_i8mf4_tu (v, base2, 32); + } + __riscv_vse8_v_i8mf4 (out, v, 32); +} + +/* { dg-final { scan-assembler-times {vsetvli} 1 { target { no-opts "-O0" no-opts "-O1" no-opts "-Os" no-opts "-g" no-opts "-funroll-loops" } } } } */