From patchwork Mon Sep 18 12:35:08 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: 141401 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:612c:172:b0:3f2:4152:657d with SMTP id h50csp2622529vqi; Mon, 18 Sep 2023 05:35:53 -0700 (PDT) X-Google-Smtp-Source: AGHT+IGo5+GHHvuBVLrf3IvRcEQcU0I9xhiqKUOnF3bHtPFG8ivC8mVD8L7UdMjQqvuLzYK6+SpK X-Received: by 2002:a2e:bc15:0:b0:2bf:e855:8cbf with SMTP id b21-20020a2ebc15000000b002bfe8558cbfmr6844710ljf.35.1695040553730; Mon, 18 Sep 2023 05:35:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1695040553; cv=none; d=google.com; s=arc-20160816; b=KDoIZY9j7+xCOsPDMxgrw9Nt+YlKZ0qilbcX+y2a2xKxfjgVw6kj35/uLRp/SBgEHU 5fmREq7e016kwySYhyFzDDLYbj2Y/NGhqHbtjU6GnQY3AciUgfgkl7GT6n52nfI3nQee WvRcoyGgxq583QnptIvlprJQwB6zsvE0LQ0hmdStjYZ6tIbidX+/PCtZ8RknhVvT1ml8 J/KlrrG6WkeLzd8335BgC1mTdNrtNdIDn3y1whUt7WMVFKRJfmKGO9Ax4PmvnG/3Xy8n +YKDxvGcNGD6x6rYQ4r7Fe12JvNttMpXDnY9HYEEbi84ApTky83RXALy1MkY94bnanAa MR7g== 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=AaDzw4UCacgLM1uB5x56XcUTJTLNJvkNMbY+tivluQE=; fh=12MRPJmZ1mgDpHqWoogMKqnaGRGM2b7lcuJroqfjJiw=; b=GWUbgz+tmrAOKaUi6TRXQLGShjqC5l1TgUBAewVgFFdQHCtkGUFVEcAbrpE5QgWzcQ YG1I9JIk718ESbRVbFoonWNFab8mo10nVrgu5XI9nDbonIFPSrovpo/Mw2amnFNCiU7k moYIkvqJNi2L/hC43MeWiCFLLi5lvkp0IuBDuyRr4x3ittqhrb/ZdLv2xEVHgvl2NxEq LBwbdFrS1vfjalyBMm43rO1It+3KjITiAD63DH8+2IIojPduAmWj/ZNgVF5KyGiSWS8Z B6eRYxynpPyBlLIDNUVyXfKQCoXpZcVieZTXgH4UDnfFR80Bln1ULgWULXvN0tz1E9We C9ag== 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 dk20-20020a170906f0d400b009a210885fb4si8162231ejb.83.2023.09.18.05.35.53 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Sep 2023 05:35:53 -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 36FD2385C6F5 for ; Mon, 18 Sep 2023 12:35:43 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbguseast3.qq.com (smtpbguseast3.qq.com [54.243.244.52]) by sourceware.org (Postfix) with ESMTPS id 285C93858D32 for ; Mon, 18 Sep 2023 12:35:16 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 285C93858D32 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: bizesmtp67t1695040511t0a4g2jp Received: from rios-cad121.hadoop.rioslab.org ( [58.60.1.9]) by bizesmtp.qq.com (ESMTP) with id ; Mon, 18 Sep 2023 20:35:09 +0800 (CST) X-QQ-SSF: 01400000000000G0V000000A0000000 X-QQ-FEAT: xQoAiglG4R7fgdgV83gLxPaD1faDMdIzLRpB1qTMXOmzWb+pl7w7m2mhABTNL rBwFTMAgu2hud3PHV5QjQ5f8inJ075o9J2OgBLxmJ6uMzgS7A9fefu3GCwIkhbPrC6Lp6Cq W8VjXKPcPKOWbzHZ2Q1Qyi3t6PU47RVUol4g1yYCqMaSeZ75tw7ki7BhgW431elF3ufqgr+ Ynx0Zoe+FXlENTrqeQVPwNWbI+ui0WKX8fTeOQMdtzKUkcuneJQ0APb0eyyOTYEZUk73nAw NDWxbDkfRtDVZj+mZrq1E52EHO0INAgjEn0CnKly3uRXILlStNZaXWnwELzWBSYivRFca25 YymYYcxolQK0FCZj3+qq1eijS7ehGYmrWW3sKPvWw36q1WS4Cd1fbZH2W7xH8oApWRkePN8 uoAkF0L+O3UQuDJjmM7pkQ== X-QQ-GoodBg: 2 X-BIZMAIL-ID: 10270199539459587847 From: Juzhe-Zhong To: gcc-patches@gcc.gnu.org Cc: kito.cheng@gmail.com, kito.cheng@sifive.com, jeffreyalaw@gmail.com, rdapp.gcc@gmail.com, Juzhe-Zhong Subject: [PATCH] RISC-V: Remove redundant vec_duplicate pattern Date: Mon, 18 Sep 2023 20:35:08 +0800 Message-Id: <20230918123508.3705854-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, KAM_SHORT, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_PASS, SPF_PASS, TXREP 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+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1777378843574289981 X-GMAIL-MSGID: 1777378843574289981 Currently, VLS and VLA patterns are different. VLA is define_expand VLS is define_insn_and_split It makes no sense that they are different pattern format. Merge them into same pattern (define_insn_and_split). It can also be helpful for the future vv -> vx fwprop optimization. gcc/ChangeLog: * config/riscv/riscv-selftests.cc (run_broadcast_selftests): Adapt selftests. * config/riscv/vector.md (@vec_duplicate): Remove. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/autovec/pr111313.c: Adapt test. --- gcc/config/riscv/riscv-selftests.cc | 4 ++-- gcc/config/riscv/vector.md | 18 +++--------------- .../gcc.target/riscv/rvv/autovec/pr111313.c | 4 ++-- 3 files changed, 7 insertions(+), 19 deletions(-) diff --git a/gcc/config/riscv/riscv-selftests.cc b/gcc/config/riscv/riscv-selftests.cc index b16b5c15286..cdc863ee4f7 100644 --- a/gcc/config/riscv/riscv-selftests.cc +++ b/gcc/config/riscv/riscv-selftests.cc @@ -343,7 +343,7 @@ run_broadcast_selftests (void) rtx mem = gen_rtx_MEM (inner_mode, addr); \ expand_vector_broadcast (mode, mem); \ insn = get_last_insn (); \ - src = XEXP (SET_SRC (PATTERN (insn)), 1); \ + src = SET_SRC (PATTERN (insn)); \ ASSERT_TRUE (MEM_P (XEXP (src, 0))); \ ASSERT_TRUE ( \ rtx_equal_p (src, gen_rtx_VEC_DUPLICATE (mode, XEXP (src, 0)))); \ @@ -353,7 +353,7 @@ run_broadcast_selftests (void) rtx reg = gen_reg_rtx (inner_mode); \ expand_vector_broadcast (mode, reg); \ insn = get_last_insn (); \ - src = XEXP (SET_SRC (PATTERN (insn)), 1); \ + src = SET_SRC (PATTERN (insn)); \ ASSERT_TRUE (REG_P (XEXP (src, 0))); \ ASSERT_TRUE ( \ rtx_equal_p (src, gen_rtx_VEC_DUPLICATE (mode, XEXP (src, 0)))); \ diff --git a/gcc/config/riscv/vector.md b/gcc/config/riscv/vector.md index 39b550c1bff..6d3c43e05ee 100644 --- a/gcc/config/riscv/vector.md +++ b/gcc/config/riscv/vector.md @@ -1371,22 +1371,10 @@ ;; This pattern only handles duplicates of non-constant inputs. ;; Constant vectors go through the movm pattern instead. ;; So "direct_broadcast_operand" can only be mem or reg, no CONSTANT. -(define_expand "@vec_duplicate" - [(set (match_operand:V 0 "register_operand") - (vec_duplicate:V - (match_operand: 1 "direct_broadcast_operand")))] - "TARGET_VECTOR" - { - riscv_vector::emit_vlmax_insn (code_for_pred_broadcast (mode), - riscv_vector::UNARY_OP, operands); - DONE; - } -) - (define_insn_and_split "@vec_duplicate" - [(set (match_operand:VLS 0 "register_operand") - (vec_duplicate:VLS - (match_operand: 1 "reg_or_int_operand")))] + [(set (match_operand:V_VLS 0 "register_operand") + (vec_duplicate:V_VLS + (match_operand: 1 "direct_broadcast_operand")))] "TARGET_VECTOR && can_create_pseudo_p ()" "#" "&& 1" diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111313.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111313.c index 1da1b8ce6fb..1e01cfefd47 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111313.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111313.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-march=rv64gcv -mabi=lp64d --param=riscv-autovec-preference=scalable -O3" } */ +/* { dg-options "-march=rv64gcv -mabi=lp64d --param=riscv-autovec-preference=scalable -O3 -fno-schedule-insns -fno-schedule-insns2" } */ #define K 32 short in[2*K][K]; @@ -17,4 +17,4 @@ foo () } } -/* { dg-final { scan-assembler-times {vsetvli\s+zero,\s*zero,\s*e16,\s*mf2,\s*t[au],\s*m[au]} 3 } } */ +/* { dg-final { scan-assembler-times {vsetvli\s+[a-x0-9]+,\s*zero,\s*e16,\s*mf2,\s*t[au],\s*m[au]\s+vmv\.v\.x} 1 } } */