From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2093) id 39FA4385840D; Wed, 24 Apr 2024 13:13:18 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 39FA4385840D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1713964398; bh=zvO7+EXIMsgdszXALP5I7sY7h167fFaZ2rFR4ioNUMU=; h=From:To:Subject:Date:From; b=xBpzHfoXyW0l77VRI/uU5Dwdybxq+kEBHKrHWFnb12TtGruOYWFwM5sJKkDy/xqYi h/tIe7HDAe/ek8jovJUf2my2mM8EpqCiKi6/Fv8Cw+AXjTrxnguHiSEjYgmduAQBru dOBMwzQnQPPkYY16uYtyd48C1U/BmxQ9o52X2RmI= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Kito Cheng To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-8644] RISC-V: Fix recursive vsetvli checking [PR114172] X-Act-Checkin: gcc X-Git-Author: Kito Cheng X-Git-Refname: refs/heads/releases/gcc-13 X-Git-Oldrev: 85831fbdda01d9128699c37e40878cf260411edf X-Git-Newrev: 67e50daa5bd05f16d98c2dc651af2d6fa8335186 Message-Id: <20240424131318.39FA4385840D@sourceware.org> Date: Wed, 24 Apr 2024 13:13:18 +0000 (GMT) List-Id: https://gcc.gnu.org/g:67e50daa5bd05f16d98c2dc651af2d6fa8335186 commit r13-8644-g67e50daa5bd05f16d98c2dc651af2d6fa8335186 Author: Kito Cheng Date: Wed Apr 24 16:54:44 2024 +0800 RISC-V: Fix recursive vsetvli checking [PR114172] extract_single_source will recursive checking the sources to make sure if it's single source, however it may cause infinite recursive when the source is come from itself, so it should just skip first source to prevent that. NOTE: This logic has existing on trunk/GCC 14, but it included in a big vsetvli improvement patch, which is not backport to GCC 13. ``` void saxpy_rvv_m8(float *y, long vl) { for (;;) { vl = __riscv_vsetvl_e32m8(vl); //ICE vfloat32m8_t y_vec; __riscv_vse32_v_f32m8(y, y_vec, vl); } } ``` gcc/ChangeLog: PR target/114172 * config/riscv/riscv-vsetvl.cc (extract_single_source): Skip first set. gcc/testsuite/ChangeLog: PR target/114172 * gcc.target/riscv/rvv/vsetvl/pr114172.c: New. Diff: --- gcc/config/riscv/riscv-vsetvl.cc | 4 ++++ gcc/testsuite/gcc.target/riscv/rvv/vsetvl/pr114172.c | 14 ++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/gcc/config/riscv/riscv-vsetvl.cc b/gcc/config/riscv/riscv-vsetvl.cc index 9dca2ce709d..36d2e6e6f20 100644 --- a/gcc/config/riscv/riscv-vsetvl.cc +++ b/gcc/config/riscv/riscv-vsetvl.cc @@ -1196,6 +1196,10 @@ extract_single_source (set_info *set) return nullptr; for (const set_info *set : sets) { + /* Skip first set, this can prevent us run into infinite recursive + checking if first set is come from itself. */ + if (set == *sets.begin ()) + continue; /* If there is a head or end insn, we conservative return NULL so that VSETVL PASS will insert vsetvl directly. */ if (set->insn ()->is_artificial ()) diff --git a/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/pr114172.c b/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/pr114172.c new file mode 100644 index 00000000000..ed1494666d6 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/rvv/vsetvl/pr114172.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gcv -mabi=lp64 -fno-tree-vectorize" } */ + +#include "riscv_vector.h" + +void e(long, vfloat32m4_t); + +void b(long c) { + for (;;) { + c = __riscv_vsetvl_e32m4(c); + vfloat32m4_t d; + e(c, d); + } +}