From patchwork Mon May 8 14:38:16 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kito Cheng X-Patchwork-Id: 91185 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:b0ea:0:b0:3b6:4342:cba0 with SMTP id b10csp2206556vqo; Mon, 8 May 2023 07:39:23 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ4am8KlsD3DtDBnDgCt1ectyz+9ulv9v/Vr6pymPG4mLHw+u6k1kWSEdDKd5diJwjhaLNem X-Received: by 2002:a17:907:a414:b0:968:892b:1903 with SMTP id sg20-20020a170907a41400b00968892b1903mr1881157ejc.5.1683556763410; Mon, 08 May 2023 07:39:23 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1683556763; cv=none; d=google.com; s=arc-20160816; b=DPwlod+MHa/3Ks/pZr+ezCU+AuHfz8+qgaqzgd0mcqfyWgl5mhBD5PAT4gAZRq4Gfy M23ds3/FzA5iDMEnYbaxG63dArm/eLPaZL9KG4r8Pg6cIpOcNnFIJCD2zRj1ELtaCa/1 45+7iGvBHPuS10PCN9t/JNC6HtU7VUvSbuaBnsjFMhx50prxM3h7aOIZ6/BSh3zrw5vR WA0njEla5Py8C7ZycQesWVZy2JcGB5cf9RnYXQaBg7sfvOqWgbok+wYiv/WZmfnlYjgI Oo5b/g+wZl/SOYYn8NQB/x8x3/f2w17faBi06MJHaWj/xqkD7JW4upQiBLpM+8ZLhn5q g6cg== 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=dhU1JriFkMbpZks+dKyioGA0s9Ero50u0jnD9RQwvxM=; b=asXxx7+FvkgJlIyWNrEwTF3l0WSO8iBOt//DfUEWxlE/zTEXOIoibI1RYd1KCurs1+ o6jPZhSSxHfyUMjXHGiDjdygb+uWwzJZ3hnikCl99fhcqpZ2OP5vdgr0HcPBvgaTTpoo RhjxUaG96HgmtOkg305fqzoVOWhZOHoO+5mD8FiIbiQl28urMFwpJYBCpcpoaHfOa6Zu B5FCKWbEmHU8If/2iF1u7Imugo/qscKBPEslN1RZpVLdVKqD0MexnWo6fi+iOJ24vIXz vMGO8b5v5Q3VkFEk3EaDhOp7sIvipP9kIoJUNSfuiNTluvCKn+9+5K+ccpBhUKmGfqt9 qrig== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=FRVGacHB; 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 t18-20020a1709067c1200b009604e90e38fsi35551ejo.1005.2023.05.08.07.39.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 07:39:23 -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=FRVGacHB; 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 764A9385559B for ; Mon, 8 May 2023 14:39:09 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 764A9385559B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1683556749; bh=dhU1JriFkMbpZks+dKyioGA0s9Ero50u0jnD9RQwvxM=; h=To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From:Reply-To:From; b=FRVGacHBon+bCgLnbgIJIRiwMsD06ajlS+2PBSnZFK5OM79/VdUp063rpMpXltaZp D4CWpSFFvHvpYenGSwB8TfLDPlU9KeUn5PgdgvMHu1PPfcFQFHZdAqtsCBk0yEXuSC 0A6FqklLrdHRVleJlZgOCrgrnaLzbCVMIRhAjpd8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pf1-x42c.google.com (mail-pf1-x42c.google.com [IPv6:2607:f8b0:4864:20::42c]) by sourceware.org (Postfix) with ESMTPS id 71C533858D32 for ; Mon, 8 May 2023 14:38:24 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 71C533858D32 Received: by mail-pf1-x42c.google.com with SMTP id d2e1a72fcca58-64115eef620so34910505b3a.1 for ; Mon, 08 May 2023 07:38:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1683556703; x=1686148703; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=dhU1JriFkMbpZks+dKyioGA0s9Ero50u0jnD9RQwvxM=; b=R+q0ErjrxpNmLVYgrSBxMJ6cQaZE2tjrhBkr2zxvMdvMxkXOZ5mixoKDstBSjdliE9 3oN+n0KorxEbdHr+vGSdc7ZNuNZ7MhpOs4x9K7e5U/VUmnTClayKiwTY9Q4m8b4PvOUR Gsh0cOgWqT/gz8UXI3s7ADDvIGaQGbLKW8oMKq1qYxj1GrHxbJKz/Elhng164oNIX56A 9LiRpEPB9dIy9NGRtJAJkHXrYvMidU8P7gzwErDGVycAgke0ciPBkqg+9u44j1rzD3H1 wIw+pVPxqFEJxCfwZiM02bQPvEMQ0vC34Pfv6BtqNT36yPNzU8DumIrVDy4499WjZVaR DAGw== X-Gm-Message-State: AC+VfDx8uUWGAf9l498Ja8zcDqDvjF9ecK4f/aAfaGSB5asAap3B9rYi azkFMBg9EvvDG2I6htw/QndippGZLN1F3RFypRMrI5LU/h0LhwIeUKizBBBeMMc650Q/IeZconn XEMi8Q5TvXJIgvl3xh6VTOG+NI9zk8fGu8uvma1fsc9ldB0aMDtvhLNPf1QLz5eEkG0nKIEKLdz rdCF0= X-Received: by 2002:a05:6a00:ccc:b0:63b:54e4:871b with SMTP id b12-20020a056a000ccc00b0063b54e4871bmr12175707pfv.8.1683556702610; Mon, 08 May 2023 07:38:22 -0700 (PDT) Received: from hsinchu02.internal.sifive.com (59-124-168-89.hinet-ip.hinet.net. [59.124.168.89]) by smtp.gmail.com with ESMTPSA id k13-20020aa7820d000000b0064182e41e21sm48024pfi.81.2023.05.08.07.38.21 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 May 2023 07:38:22 -0700 (PDT) To: gcc-patches@gcc.gnu.org, kito.cheng@gmail.com Cc: Kito Cheng Subject: [committed] RISC-V: Factor out vector manager code in vsetvli insertion pass. [NFC] Date: Mon, 8 May 2023 22:38:16 +0800 Message-Id: <20230508143816.45084-1-kito.cheng@sifive.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-Spam-Status: No, score=-13.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, 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: Kito Cheng via Gcc-patches From: Kito Cheng Reply-To: Kito Cheng 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?1765337216742752965?= X-GMAIL-MSGID: =?utf-8?q?1765337216742752965?= gcc/ChangeLog: * config/riscv/riscv-vsetvl.cc (pass_vsetvl::get_vector_info): New. (pass_vsetvl::get_block_info): New. (pass_vsetvl::update_vector_info): New. (pass_vsetvl::simple_vsetvl): Use get_vector_info. (pass_vsetvl::compute_local_backward_infos): Ditto. (pass_vsetvl::transfer_before): Ditto. (pass_vsetvl::transfer_after): Ditto. (pass_vsetvl::emit_local_forward_vsetvls): Ditto. (pass_vsetvl::local_eliminate_vsetvl_insn): Ditto. (pass_vsetvl::cleanup_insns): Ditto. (pass_vsetvl::compute_local_backward_infos): Use update_vector_info. --- gcc/config/riscv/riscv-vsetvl.cc | 87 ++++++++++++++++++++++++-------- 1 file changed, 67 insertions(+), 20 deletions(-) diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc index f55907a410e6..d4d6f336ef99 100644 --- a/gcc/config/riscv/riscv-vsetvl.cc +++ b/gcc/config/riscv/riscv-vsetvl.cc @@ -2596,7 +2596,15 @@ const pass_data pass_data_vsetvl = { class pass_vsetvl : public rtl_opt_pass { private: - class vector_infos_manager *m_vector_manager; + vector_infos_manager *m_vector_manager; + + const vector_insn_info &get_vector_info (const rtx_insn *) const; + const vector_insn_info &get_vector_info (const insn_info *) const; + const vector_block_info &get_block_info (const basic_block) const; + const vector_block_info &get_block_info (const bb_info *) const; + vector_block_info &get_block_info (const basic_block); + vector_block_info &get_block_info (const bb_info *); + void update_vector_info (const insn_info *, const vector_insn_info &); void simple_vsetvl (void) const; void lazy_vsetvl (void); @@ -2647,6 +2655,49 @@ public: virtual unsigned int execute (function *) final override; }; // class pass_vsetvl +const vector_insn_info & +pass_vsetvl::get_vector_info (const rtx_insn *i) const +{ + return m_vector_manager->vector_insn_infos[INSN_UID (i)]; +} + +const vector_insn_info & +pass_vsetvl::get_vector_info (const insn_info *i) const +{ + return m_vector_manager->vector_insn_infos[i->uid ()]; +} + +const vector_block_info & +pass_vsetvl::get_block_info (const basic_block bb) const +{ + return m_vector_manager->vector_block_infos[bb->index]; +} + +const vector_block_info & +pass_vsetvl::get_block_info (const bb_info *bb) const +{ + return m_vector_manager->vector_block_infos[bb->index ()]; +} + +vector_block_info & +pass_vsetvl::get_block_info (const basic_block bb) +{ + return m_vector_manager->vector_block_infos[bb->index]; +} + +vector_block_info & +pass_vsetvl::get_block_info (const bb_info *bb) +{ + return m_vector_manager->vector_block_infos[bb->index ()]; +} + +void +pass_vsetvl::update_vector_info (const insn_info *i, + const vector_insn_info &new_info) +{ + m_vector_manager->vector_insn_infos[i->uid ()] = new_info; +} + /* Simple m_vsetvl_insert vsetvl for optimize == 0. */ void pass_vsetvl::simple_vsetvl (void) const @@ -2667,8 +2718,7 @@ pass_vsetvl::simple_vsetvl (void) const continue; if (has_vtype_op (rinsn)) { - const auto info - = m_vector_manager->vector_insn_infos[INSN_UID (rinsn)]; + const auto info = get_vector_info (rinsn); emit_vsetvl_insn (VSETVL_DISCARD_RESULT, EMIT_BEFORE, info, NULL_RTX, rinsn); } @@ -2688,11 +2738,11 @@ pass_vsetvl::compute_local_backward_infos (const bb_info *bb) for (insn_info *insn : bb->reverse_real_nondebug_insns ()) { - auto &info = m_vector_manager->vector_insn_infos[insn->uid ()]; + auto &info = get_vector_info (insn); if (info.uninit_p ()) /* If it is uninitialized, propagate it directly. */ - info = change; + update_vector_info (insn, change); else if (info.unknown_p ()) change = info; else @@ -2704,7 +2754,7 @@ pass_vsetvl::compute_local_backward_infos (const bb_info *bb) && !reg_available_p (insn, change)) && change.compatible_p (info)) { - info = change.merge (info, LOCAL_MERGE); + update_vector_info (insn, change.merge (info, LOCAL_MERGE)); /* Fix PR109399, we should update user vsetvl instruction if there is a change in demand fusion. */ if (vsetvl_insn_p (insn->rtl ())) @@ -2744,8 +2794,7 @@ pass_vsetvl::transfer_before (vector_insn_info &info, insn_info *insn) const if (!has_vtype_op (insn->rtl ())) return; - const vector_insn_info require - = m_vector_manager->vector_insn_infos[insn->uid ()]; + const vector_insn_info require = get_vector_info (insn); if (info.valid_p () && !need_vsetvl (require, info)) return; info = require; @@ -2759,7 +2808,7 @@ pass_vsetvl::transfer_after (vector_insn_info &info, insn_info *insn) const { if (vector_config_insn_p (insn->rtl ())) { - info = m_vector_manager->vector_insn_infos[insn->uid ()]; + info = get_vector_info (insn); return; } @@ -2795,8 +2844,7 @@ pass_vsetvl::emit_local_forward_vsetvls (const bb_info *bb) if (static_cast (prev_info) != static_cast (curr_info)) { - const auto require - = m_vector_manager->vector_insn_infos[insn->uid ()]; + const auto require = get_vector_info (insn); if (!require.compatible_p ( static_cast (prev_info))) type = insert_vsetvl (EMIT_BEFORE, insn->rtl (), require, @@ -3735,7 +3783,7 @@ pass_vsetvl::refine_vsetvls (void) const basic_block cfg_bb; FOR_EACH_BB_FN (cfg_bb, cfun) { - auto info = m_vector_manager->vector_block_infos[cfg_bb->index].local_dem; + auto info = get_block_info(cfg_bb).local_dem; insn_info *insn = info.get_insn (); if (!info.valid_p ()) continue; @@ -3782,7 +3830,7 @@ pass_vsetvl::cleanup_vsetvls () FOR_EACH_BB_FN (cfg_bb, cfun) { auto &info - = m_vector_manager->vector_block_infos[cfg_bb->index].reaching_out; + = get_block_info(cfg_bb).reaching_out; gcc_assert (m_vector_manager->expr_set_num ( m_vector_manager->vector_del[cfg_bb->index]) <= 1); @@ -3795,7 +3843,7 @@ pass_vsetvl::cleanup_vsetvls () else { const auto dem - = m_vector_manager->vector_block_infos[cfg_bb->index] + = get_block_info(cfg_bb) .local_dem; gcc_assert (dem == *m_vector_manager->vector_exprs[i]); insn_info *insn = dem.get_insn (); @@ -3864,7 +3912,7 @@ pass_vsetvl::commit_vsetvls (void) { basic_block cfg_bb = bb->cfg_bb (); const auto reaching_out - = m_vector_manager->vector_block_infos[cfg_bb->index].reaching_out; + = get_block_info(cfg_bb).reaching_out; if (!reaching_out.dirty_p ()) continue; @@ -3992,8 +4040,7 @@ pass_vsetvl::local_eliminate_vsetvl_insn (const vector_insn_info &dem) const if (def->insn () != insn) return; - vector_insn_info new_info - = m_vector_manager->vector_insn_infos[i->uid ()]; + vector_insn_info new_info = get_vector_info (i); if (!new_info.skip_avl_compatible_p (dem)) return; @@ -4030,7 +4077,7 @@ pass_vsetvl::cleanup_insns (void) const for (insn_info *insn : bb->real_nondebug_insns ()) { rtx_insn *rinsn = insn->rtl (); - const auto &dem = m_vector_manager->vector_insn_infos[insn->uid ()]; + const auto &dem = get_vector_info (insn); /* Eliminate local vsetvl: bb 0: vsetvl a5,a6,... @@ -4265,7 +4312,7 @@ pass_vsetvl::compute_probabilities (void) { basic_block cfg_bb = bb->cfg_bb (); auto &curr_prob - = m_vector_manager->vector_block_infos[cfg_bb->index].probability; + = get_block_info(cfg_bb).probability; /* GCC assume entry block (bb 0) are always so executed so set its probability as "always". */ @@ -4279,7 +4326,7 @@ pass_vsetvl::compute_probabilities (void) FOR_EACH_EDGE (e, ei, cfg_bb->succs) { auto &new_prob - = m_vector_manager->vector_block_infos[e->dest->index].probability; + = get_block_info(e->dest).probability; if (!new_prob.initialized_p ()) new_prob = curr_prob * e->probability; else if (new_prob == profile_probability::always ())