Skip to content

Commit 757020a

Browse files
committed
erasure_code: set vsetvli to default parameter and add space
Signed-off-by: Shuo Lv <[email protected]>
1 parent fd94836 commit 757020a

14 files changed

+48
-55
lines changed

erasure_code/riscv64/gf_2vect_dot_prod_rvv.S

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ gf_2vect_dot_prod_rvv:
7474
li t6, 16
7575
blt x_len, t6, .return_fail
7676

77-
vsetvli a5, x0, e8, m1 /* Set vector length to maximum */
77+
vsetvli a5, x0, e8, m1, ta, ma /* Set vector length to maximum */
7878
li x_pos, 0
7979
slli x_vec, x_vec, 3
8080

@@ -99,7 +99,7 @@ gf_2vect_dot_prod_rvv:
9999
/* Loop 2: x_vec, number of source vectors (ie. data blocks) */
100100
.Llooprvv_vl_vects:
101101
/* load src data */
102-
add x_ptr,x_ptr,x_pos
102+
add x_ptr, x_ptr, x_pos
103103

104104
vle8.v v_src, (x_ptr) /* load from: src base + pos offset */
105105
/* split 4-bit lo; 4-bit hi */
@@ -143,8 +143,8 @@ gf_2vect_dot_prod_rvv:
143143
/* store dest data */
144144
vse8.v v_dest1, (x_dest1)
145145
vse8.v v_dest2, (x_dest2)
146-
add x_dest1,x_dest1,a5
147-
add x_dest2,x_dest2,a5
146+
add x_dest1, x_dest1, a5
147+
add x_dest2, x_dest2, a5
148148

149149
/* increment one vector length */
150150
add x_pos, x_pos, a5

erasure_code/riscv64/gf_2vect_mad_rvv.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ gf_2vect_mad_rvv:
7171
li t3, 16
7272
blt x_len, t3, .return_fail
7373

74-
vsetvli t4, x0, e8, m1
74+
vsetvli t4, x0, e8, m1, ta, ma
7575

7676
/* load table 1 */
7777
slli t3, x_vec_i, 5

erasure_code/riscv64/gf_3vect_dot_prod_rvv.S

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,6 @@
5757
#define x_dest3 a5
5858
#define t_offset a6
5959

60-
6160
/* vectors */
6261
#define v_src v1
6362
#define v_src_lo v2
@@ -84,7 +83,7 @@ gf_3vect_dot_prod_rvv:
8483
sd s0, 0(sp)
8584
sd s1, 8(sp)
8685

87-
vsetvli a7, x0, e8, m1 /* Set vector length to maximum */
86+
vsetvli a7, x0, e8, m1, ta, ma /* Set vector length to maximum */
8887
li x_pos, 0
8988
slli x_vec, x_vec, 3
9089

@@ -114,7 +113,7 @@ gf_3vect_dot_prod_rvv:
114113

115114
.Lloop_rvv_vl_vects:
116115
/* load source data */
117-
add x_ptr,x_ptr,x_pos
116+
add x_ptr, x_ptr, x_pos
118117
vle8.v v_src, (x_ptr)
119118

120119
/* Split 4-bit lo; 4-bit hi */
@@ -167,9 +166,9 @@ gf_3vect_dot_prod_rvv:
167166
vse8.v v_dest1, (x_dest1)
168167
vse8.v v_dest2, (x_dest2)
169168
vse8.v v_dest3, (x_dest3)
170-
add x_dest1,x_dest1, a7
171-
add x_dest2,x_dest2, a7
172-
add x_dest3,x_dest3, a7
169+
add x_dest1, x_dest1, a7
170+
add x_dest2, x_dest2, a7
171+
add x_dest3, x_dest3, a7
173172

174173
add x_pos, x_pos, a7
175174
j .Lloop_rvv_vl

erasure_code/riscv64/gf_3vect_mad_rvv.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ gf_3vect_mad_rvv:
7575
li t4, 16
7676
blt x_len, t4, .return_fail
7777

78-
vsetvli t5, x0, e8, m1
78+
vsetvli t5, x0, e8, m1, ta, ma
7979

8080
/* Load table 1 */
8181
slli t4, x_vec_i, 5

erasure_code/riscv64/gf_4vect_dot_prod_rvv.S

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,8 +91,7 @@ gf_4vect_dot_prod_rvv:
9191
sd s2, 16(sp)
9292
sd s3, 24(sp)
9393

94-
# vsetvli t0, x0, e8, m1 /* Set vector length to maximum */
95-
vsetvli t0, x0, e8, m1
94+
vsetvli t0, x0, e8, m1, ta, ma
9695
li x_pos, 0
9796

9897
slli x_vec, x_vec, 3
@@ -128,7 +127,7 @@ gf_4vect_dot_prod_rvv:
128127

129128
.Lloop_rvv_vl_vects:
130129
/* Load source data */
131-
add x_ptr,x_ptr,x_pos
130+
add x_ptr, x_ptr, x_pos
132131

133132
vle8.v v_src, (x_ptr)
134133

