From patchwork Wed Sep 13 13:01:22 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: 138789 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:9ecd:0:b0:3f2:4152:657d with SMTP id t13csp1067698vqx; Wed, 13 Sep 2023 06:02:12 -0700 (PDT) X-Google-Smtp-Source: AGHT+IH5C9mtTG2n7VV8wuMmqAVrakl/UVRfvkd9jlmXLP+5Yw7PRsRKSfrYTGJhV+8s6ubEf9yX X-Received: by 2002:a5d:44c9:0:b0:318:f7a:e3c8 with SMTP id z9-20020a5d44c9000000b003180f7ae3c8mr1824106wrr.57.1694610130928; Wed, 13 Sep 2023 06:02:10 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694610130; cv=none; d=google.com; s=arc-20160816; b=U8OXNFoZQFsH5rGvza2llQqFE97IRM9ZD7V8BQtipZXe0DtZiVw9Q2X/pXjy1bEufO YB6WfCZ0uL92hOsfoUibr1aB8dl/JQlMUakldYWmHfz7SDWNgZKN3s497zXcn0Oc6kAO JB3Cu1camo0nRVf/T31foFlayleggE/U0h4sY2ydD9rUWJNSMgqlu3npr3f0tjwShbLF J+JRvW0oejw913EreZqNI/y6cUb5NSIxLHXdUIvhypoKp61xTz9J0N4AlX0r61I2Cyf+ STn0cYPikSz5UZjr1rSFMdYd3U/OycH0FJBEkDVIsWbhpAjSsnsJYatTXiHgN1mfm3he 0SDA== 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=BSHtPcfb4yNCv3sgPC7Y5qtWhZlUpxSTdEjo+QGAq48=; fh=12MRPJmZ1mgDpHqWoogMKqnaGRGM2b7lcuJroqfjJiw=; b=rdfoZfFGDIUrfjmNAt+dVuLguS7NoCNEyS5UXNg4i+btmieHBJgFh6a5+Sfe11Y/aF A7B1oELZ6GSYtzRdznoMhFijnGKtk0TqhCVABbhUBS4IUv6E27d3CbyWV5rtSRjmZVmh PhES+hGRhA74x1Loc74pl/d8N/ZfiBZLRdtj6OrWLPLbUgkVnz54+Aoy73MfXxGWnkH1 LMN2I/MkjTXRBymXxoN7Saz6/dsXvAMNa9j4fBYLzTi2eIb7VGeUwg2i6h/3si69AjYx TQsRJ31nKdD/OUhAbjNw64oikPwZ7aXNvF1TFN3fJJ91iY1bEYrm1WhaskF85Rz9OYta i35A== 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 l26-20020a056402345a00b0052370772030si10628511edc.164.2023.09.13.06.02.10 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 13 Sep 2023 06:02:10 -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 628803856DC0 for ; Wed, 13 Sep 2023 13:01:57 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbgsg1.qq.com (smtpbgsg1.qq.com [54.254.200.92]) by sourceware.org (Postfix) with ESMTPS id 271D83858D20 for ; Wed, 13 Sep 2023 13:01:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 271D83858D20 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: bizesmtp81t1694610084tqso6hmy Received: from rios-cad121.hadoop.rioslab.org ( [58.60.1.9]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 13 Sep 2023 21:01:23 +0800 (CST) X-QQ-SSF: 01400000000000G0V000000A0000000 X-QQ-FEAT: 1qoW02aag42rOnQ5v3lwA9LoClVc4lv4rFTjMMT4NJqpwRwl6kdPB/6iE70wf 5k4Xh8qcrP/uC7UmVWPzCY6PIQcqjeAUgPkWtVuieu50VW+r9KzS0HS6z8Acyp4PsjmhIoG 0Ah/F8O+q+9GXZsMJPy/FvoNMiY/pKlzNynyam9KOvpVVs0rqyY5HL6m3dlKEZxtouS5f7H /rB6tIHOjusRYuXVokqdzt03fVaOTZJJV7MCN/O7N5bFlrB1NGqgDrloL+OzB/x/rrxb3Oc iNAwl5omR6v5hABK3xCoYQQtAXOfUwv+o9U0ZJjbtVBV8mRmdZhcROKha7bpWllkYTi08y2 +yh31KTJndQoqHo/sKGBbnQFB+9W4FJgjqL+jTqN1XH1TBoS7RKuMw5pq9Jq2yV+IwVIyOe ioG878VwzKVA9+6WPIb5sw== X-QQ-GoodBg: 2 X-BIZMAIL-ID: 13022369086310362180 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: Expand VLS mode to scalar mode move[PR111391] Date: Wed, 13 Sep 2023 21:01:22 +0800 Message-Id: <20230913130122.1145168-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: 1776927512332364101 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..b7daad7cbb5 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 subreg = force_reg (GET_MODE (SUBREG_REG (src)), SUBREG_REG (src)); + machine_mode imode = GET_MODE_INNER (GET_MODE (subreg)); + unsigned int ratio = GET_MODE_SIZE (mode).to_constant () + / GET_MODE_SIZE (imode).to_constant (); + poly_int64 nunits = GET_MODE_NUNITS (GET_MODE (subreg)); + nunits = exact_div (nunits, ratio); + scalar_mode smode = as_a (mode); + machine_mode vmode + = riscv_vector::get_vector_mode (smode, nunits).require (); + rtx tmp = gen_reg_rtx (mode); + rtx index + = gen_int_mode (exact_div (SUBREG_BYTE (src), GET_MODE_SIZE (smode)), + Pmode); + emit_insn (gen_vec_extract (vmode, vmode, tmp, + gen_lowpart (vmode, subreg), 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); + } +}