From patchwork Wed Sep 13 14:03: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: 138807 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1107962vqx; Wed, 13 Sep 2023 07:04:04 -0700 (PDT) X-Google-Smtp-Source: AGHT+IFr5HutBeUWLUE1uJ9DNuRjvv4x8xvEuonuiUwY31ccIPyTXAIE/R315TA3JIRGA6Tyz92Y X-Received: by 2002:a17:907:2c62:b0:9a1:d087:e0bd with SMTP id ib2-20020a1709072c6200b009a1d087e0bdmr1964206ejc.6.1694613842848; Wed, 13 Sep 2023 07:04:02 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694613842; cv=none; d=google.com; s=arc-20160816; b=QIlkB+SzA17rg979w6IhOdR/6CXaVR5bN3r79cVd4F7YhVx+XHvbityiZGCLEJISiI XwWZHskJfj0XAOXnSOWkhKY6uLzeTkXJNC2oAUCbWHS7bRyoDn5R6Pzew0vYuIHgOUdo nFftsmg92wrmUkCZmV99j+50FVs4l2I0yHvf/Ot07Vg4ojClyJBeYkUg7+yVVkeI4V4r gmVvG0595j4WezpjIcNdFBGDmSB6Qxp4t4WjiK+gKv1haMpSSk9BvsPw9QbkmdYYjbne CpXuztnmKoE9Z4FOPOaNIU84zsMXI63Esfc3Wi+AGWG8tYJnEwub+w+PMM/594uKf6fV 7iKA== 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=RjwerJKLjcmXuAEGxHoFN6q333j5yTqStM6jkafYd30=; fh=12MRPJmZ1mgDpHqWoogMKqnaGRGM2b7lcuJroqfjJiw=; b=PN6S/fIPfWoupL6IMBrMzfoeT9V17VXA5T+ncRyXtEdoTucJi4iUlmXgCZJEtANcvs T3beJcWetzJ+CSQcq/j21XOcpqpfAHKUSVSY85+AkmwJMyZ2oiw1YPw8vD+9e+5XdN11 XukD1Uz4Ylv7iNI45ABimXxitPQemTDmAeax03UvxFgguY4cLaRbtWRBQOxjIaNhqnvs OHHSslPo/kEGgfmDogY6kz1NrSGHVOQZLQsgw7ZqRXR7V1FvOEXV0VBRr/J/nlVz7A6a gOvF6JpBFD2ckr2/sMnQKrejc2y0hjAVzL7IwNXFd3z5JMscTs9nQKWomLrspnwRQwqe gKgA== 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 y12-20020a170906914c00b0099e038a5e2csi10294801ejw.784.2023.09.13.07.04.02 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 07:04:02 -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 6D7613858028 for ; Wed, 13 Sep 2023 14:03:51 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbgau1.qq.com (smtpbgau1.qq.com [54.206.16.166]) by sourceware.org (Postfix) with ESMTPS id 23C253858D20 for ; Wed, 13 Sep 2023 14:03:17 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 23C253858D20 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: bizesmtp69t1694613791t2c4n93q Received: from rios-cad121.hadoop.rioslab.org ( [58.60.1.9]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 13 Sep 2023 22:03:09 +0800 (CST) X-QQ-SSF: 01400000000000G0V000000A0000000 X-QQ-FEAT: QityeSR92A3dzO98BGVEBMf6w3XovjaifsRjNoekSi0Q1zH/H2KeqR9uVxMgV JNGdo5lTHDcREX+xfMZaMHjITX0HdaONYCx4LyFkGDR6cuZG8fnMxPycigV7WiWET5jRUvJ jClZd9uTR+tGtxuWohwRFrqBS/njEfp7QFFddia3xqDT6tUJmRuCDtcn9R0RWSi5cU9oTUQ RQM99n2BVzKW3W/NPkey994GUnpCqmB4PhOI9T/EPqB3TB9VP+kI6Xbs1MAKBZQT7TGIB9h tFDFiHs2BCzRGqNTQiFDqkxBRdqSwlgF1F8o13+ThSPS+8YQjucStIFZkZHKkzMnyRsxWDJ oZ47FtNGERXQE3GHeoSJygZHxfZledT8NdZIZSlOaKo1DOMN+l761KSYRPXUiCku8mKhHfW xvCY5uu7fnkwEchrmm6wiA== X-QQ-GoodBg: 2 X-BIZMAIL-ID: 14338997646881176236 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 V2] RISC-V: Expand VLS mode to scalar mode move[PR111391] Date: Wed, 13 Sep 2023 22:03:08 +0800 Message-Id: <20230913140308.3446121-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_H2, 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: 1776927512332364101 X-GMAIL-MSGID: 1776931404902276312 This patch fixes PR111391: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111391 PR target/111391 gcc/ChangeLog: * config/riscv/riscv.cc (riscv_legitimize_move): Expand VLS to scalar move. gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/autovec/partial/slp-9.c: Adapt test. * gcc.target/riscv/rvv/autovec/pr111391.c: New test. --- gcc/config/riscv/riscv.cc | 29 +++++++++++++++++++ .../riscv/rvv/autovec/partial/slp-9.c | 1 - .../gcc.target/riscv/rvv/autovec/pr111391.c | 28 ++++++++++++++++++ 3 files changed, 57 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111391.c diff --git a/gcc/config/riscv/riscv.cc b/gcc/config/riscv/riscv.cc index 9d04ddd69e0..becaec9ebb6 100644 --- a/gcc/config/riscv/riscv.cc +++ b/gcc/config/riscv/riscv.cc @@ -2513,6 +2513,35 @@ riscv_legitimize_move (machine_mode mode, rtx dest, rtx src) } return true; } + /* Expand + (set (reg:DI target) (subreg:DI (reg:V8QI reg) 0)) + Expand this data movement instead of simply forbid it since + we can improve the code generation for this following scenario + by RVV auto-vectorization: + (set (reg:V8QI 149) (vec_duplicate:V8QI (reg:QI)) + (set (reg:DI target) (subreg:DI (reg:V8QI reg) 0)) + Since RVV mode and scalar mode are in different REG_CLASS, + we need to explicitly move data from V_REGS to GR_REGS by scalar move. */ + if (SUBREG_P (src) && riscv_v_ext_mode_p (GET_MODE (SUBREG_REG (src)))) + { + rtx reg = SUBREG_REG (src); + machine_mode rmode = GET_MODE (reg); + if (!register_operand (reg, rmode)) + reg = force_reg (rmode, SUBREG_REG (src)); + unsigned int nunits = GET_MODE_SIZE (rmode).to_constant () + / GET_MODE_SIZE (mode).to_constant (); + machine_mode vmode + = riscv_vector::get_vector_mode (as_a (mode), nunits) + .require (); + rtx tmp = gen_reg_rtx (mode); + rtx index = gen_int_mode (SUBREG_BYTE (src).to_constant () + / GET_MODE_SIZE (mode).to_constant (), + Pmode); + emit_insn ( + gen_vec_extract (vmode, vmode, tmp, gen_lowpart (vmode, reg), index)); + emit_move_insn (dest, tmp); + return true; + } /* Expand (set (reg:QI target) (mem:QI (address))) to diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-9.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-9.c index 5fba27c7a35..7c42438c9d9 100644 --- a/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-9.c +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/partial/slp-9.c @@ -29,4 +29,3 @@ TEST_ALL (VEC_PERM) /* { dg-final { scan-assembler-times {viota.m} 2 } } */ -/* { dg-final { scan-assembler-not {vmv\.v\.i} } } */ diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111391.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111391.c new file mode 100644 index 00000000000..a7f64c937c6 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111391.c @@ -0,0 +1,28 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gcv -mabi=lp64d -Wno-int-conversion -Wno-implicit-function -Wno-incompatible-pointer-types -Wno-implicit-function-declaration -Ofast -ftree-vectorize" } */ + +int d (); +typedef struct +{ + int b; +} c; +int +e (char *f, long g) +{ + f += g; + while (g--) + *--f = d; +} + +int +d (c * f) +{ + while (h ()) + switch (f->b) + case 'Q': + { + long a; + e (&a, sizeof (a)); + i (a); + } +}