From nobody Mon May 12 03:14:17 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1734506227340448.18422238802475;
Tue, 17 Dec 2024 23:17:07 -0800 (PST)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1tNoHu-0007dX-5x; Wed, 18 Dec 2024 02:16:06 -0500
Received: from eggs.gnu.org ([2001:470:142:3::10])
by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <lc00631@tecorigin.com>)
id 1tNoHq-0007aN-Av; Wed, 18 Dec 2024 02:16:02 -0500
Received: from out28-74.mail.aliyun.com ([115.124.28.74])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256)
(Exim 4.90_1) (envelope-from <lc00631@tecorigin.com>)
id 1tNoHl-00054h-2r; Wed, 18 Dec 2024 02:16:02 -0500
Received: from TC-DZ-03-0020.tc.local(mailfrom:lc00631@tecorigin.com
fp:SMTPD_---.agz-7XP_1734506144 cluster:ay29) by smtp.aliyun-inc.com;
Wed, 18 Dec 2024 15:15:45 +0800
From: Chao Liu <lc00631@tecorigin.com>
To: bmeng.cn@gmail.com, liwei1518@gmail.com, palmer@dabbelt.com,
alistair.francis@wdc.com, dbarboza@ventanamicro.com,
zhiwei_liu@linux.alibaba.com, max.chou@sifive.com, alistair23@gmail.com
Cc: qemu-riscv@nongnu.org, qemu-devel@nongnu.org, zqz00548@tecorigin.com,
Chao Liu <lc00631@tecorigin.com>
Subject: [PATCH v2 1/2] target/riscv: refactor VSTART_CHECK_EARLY_EXIT() to
accept vl as a parameter
Date: Wed, 18 Dec 2024 15:15:30 +0800
Message-ID:
<dbd35efb9644d0e51d4caa5fd0dcf7aedec582a4.1734504907.git.lc00631@tecorigin.com>
X-Mailer: git-send-email 2.47.1
In-Reply-To: <cover.1734504907.git.lc00631@tecorigin.com>
References: <cover.1734504907.git.lc00631@tecorigin.com>
MIME-Version: 1.0
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=115.124.28.74;
envelope-from=lc00631@tecorigin.com;
helo=out28-74.mail.aliyun.com
X-Spam_score_int: -29
X-Spam_score: -3.0
X-Spam_bar: ---
X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, RCVD_IN_DNSWL_NONE=-0.0001,
RCVD_IN_MSPIKE_H2=-1.116, RCVD_IN_VALIDITY_CERTIFIED_BLOCKED=0.001,
RCVD_IN_VALIDITY_RPBL_BLOCKED=0.001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001,
UNPARSEABLE_RELAY=0.001 autolearn=ham autolearn_force=no
X-Spam_action: no action
X-BeenThere: qemu-devel@nongnu.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZM-MESSAGEID: 1734506229007116600
Content-Type: text/plain; charset="utf-8"
Some vector instructions are special, such as the vlm.v instruction,
where setting its vl actually sets evl =3D (vl + 7) >> 3. To improve
maintainability, we will uniformly use VSTART_CHECK_EARLY_EXIT() to
check for the condition vstart >=3D vl. This function will also handle
cases involving evl.
Signed-off-by: Chao Liu <lc00631@tecorigin.com>
Reviewed-by: Daniel Henrique Barboza <dbarboza@ventanamicro.com>
---
target/riscv/vcrypto_helper.c | 32 +++++++--------
target/riscv/vector_helper.c | 69 ++++++++++++++++-----------------
target/riscv/vector_internals.c | 4 +-
target/riscv/vector_internals.h | 12 +++---
4 files changed, 57 insertions(+), 60 deletions(-)
diff --git a/target/riscv/vcrypto_helper.c b/target/riscv/vcrypto_helper.c
index f7423df226..1526de96f5 100644
--- a/target/riscv/vcrypto_helper.c
+++ b/target/riscv/vcrypto_helper.c
@@ -222,7 +222,7 @@ static inline void xor_round_key(AESState *round_state,=
AESState *round_key)
uint32_t total_elems =3D vext_get_total_elems(env, desc, 4); =
\
uint32_t vta =3D vext_vta(desc); =
\
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (uint32_t i =3D env->vstart / 4; i < env->vl / 4; i++) { =
\
AESState round_key; \
@@ -248,7 +248,7 @@ static inline void xor_round_key(AESState *round_state,=
AESState *round_key)
uint32_t total_elems =3D vext_get_total_elems(env, desc, 4); =
\
uint32_t vta =3D vext_vta(desc); =
\
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (uint32_t i =3D env->vstart / 4; i < env->vl / 4; i++) { =
\
AESState round_key; \
@@ -309,7 +309,7 @@ void HELPER(vaeskf1_vi)(void *vd_vptr, void *vs2_vptr, =
uint32_t uimm,
uint32_t total_elems =3D vext_get_total_elems(env, desc, 4);
uint32_t vta =3D vext_vta(desc);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, vl);
=20
uimm &=3D 0b1111;
if (uimm > 10 || uimm =3D=3D 0) {
@@ -357,7 +357,7 @@ void HELPER(vaeskf2_vi)(void *vd_vptr, void *vs2_vptr, =
uint32_t uimm,
uint32_t total_elems =3D vext_get_total_elems(env, desc, 4);
uint32_t vta =3D vext_vta(desc);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, vl);
=20
uimm &=3D 0b1111;
if (uimm > 14 || uimm < 2) {
@@ -465,7 +465,7 @@ void HELPER(vsha2ms_vv)(void *vd, void *vs1, void *vs2,=
CPURISCVState *env,
uint32_t total_elems;
uint32_t vta =3D vext_vta(desc);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (uint32_t i =3D env->vstart / 4; i < env->vl / 4; i++) {
if (sew =3D=3D MO_32) {
@@ -582,7 +582,7 @@ void HELPER(vsha2ch32_vv)(void *vd, void *vs1, void *vs=
2, CPURISCVState *env,
uint32_t total_elems;
uint32_t vta =3D vext_vta(desc);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (uint32_t i =3D env->vstart / 4; i < env->vl / 4; i++) {
vsha2c_32(((uint32_t *)vs2) + 4 * i, ((uint32_t *)vd) + 4 * i,
@@ -602,7 +602,7 @@ void HELPER(vsha2ch64_vv)(void *vd, void *vs1, void *vs=
2, CPURISCVState *env,
uint32_t total_elems;
uint32_t vta =3D vext_vta(desc);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (uint32_t i =3D env->vstart / 4; i < env->vl / 4; i++) {
vsha2c_64(((uint64_t *)vs2) + 4 * i, ((uint64_t *)vd) + 4 * i,
@@ -622,7 +622,7 @@ void HELPER(vsha2cl32_vv)(void *vd, void *vs1, void *vs=
2, CPURISCVState *env,
uint32_t total_elems;
uint32_t vta =3D vext_vta(desc);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (uint32_t i =3D env->vstart / 4; i < env->vl / 4; i++) {
vsha2c_32(((uint32_t *)vs2) + 4 * i, ((uint32_t *)vd) + 4 * i,
@@ -642,7 +642,7 @@ void HELPER(vsha2cl64_vv)(void *vd, void *vs1, void *vs=
2, CPURISCVState *env,
uint32_t total_elems;
uint32_t vta =3D vext_vta(desc);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (uint32_t i =3D env->vstart / 4; i < env->vl / 4; i++) {
vsha2c_64(((uint64_t *)vs2) + 4 * i, ((uint64_t *)vd) + 4 * i,
@@ -676,7 +676,7 @@ void HELPER(vsm3me_vv)(void *vd_vptr, void *vs1_vptr, v=
oid *vs2_vptr,
uint32_t *vs1 =3D vs1_vptr;
uint32_t *vs2 =3D vs2_vptr;
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (int i =3D env->vstart / 8; i < env->vl / 8; i++) {
uint32_t w[24];
@@ -777,7 +777,7 @@ void HELPER(vsm3c_vi)(void *vd_vptr, void *vs2_vptr, ui=
nt32_t uimm,
uint32_t *vs2 =3D vs2_vptr;
uint32_t v1[8], v2[8], v3[8];
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (int i =3D env->vstart / 8; i < env->vl / 8; i++) {
for (int k =3D 0; k < 8; k++) {
@@ -802,7 +802,7 @@ void HELPER(vghsh_vv)(void *vd_vptr, void *vs1_vptr, vo=
id *vs2_vptr,
uint32_t vta =3D vext_vta(desc);
uint32_t total_elems =3D vext_get_total_elems(env, desc, 4);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (uint32_t i =3D env->vstart / 4; i < env->vl / 4; i++) {
uint64_t Y[2] =3D {vd[i * 2 + 0], vd[i * 2 + 1]};
@@ -841,7 +841,7 @@ void HELPER(vgmul_vv)(void *vd_vptr, void *vs2_vptr, CP=
URISCVState *env,
uint32_t vta =3D vext_vta(desc);
uint32_t total_elems =3D vext_get_total_elems(env, desc, 4);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (uint32_t i =3D env->vstart / 4; i < env->vl / 4; i++) {
uint64_t Y[2] =3D {brev8(vd[i * 2 + 0]), brev8(vd[i * 2 + 1])};
@@ -879,7 +879,7 @@ void HELPER(vsm4k_vi)(void *vd, void *vs2, uint32_t uim=
m5, CPURISCVState *env,
uint32_t esz =3D sizeof(uint32_t);
uint32_t total_elems =3D vext_get_total_elems(env, desc, esz);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (uint32_t i =3D group_start; i < group_end; ++i) {
uint32_t vstart =3D i * egs;
@@ -937,7 +937,7 @@ void HELPER(vsm4r_vv)(void *vd, void *vs2, CPURISCVStat=
e *env, uint32_t desc)
uint32_t esz =3D sizeof(uint32_t);
uint32_t total_elems =3D vext_get_total_elems(env, desc, esz);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (uint32_t i =3D group_start; i < group_end; ++i) {
uint32_t vstart =3D i * egs;
@@ -973,7 +973,7 @@ void HELPER(vsm4r_vs)(void *vd, void *vs2, CPURISCVStat=
e *env, uint32_t desc)
uint32_t esz =3D sizeof(uint32_t);
uint32_t total_elems =3D vext_get_total_elems(env, desc, esz);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (uint32_t i =3D group_start; i < group_end; ++i) {
uint32_t vstart =3D i * egs;
diff --git a/target/riscv/vector_helper.c b/target/riscv/vector_helper.c
index a85dd1d200..4f14395808 100644
--- a/target/riscv/vector_helper.c
+++ b/target/riscv/vector_helper.c
@@ -265,7 +265,7 @@ vext_ldst_stride(void *vd, void *v0, target_ulong base,=
target_ulong stride,
uint32_t esz =3D 1 << log2_esz;
uint32_t vma =3D vext_vma(desc);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
for (i =3D env->vstart; i < env->vl; env->vstart =3D ++i) {
k =3D 0;
@@ -388,10 +388,7 @@ vext_ldst_us(void *vd, target_ulong base, CPURISCVStat=
e *env, uint32_t desc,
uint32_t msize =3D nf * esz;
int mmu_index =3D riscv_env_mmu_index(env, false);
=20
- if (env->vstart >=3D evl) {
- env->vstart =3D 0;
- return;
- }
+ VSTART_CHECK_EARLY_EXIT(env, evl);
=20
/* Calculate the page range of first page */
addr =3D base + ((env->vstart * nf) << log2_esz);
@@ -533,7 +530,7 @@ vext_ldst_index(void *vd, void *v0, target_ulong base,
uint32_t esz =3D 1 << log2_esz;
uint32_t vma =3D vext_vma(desc);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
/* load bytes from guest memory */
for (i =3D env->vstart; i < env->vl; env->vstart =3D ++i) {
@@ -625,7 +622,7 @@ vext_ldff(void *vd, void *v0, target_ulong base, CPURIS=
CVState *env,
target_ulong addr, offset, remain, page_split, elems;
int mmu_index =3D riscv_env_mmu_index(env, false);
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, env->vl);
=20
/* probe every access */
for (i =3D env->vstart; i < env->vl; i++) {
@@ -1092,7 +1089,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, void=
*vs2, \
uint32_t vta =3D vext_vta(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE s1 =3D *((ETYPE *)vs1 + H(i)); \
@@ -1126,7 +1123,7 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s1=
, void *vs2, \
uint32_t vta =3D vext_vta(desc); =
\
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { =
\
ETYPE s2 =3D *((ETYPE *)vs2 + H(i)); =
\
@@ -1163,7 +1160,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, void=
*vs2, \
uint32_t vta_all_1s =3D vext_vta_all_1s(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE s1 =3D *((ETYPE *)vs1 + H(i)); \
@@ -1203,7 +1200,7 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s1=
, \
uint32_t vta_all_1s =3D vext_vta_all_1s(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE s2 =3D *((ETYPE *)vs2 + H(i)); \
@@ -1301,7 +1298,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, =
\
uint32_t vma =3D vext_vma(desc); =
\
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { =
\
if (!vm && !vext_elem_mask(v0, i)) { \
@@ -1350,7 +1347,7 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s1=
, \
uint32_t vma =3D vext_vma(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
if (!vm && !vext_elem_mask(v0, i)) { \
@@ -1414,7 +1411,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, void=
*vs2, \
uint32_t vma =3D vext_vma(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE s1 =3D *((ETYPE *)vs1 + H(i)); \
@@ -1481,7 +1478,7 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s1=
, void *vs2, \
uint32_t vma =3D vext_vma(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE s2 =3D *((ETYPE *)vs2 + H(i)); \
@@ -2030,7 +2027,7 @@ void HELPER(NAME)(void *vd, void *vs1, CPURISCVState =
*env, \
uint32_t vta =3D vext_vta(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE s1 =3D *((ETYPE *)vs1 + H(i)); \
@@ -2056,7 +2053,7 @@ void HELPER(NAME)(void *vd, uint64_t s1, CPURISCVStat=
e *env, \
uint32_t vta =3D vext_vta(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
*((ETYPE *)vd + H(i)) =3D (ETYPE)s1; \
@@ -2081,7 +2078,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, void=
*vs2, \
uint32_t vta =3D vext_vta(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE *vt =3D (!vext_elem_mask(v0, i) ? vs2 : vs1); \
@@ -2107,7 +2104,7 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s1=
, \
uint32_t vta =3D vext_vta(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE s2 =3D *((ETYPE *)vs2 + H(i)); \
@@ -2154,7 +2151,7 @@ vext_vv_rm_1(void *vd, void *v0, void *vs1, void *vs2,
uint32_t vl, uint32_t vm, int vxrm,
opivv2_rm_fn *fn, uint32_t vma, uint32_t esz)
{
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, vl);
=20
for (uint32_t i =3D env->vstart; i < vl; i++) {
if (!vm && !vext_elem_mask(v0, i)) {
@@ -2281,7 +2278,7 @@ vext_vx_rm_1(void *vd, void *v0, target_long s1, void=
*vs2,
uint32_t vl, uint32_t vm, int vxrm,
opivx2_rm_fn *fn, uint32_t vma, uint32_t esz)
{
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, vl);
=20
for (uint32_t i =3D env->vstart; i < vl; i++) {
if (!vm && !vext_elem_mask(v0, i)) {
@@ -3080,7 +3077,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, =
\
uint32_t vma =3D vext_vma(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
if (!vm && !vext_elem_mask(v0, i)) { \
@@ -3125,7 +3122,7 @@ void HELPER(NAME)(void *vd, void *v0, uint64_t s1, =
\
uint32_t vma =3D vext_vma(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
if (!vm && !vext_elem_mask(v0, i)) { \
@@ -3713,7 +3710,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs2, =
\
uint32_t vma =3D vext_vma(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
if (vl =3D=3D 0) { \
return; \
@@ -4236,7 +4233,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, void=
*vs2, \
uint32_t vma =3D vext_vma(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE s1 =3D *((ETYPE *)vs1 + H(i)); \
@@ -4278,7 +4275,7 @@ void HELPER(NAME)(void *vd, void *v0, uint64_t s1, vo=
id *vs2, \
uint32_t vma =3D vext_vma(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE s2 =3D *((ETYPE *)vs2 + H(i)); \
@@ -4473,7 +4470,7 @@ void HELPER(NAME)(void *vd, void *v0, uint64_t s1, vo=
id *vs2, \
uint32_t vta =3D vext_vta(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
ETYPE s2 =3D *((ETYPE *)vs2 + H(i)); \
@@ -4799,7 +4796,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, =
\
uint32_t i; \
int a, b; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
a =3D vext_elem_mask(vs1, i); \
@@ -4994,7 +4991,7 @@ void HELPER(NAME)(void *vd, void *v0, CPURISCVState *=
env, uint32_t desc) \
uint32_t vma =3D vext_vma(desc); =
\
int i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { =
\
if (!vm && !vext_elem_mask(v0, i)) { \
@@ -5031,7 +5028,7 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s1=
, void *vs2, \
uint32_t vma =3D vext_vma(desc); =
\
target_ulong offset =3D s1, i_min, i; =
\
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
i_min =3D MAX(env->vstart, offset); =
\
for (i =3D i_min; i < vl; i++) { =
\
@@ -5066,7 +5063,7 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s1=
, void *vs2, \
uint32_t vma =3D vext_vma(desc); =
\
target_ulong i_max, i_min, i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
i_min =3D MIN(s1 < vlmax ? vlmax - s1 : 0, vl); =
\
i_max =3D MAX(i_min, env->vstart); =
\
@@ -5110,7 +5107,7 @@ static void vslide1up_##BITWIDTH(void *vd, void *v0, =
uint64_t s1, \
uint32_t vma =3D vext_vma(desc); =
\
uint32_t i; =
\
=
\
- VSTART_CHECK_EARLY_EXIT(env); =
\
+ VSTART_CHECK_EARLY_EXIT(env, vl); =
\
=
\
for (i =3D env->vstart; i < vl; i++) { =
\
if (!vm && !vext_elem_mask(v0, i)) { =
\
@@ -5161,7 +5158,7 @@ static void vslide1down_##BITWIDTH(void *vd, void *v0=
, uint64_t s1, \
uint32_t vma =3D vext_vma(desc); =
\
uint32_t i; =
\
=
\
- VSTART_CHECK_EARLY_EXIT(env); =
\
+ VSTART_CHECK_EARLY_EXIT(env, vl); =
\
=
\
for (i =3D env->vstart; i < vl; i++) { =
\
if (!vm && !vext_elem_mask(v0, i)) { =
\
@@ -5238,7 +5235,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, void=
*vs2, \
uint64_t index; \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { =
\
if (!vm && !vext_elem_mask(v0, i)) { \
@@ -5283,7 +5280,7 @@ void HELPER(NAME)(void *vd, void *v0, target_ulong s1=
, void *vs2, \
uint64_t index =3D s1; =
\
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { =
\
if (!vm && !vext_elem_mask(v0, i)) { \
@@ -5379,7 +5376,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs2, =
\
uint32_t vma =3D vext_vma(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
if (!vm && !vext_elem_mask(v0, i)) { \
diff --git a/target/riscv/vector_internals.c b/target/riscv/vector_internal=
s.c
index 05b2d01e58..b490b1d398 100644
--- a/target/riscv/vector_internals.c
+++ b/target/riscv/vector_internals.c
@@ -66,7 +66,7 @@ void do_vext_vv(void *vd, void *v0, void *vs1, void *vs2,
uint32_t vma =3D vext_vma(desc);
uint32_t i;
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, vl);
=20
for (i =3D env->vstart; i < vl; i++) {
if (!vm && !vext_elem_mask(v0, i)) {
@@ -92,7 +92,7 @@ void do_vext_vx(void *vd, void *v0, target_long s1, void =
*vs2,
uint32_t vma =3D vext_vma(desc);
uint32_t i;
=20
- VSTART_CHECK_EARLY_EXIT(env);
+ VSTART_CHECK_EARLY_EXIT(env, vl);
=20
for (i =3D env->vstart; i < vl; i++) {
if (!vm && !vext_elem_mask(v0, i)) {
diff --git a/target/riscv/vector_internals.h b/target/riscv/vector_internal=
s.h
index 9e1e15b575..9d41bb3b10 100644
--- a/target/riscv/vector_internals.h
+++ b/target/riscv/vector_internals.h
@@ -24,11 +24,11 @@
#include "tcg/tcg-gvec-desc.h"
#include "internals.h"
=20
-#define VSTART_CHECK_EARLY_EXIT(env) do { \
- if (env->vstart >=3D env->vl) { \
- env->vstart =3D 0; \
- return; \
- } \
+#define VSTART_CHECK_EARLY_EXIT(env, vl) do { \
+ if (env->vstart >=3D vl) { \
+ env->vstart =3D 0; \
+ return; \
+ } \
} while (0)
=20
static inline uint32_t vext_nf(uint32_t desc)
@@ -158,7 +158,7 @@ void HELPER(NAME)(void *vd, void *v0, void *vs2, \
uint32_t vma =3D vext_vma(desc); \
uint32_t i; \
\
- VSTART_CHECK_EARLY_EXIT(env); \
+ VSTART_CHECK_EARLY_EXIT(env, vl); \
\
for (i =3D env->vstart; i < vl; i++) { \
if (!vm && !vext_elem_mask(v0, i)) { \
--=20
2.47.1