From patchwork Wed Sep 6 12:47:24 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: 137573 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:ab0a:0:b0:3f2:4152:657d with SMTP id m10csp2285485vqo; Wed, 6 Sep 2023 05:48:23 -0700 (PDT) X-Google-Smtp-Source: AGHT+IEOACVcPZ4zrOXereVEh7Icp6HeFBLTySh0saxmI6R+29ZJJwSD1j3EJSgJOLEFy8wdAeYR X-Received: by 2002:a17:907:b15:b0:9a1:c39a:8bfd with SMTP id h21-20020a1709070b1500b009a1c39a8bfdmr2067662ejl.57.1694004502895; Wed, 06 Sep 2023 05:48:22 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1694004502; cv=none; d=google.com; s=arc-20160816; b=MvTqWiKAnF8JH3dqk5jRof1VA0cBS3Gc/mrAdEB4iOsgB4nYQKUW8ujtMLWvht7vpg V+MiKz77RCOYosafPQqVRcVG3kFsHQTKhtNYgcOuSERNPrzU/QxYBxlNLQP8GqhHzt7g q81IRCxi+5ZPi6034pi0wIH0qYXc9mKJSbeyR+XBmJjGTQwO5OD0RcLgkENfW1ILbf5r yOWBkHllsAxGqS6mja2shPVTfdOIKUWyneafLzhFrnXx2dJsZzQINvpEmMUhXD45QHzL cs7IAr4W1GSMUNvsKhHjTy3UzacdBh62ZDWScGs+ZSVYM6WuzRZXNcRW1xiGwXVl70FL WMQQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:cc:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:feedback-id :content-transfer-encoding:mime-version:message-id:date:subject:to :from:dmarc-filter:delivered-to; bh=NmDlanq0OJQh7vnfbtMgLAklULwyfmAOcanIR2JShYI=; fh=arl273cIQBNH1P6XLxHQvF0scgitfd773vOV+bwQx3o=; b=KhjfRHq9AZwt/59puKLhdJaYwqgQMyoRt+dn03I9PKy4xbpIon11CcpgRNl78gJwcn XCftLsemj3aTPOf3TNKeNFdkbYNdY4x3O49ghCFMyHjB2K1GW4uPXMlESvBd2ZJT9pN6 lLVpy/nL45oICvlJorZeDS3MSJrcPx0wJyW/+MSCIP9QZsc1bCxrsCnv07eKcNCKsvuX xz5s8on009VnYJduh0XA4ysMPa2vuGqhSVtPbhmtllJzTWi+ibgSgJiRv/iYRB2X+Dnb ahtcMml9oQ6LT1jgS2VS+THqxvIi76XfzFLUWYRfg1aSaFtaXt5tPVlFyaoh9dZKbh+D +CrA== 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 j5-20020a170906830500b0099bca0c5445si8772634ejx.363.2023.09.06.05.48.22 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 06 Sep 2023 05:48:22 -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 7E92E3856DE6 for ; Wed, 6 Sep 2023 12:48:00 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from smtpbgbr2.qq.com (smtpbgbr2.qq.com [54.207.22.56]) by sourceware.org (Postfix) with ESMTPS id 76621385843E for ; Wed, 6 Sep 2023 12:47:33 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 76621385843E 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: bizesmtp78t1694004447t4q379cz Received: from rios-cad122.hadoop.rioslab.org ( [58.60.1.26]) by bizesmtp.qq.com (ESMTP) with id ; Wed, 06 Sep 2023 20:47:25 +0800 (CST) X-QQ-SSF: 01400000000000G0V000000A0000000 X-QQ-FEAT: +ynUkgUhZJmZ7/BuFMGaF2AfgtkQBCkg8K5VeV4IcbOyur6CJp1o+591nLtpn gFmIO65q+Ah/WDD6/QwMtHCDfN/TITccrscPhhxY1fI2E0H3qxfpamid/PrwOtVxVJlLb3E PJSer1qXpxACBPivqIkjR89LPSd9MpqzXhpW1H2u2NFXEHTWiu5v120X2mZygjbTViUM0Pn mMxkX8iVa/5qjvrv/RsLBqQ8uKRhYch6Vf7GrlHGpA8cLyhz9OVSxHUSkNEKEzIU1D7y7+N mXX4SQCUaUEJENVhsWclW0FTDl+YDd58WDyk/Wv51qi/Dc6Qe3SJ34D0o/yoFoMjZ4N/Nod lBzqD2yRsiCPpB4dNySMXboGWENKf2GefQpm+ckj7tOHJUTOSZCWxOT9oh3CYtJQYdx7ODB cpV61U96DkUGjdVflMshbg== X-QQ-GoodBg: 2 X-BIZMAIL-ID: 15365128094389092285 From: Juzhe-Zhong To: gcc-patches@gcc.gnu.org Subject: [PATCH] RISC-V: Fix VSETVL PASS AVL/VL fetch bug[111295] Date: Wed, 6 Sep 2023 20:47:24 +0800 Message-Id: <20230906124724.1455261-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=-10.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, RCVD_IN_MSPIKE_H3, 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: , Cc: kito.cheng@sifive.com, kito.cheng@gmail.com, Juzhe-Zhong Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1776292465690261243 X-GMAIL-MSGID: 1776292465690261243 Fix bugzilla: https://gcc.gnu.org/bugzilla/show_bug.cgi?id=111295 PR target/111295 gcc/ChangeLog: * config/riscv/riscv-vsetvl.cc (insert_vsetvl): gcc/testsuite/ChangeLog: * gcc.target/riscv/rvv/autovec/pr111295.c: New test. --- gcc/config/riscv/riscv-vsetvl.cc | 3 +- .../gcc.target/riscv/rvv/autovec/pr111295.c | 36 +++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111295.c diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc index e7e5c14617e..dd9aeb32b56 100644 --- a/gcc/config/riscv/riscv-vsetvl.cc +++ b/gcc/config/riscv/riscv-vsetvl.cc @@ -721,8 +721,7 @@ insert_vsetvl (enum emit_type emit_type, rtx_insn *rinsn, gcc_assert (has_vtype_op (rinsn) || vsetvl_insn_p (rinsn)); /* For user vsetvli a5, zero, we should use get_vl to get the VL operand "a5". */ - rtx vl_op - = vsetvl_insn_p (rinsn) ? get_vl (rinsn) : info.get_avl_reg_rtx (); + rtx vl_op = info.get_avl_or_vl_reg (); gcc_assert (!vlmax_avl_p (vl_op)); emit_vsetvl_insn (VSETVL_NORMAL, emit_type, info, vl_op, rinsn); return VSETVL_NORMAL; diff --git a/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111295.c b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111295.c new file mode 100644 index 00000000000..fa20a21338a --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/rvv/autovec/pr111295.c @@ -0,0 +1,36 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gcv -mabi=lp64d -Ofast -ftree-vectorize --param=riscv-autovec-preference=scalable -Wno-implicit-function-declaration" } */ + +#include +int a, b, c, e, f, g, h, i, j, k; +long l; +int q () +{ + int r (); + char *o, *d; + _Bool p = f; + while (g) + { + int m, n; + for (; m <= n; m++) + *d++ = m; + k = 1; + if (e) + break; + switch (*o) + { + case 'N': + o++; + if (c) + if (h) + while (i) + { + s (-l, ~0); + t (j); + d = d + (a & 10000000 ? u (r, 2) : b); + } + } + if (*o) + p ? s () : 0; + } +}