Skip to content

Commit 4e9e247

Browse files
Chao Liualistair23
authored andcommitted
target/riscv: fix handling of nop for vstart >= vl in some vector instruction
Recently, when I was writing a RISCV test, I found that when VL is set to 0, the instruction should be nop, but when I tested it, I found that QEMU will treat all elements as tail elements, and in the case of VTA=1, write all elements to 1. After troubleshooting, it was found that the vext_vx_rm_1 function was called in the vext_vx_rm_2, and then the vext_set_elems_1s function was called to process the tail element, but only VSTART >= vl was checked in the vext_vx_rm_1 function, which caused the tail element to still be processed even if it was returned in advance. So I've made the following change: Put VSTART_CHECK_EARLY_EXIT(env) at the beginning of the vext_vx_rm_2 function, so that the VSTART register is checked correctly. Fixes: df4252b ("target/riscv/vector_helpers: do early exit when vstart >= vl") Signed-off-by: Chao Liu <[email protected]> Reviewed-by: Daniel Henrique Barboza <[email protected]> Message-ID: <b2649f14915150be4c602d63cd3ea4adf47e9d75.1741573286.git.lc00631@tecorigin.com> Signed-off-by: Alistair Francis <[email protected]>
1 parent e838453 commit 4e9e247

File tree

1 file changed

+14
-4
lines changed

1 file changed

+14
-4
lines changed

target/riscv/vector_helper.c

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2175,8 +2175,6 @@ vext_vv_rm_1(void *vd, void *v0, void *vs1, void *vs2,
21752175
uint32_t vl, uint32_t vm, int vxrm,
21762176
opivv2_rm_fn *fn, uint32_t vma, uint32_t esz)
21772177
{
2178-
VSTART_CHECK_EARLY_EXIT(env, vl);
2179-
21802178
for (uint32_t i = env->vstart; i < vl; i++) {
21812179
if (!vm && !vext_elem_mask(v0, i)) {
21822180
/* set masked-off elements to 1s */
@@ -2200,6 +2198,8 @@ vext_vv_rm_2(void *vd, void *v0, void *vs1, void *vs2,
22002198
uint32_t vta = vext_vta(desc);
22012199
uint32_t vma = vext_vma(desc);
22022200

2201+
VSTART_CHECK_EARLY_EXIT(env, vl);
2202+
22032203
switch (env->vxrm) {
22042204
case 0: /* rnu */
22052205
vext_vv_rm_1(vd, v0, vs1, vs2,
@@ -2302,8 +2302,6 @@ vext_vx_rm_1(void *vd, void *v0, target_long s1, void *vs2,
23022302
uint32_t vl, uint32_t vm, int vxrm,
23032303
opivx2_rm_fn *fn, uint32_t vma, uint32_t esz)
23042304
{
2305-
VSTART_CHECK_EARLY_EXIT(env, vl);
2306-
23072305
for (uint32_t i = env->vstart; i < vl; i++) {
23082306
if (!vm && !vext_elem_mask(v0, i)) {
23092307
/* set masked-off elements to 1s */
@@ -2327,6 +2325,8 @@ vext_vx_rm_2(void *vd, void *v0, target_long s1, void *vs2,
23272325
uint32_t vta = vext_vta(desc);
23282326
uint32_t vma = vext_vma(desc);
23292327

2328+
VSTART_CHECK_EARLY_EXIT(env, vl);
2329+
23302330
switch (env->vxrm) {
23312331
case 0: /* rnu */
23322332
vext_vx_rm_1(vd, v0, s1, vs2,
@@ -4662,6 +4662,8 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, \
46624662
uint32_t i; \
46634663
TD s1 = *((TD *)vs1 + HD(0)); \
46644664
\
4665+
VSTART_CHECK_EARLY_EXIT(env, vl); \
4666+
\
46654667
for (i = env->vstart; i < vl; i++) { \
46664668
TS2 s2 = *((TS2 *)vs2 + HS2(i)); \
46674669
if (!vm && !vext_elem_mask(v0, i)) { \
@@ -4750,6 +4752,8 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, \
47504752
uint32_t i; \
47514753
TD s1 = *((TD *)vs1 + HD(0)); \
47524754
\
4755+
VSTART_CHECK_EARLY_EXIT(env, vl); \
4756+
\
47534757
for (i = env->vstart; i < vl; i++) { \
47544758
TS2 s2 = *((TS2 *)vs2 + HS2(i)); \
47554759
if (!vm && !vext_elem_mask(v0, i)) { \
@@ -4914,6 +4918,8 @@ static void vmsetm(void *vd, void *v0, void *vs2, CPURISCVState *env,
49144918
int i;
49154919
bool first_mask_bit = false;
49164920

4921+
VSTART_CHECK_EARLY_EXIT(env, vl);
4922+
49174923
for (i = env->vstart; i < vl; i++) {
49184924
if (!vm && !vext_elem_mask(v0, i)) {
49194925
/* set masked-off elements to 1s */
@@ -4986,6 +4992,8 @@ void HELPER(NAME)(void *vd, void *v0, void *vs2, CPURISCVState *env, \
49864992
uint32_t sum = 0; \
49874993
int i; \
49884994
\
4995+
VSTART_CHECK_EARLY_EXIT(env, vl); \
4996+
\
49894997
for (i = env->vstart; i < vl; i++) { \
49904998
if (!vm && !vext_elem_mask(v0, i)) { \
49914999
/* set masked-off elements to 1s */ \
@@ -5344,6 +5352,8 @@ void HELPER(NAME)(void *vd, void *v0, void *vs1, void *vs2, \
53445352
uint32_t vta = vext_vta(desc); \
53455353
uint32_t num = 0, i; \
53465354
\
5355+
VSTART_CHECK_EARLY_EXIT(env, vl); \
5356+
\
53475357
for (i = env->vstart; i < vl; i++) { \
53485358
if (!vext_elem_mask(vs1, i)) { \
53495359
continue; \

0 commit comments

Comments
 (0)