From patchwork Thu Jan 25 07:55:39 2024 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: 1890569 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=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TLCnd6bQzz23dy for ; Thu, 25 Jan 2024 18:56:21 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id DA22638582B1 for ; Thu, 25 Jan 2024 07:56:19 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbgeu2.qq.com (smtpbgeu2.qq.com [18.194.254.142]) by sourceware.org (Postfix) with ESMTPS id 653823858C62 for ; Thu, 25 Jan 2024 07:55:46 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 653823858C62 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=rivai.ai Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=rivai.ai ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 653823858C62 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=18.194.254.142 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706169351; cv=none; b=sTOGdAxsr4q+W4yYN3kDn+iT9MWkF57Hti5JdpBc+g4gKP56IHA6hN0Z6kmFfeQ9U7A/Zm8lDPZFj0877IePua4py/3ot4rs4UN8UEbwq/Sa6vb8kCcsuEOdF37HFcukYBMofw81wMKmww31Kq5QhuGmwgt2u1qV93+sj+mNjrQ= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706169351; c=relaxed/simple; bh=F8ZYvEW6UeIdAcQ6Zrul5TFU0i8TN2fRLU2VCqUu5qs=; h=From:To:Subject:Date:Message-Id:MIME-Version; b=B2/PmRT3FQNIttgi2zn9nx73Motea+DutO1S+xw3/28VHu/78SBFQ2O6KNSyaYMb2YXZxLy7v2gXUjL7KZ+APW/m2bOAwFres4F2C5F+KIvWj1qgvGXDbT+364EgkW2OlDWGz0m46IchtKLg+wGV7F2BchPobteaHiD3qC7kUuY= ARC-Authentication-Results: i=1; server2.sourceware.org X-QQ-mid: bizesmtp78t1706169341t7s8c1y7 X-QQ-Originating-IP: zSnWIOu+FGWtoMw7nzGsqigv3enU3odqK3iM6NhUxYQ= Received: from rios-cad121.hadoop.rioslab.org ( [58.60.1.9]) by bizesmtp.qq.com (ESMTP) with id ; Thu, 25 Jan 2024 15:55:40 +0800 (CST) X-QQ-SSF: 01400000000000G0V000000A0000000 X-QQ-FEAT: LrCnY+iDm+O4PrmXTiJDH47dUrXxLUvYrvH3tgiKcfeiFG2c3D0tLqvTVAlqC fCM65YsyH4bxhjRskDO0VV9E3qPHsqcNizruVjA/AxK/qVH40KdxqEAb63gS9swd0gA79u1 0BA+sLpJfpKX695SkZWKe5kZwux/cj0PZ+aBvYMDd2Z3ZD7K1lzvWV36S0tx1K4TA4PRw9n WorizGYaYL3RNgN5oGxx0uL+HImXNCbv+T44qbuBvbIOYtEIIBAW893Dq9608mo6zawDAIQ fGvbAbltjBTN/NGkHIYdpwnnv1BSWqNHSgLUDIbA373D4+dprYsq5dk9b7Jfbt30WvJAc8A rji52LhL38O8TADr8pTemKKgq8kHQgQ6ERq3DAroPFEZxszX9rhkrMJ17kBiXRdHtWVGsrK SVZlXxHIg/s= X-QQ-GoodBg: 2 X-BIZMAIL-ID: 6117456844288255821 From: Juzhe-Zhong To: gcc-patches@gcc.gnu.org Cc: Juzhe-Zhong Subject: [Committed] RISC-V: Add optim-no-fusion compile option [VSETVL PASS] Date: Thu, 25 Jan 2024 15:55:39 +0800 Message-Id: <20240125075539.2906954-1-juzhe.zhong@rivai.ai> X-Mailer: git-send-email 2.36.3 MIME-Version: 1.0 X-QQ-SENDSIZE: 520 Feedback-ID: bizesmtp:rivai.ai:qybglogicsvrgz:qybglogicsvrgz7a-one-0 X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE, T_SPF_HELO_TEMPERROR 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.30 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 This patch adds no fusion compile option to disable phase 2 global fusion. It can help us to analyze the compile-time and debugging. Committed. gcc/ChangeLog: * config/riscv/riscv-opts.h (enum vsetvl_strategy_enum): Add optim-no-fusion option. * config/riscv/riscv-vsetvl.cc (pass_vsetvl::lazy_vsetvl): Ditto. (pass_vsetvl::execute): Ditto. * config/riscv/riscv.opt: Ditto. --- gcc/config/riscv/riscv-opts.h | 8 +++++--- gcc/config/riscv/riscv-vsetvl.cc | 22 ++++++++++++---------- gcc/config/riscv/riscv.opt | 5 ++++- 3 files changed, 21 insertions(+), 14 deletions(-) diff --git a/gcc/config/riscv/riscv-opts.h b/gcc/config/riscv/riscv-opts.h index ca57dddf1d9..1500f8811ef 100644 --- a/gcc/config/riscv/riscv-opts.h +++ b/gcc/config/riscv/riscv-opts.h @@ -118,11 +118,13 @@ enum stringop_strategy_enum { /* Behavior of VSETVL Pass. */ enum vsetvl_strategy_enum { - /* Simple: Insert a vsetvl* instruction for each Vector instruction. */ - VSETVL_SIMPLE = 1, /* Optimized: Run LCM dataflow analysis to reduce vsetvl* insns and delete any redundant ones generated in the process. */ - VSETVL_OPT = 2 + VSETVL_OPT, + /* Simple: Insert a vsetvl* instruction for each Vector instruction. */ + VSETVL_SIMPLE, + /* No fusion: Disable Phase 2 earliest global fusion. */ + VSETVL_OPT_NO_FUSION, }; #define TARGET_ZICOND_LIKE (TARGET_ZICOND || (TARGET_XVENTANACONDOPS && TARGET_64BIT)) diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc index 170fc7f003d..53d954e1dff 100644 --- a/gcc/config/riscv/riscv-vsetvl.cc +++ b/gcc/config/riscv/riscv-vsetvl.cc @@ -3495,16 +3495,18 @@ pass_vsetvl::lazy_vsetvl () /* Phase 2: Fuse header and footer vsetvl infos between basic blocks. */ if (dump_file) fprintf (dump_file, "\nPhase 2: Lift up vsetvl info.\n\n"); - bool changed; - int fused_count = 0; - do + if (vsetvl_strategy != VSETVL_OPT_NO_FUSION) { - if (dump_file) - fprintf (dump_file, " Try lift up %d.\n\n", fused_count); - changed = pre.earliest_fuse_vsetvl_info (fused_count); - fused_count += 1; - } while (changed); - + bool changed = true; + int fused_count = 0; + do + { + if (dump_file) + fprintf (dump_file, " Try lift up %d.\n\n", fused_count); + changed = pre.earliest_fuse_vsetvl_info (fused_count); + fused_count += 1; + } while (changed); + } if (dump_file && (dump_flags & TDF_DETAILS)) pre.dump (dump_file, "phase 2"); @@ -3545,7 +3547,7 @@ pass_vsetvl::execute (function *) if (!has_vector_insn (cfun)) return 0; - if (!optimize || vsetvl_strategy & VSETVL_SIMPLE) + if (!optimize || vsetvl_strategy == VSETVL_SIMPLE) simple_vsetvl (); else lazy_vsetvl (); diff --git a/gcc/config/riscv/riscv.opt b/gcc/config/riscv/riscv.opt index 65c656204ca..7c2292d8f91 100644 --- a/gcc/config/riscv/riscv.opt +++ b/gcc/config/riscv/riscv.opt @@ -552,11 +552,14 @@ Enum Name(vsetvl_strategy) Type(enum vsetvl_strategy_enum) Valid arguments to -param=vsetvl-strategy=: +EnumValue +Enum(vsetvl_strategy) String(optim) Value(VSETVL_OPT) + EnumValue Enum(vsetvl_strategy) String(simple) Value(VSETVL_SIMPLE) EnumValue -Enum(vsetvl_strategy) String(optim) Value(VSETVL_OPT) +Enum(vsetvl_strategy) String(optim-no-fusion) Value(VSETVL_OPT_NO_FUSION) -param=vsetvl-strategy= Target Undocumented RejectNegative Joined Enum(vsetvl_strategy) Var(vsetvl_strategy) Init(VSETVL_OPT)