@@ -194,10 +193,10 @@ gf_4vect_dot_prod_rvv:
194193
vse8.v v_dest2, (x_dest2)
195194
vse8.v v_dest3, (x_dest3)
196195
vse8.v v_dest4, (x_dest4)
197-
add x_dest1,x_dest1, t0
198-
add x_dest2,x_dest2, t0
199-
add x_dest3,x_dest3, t0
200-
add x_dest4,x_dest4, t0
196+
add x_dest1, x_dest1, t0
197+
add x_dest2, x_dest2, t0
198+
add x_dest3, x_dest3, t0
199+
add x_dest4, x_dest4, t0
201200
/* Increment position */
202201
add x_pos, x_pos, t0
203202
j .Lloop_rvv_vl

erasure_code/riscv64/gf_4vect_mad_rvv.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ gf_4vect_mad_rvv:
7979
li t5, 16
8080
blt x_len, t5, .return_fail
8181

82-
vsetvli t6, x0, e8, m1
82+
vsetvli t6, x0, e8, m1, ta, ma
8383

8484
/* load table 1 */
8585
slli t5, x_vec_i, 5

erasure_code/riscv64/gf_5vect_dot_prod_rvv.S

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ gf_5vect_dot_prod_rvv:
9595
sd s4, 32(sp)
9696
sd s5, 40(sp)
9797

98-
vsetvli a5, x0, e8, m1
98+
vsetvli a5, x0, e8, m1, ta, ma
9999
/* Initialize position */
100100
li x_pos, 0
101101

@@ -203,19 +203,18 @@ gf_5vect_dot_prod_rvv:
203203
/* Check if we have processed all vectors */
204204
blt x_vec_i, x_vec, .Llooprvv_vl_vects
205205

206-
207206
vse8.v v_dest1, (x_dest1)
208207
vse8.v v_dest2, (x_dest2)
209208
vse8.v v_dest3, (x_dest3)
210209
vse8.v v_dest4, (x_dest4)
211210
vse8.v v_dest5, (x_dest5)
212211

213212
/* Store destination data */
214-
add x_dest1,x_dest1,a5
215-
add x_dest2,x_dest2,a5
216-
add x_dest3,x_dest3,a5
217-
add x_dest4,x_dest4,a5
218-
add x_dest5,x_dest5,a5
213+
add x_dest1, x_dest1, a5
214+
add x_dest2, x_dest2, a5
215+
add x_dest3, x_dest3, a5
216+
add x_dest4, x_dest4, a5
217+
add x_dest5, x_dest5, a5
219218

220219
/* Increment position */
221220
add x_pos, x_pos, a5

erasure_code/riscv64/gf_5vect_mad_rvv.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ gf_5vect_mad_rvv:
8383
li t6, 16
8484
blt x_len, t6, .return_fail
8585

86-
vsetvli a7, x0, e8, m1
86+
vsetvli a7, x0, e8, m1, ta, ma
8787

8888
/* Load table 1 */
8989
slli a6, x_vec_i, 5

erasure_code/riscv64/gf_6vect_dot_prod_rvv.S

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -102,7 +102,7 @@ gf_6vect_dot_prod_rvv:
102102
sd s7, 56(sp)
103103

104104
li t0, 0x0F
105-
vsetvli a5, x0, e8, m1
105+
vsetvli a5, x0, e8, m1, ta, ma
106106

107107
/* initialize position */
108108
li x_pos, 0
@@ -147,10 +147,9 @@ gf_6vect_dot_prod_rvv:
147147

148148
.Llooprvv_vl_vects:
149149
/* load source data */
150-
add x_ptr,x_ptr,x_pos
150+
add x_ptr, x_ptr, x_pos
151151
vle8.v v_src, (x_ptr)
152152

153-
154153
/* split 4-bit lo; 4-bit hi */
155154
vand.vi v_src_lo, v_src, 0x0F
156155
vsrl.vi v_src_hi, v_src, 4
@@ -167,7 +166,7 @@ gf_6vect_dot_prod_rvv:
167166
addi x_tbl2, x_tbl2, 16
168167

169168
/* load next source pointer */
170-
addi x_vec_i, x_vec_i,8
169+
addi x_vec_i, x_vec_i, 8
171170
add a6, x_src, x_vec_i
172171
ld x_ptr, 0(a6)
173172

@@ -238,12 +237,12 @@ gf_6vect_dot_prod_rvv:
238237
vse8.v v_dest5, (x_dest5) # x_dest5
239238
vse8.v v_dest6, (x_dest6) # x_dest6
240239

241-
add x_dest1,x_dest1, a5
242-
add x_dest2,x_dest2, a5
243-
add x_dest3,x_dest3, a5
244-
add x_dest4,x_dest4, a5
245-
add x_dest5,x_dest5, a5
246-
add x_dest6,x_dest6, a5
240+
add x_dest1, x_dest1, a5
241+
add x_dest2, x_dest2, a5
242+
add x_dest3, x_dest3, a5
243+
add x_dest4, x_dest4, a5
244+
add x_dest5, x_dest5, a5
245+
add x_dest6, x_dest6, a5
247246

248247
/* increment position */
249248
add x_pos, x_pos, a5

erasure_code/riscv64/gf_6vect_mad_rvv.S

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,7 @@ gf_6vect_mad_rvv:
9191
addi sp, sp, -16
9292
sd s8, 0(sp)
9393

94-
vsetvli a6, x0, e8, m1
94+
vsetvli a6, x0, e8, m1, ta, ma
9595

9696
/* Load table 1 */
9797
slli s8, x_vec_i, 5

0 commit comments

Comments
 (0)