Skip to content

Commit 619908a

Browse files
martin-frbgmartin-frbg
authored
Merge pull request #4090 from martin-frbg/issue4029
Fix VLEV/VSEV_FLOAT macros to compile C910V target with t-head 2.6.1
2 parents 451cb53 + 73b30b1 commit 619908a

38 files changed

+190
-190
lines changed

‎kernel/riscv64/amax_vector.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333
#define VSETVL_MAX vsetvlmax_e32m1()
3434
#define FLOAT_V_T vfloat32m8_t
3535
#define FLOAT_V_T_M1 vfloat32m1_t
36-
#define VLEV_FLOAT vle_v_f32m8
37-
#define VLSEV_FLOAT vlse_v_f32m8
36+
#define VLEV_FLOAT vle32_v_f32m8
37+
#define VLSEV_FLOAT vlse32_v_f32m8
3838
#define VFREDMAXVS_FLOAT vfredmax_vs_f32m8_f32m1
3939
#define MASK_T vbool4_t
4040
#define VMFLTVF_FLOAT vmflt_vf_f32m8_b4
@@ -47,8 +47,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4747
#define VSETVL_MAX vsetvlmax_e64m1()
4848
#define FLOAT_V_T vfloat64m8_t
4949
#define FLOAT_V_T_M1 vfloat64m1_t
50-
#define VLEV_FLOAT vle_v_f64m8
51-
#define VLSEV_FLOAT vlse_v_f64m8
50+
#define VLEV_FLOAT vle64_v_f64m8
51+
#define VLSEV_FLOAT vlse64_v_f64m8
5252
#define VFREDMAXVS_FLOAT vfredmax_vs_f64m8_f64m1
5353
#define MASK_T vbool8_t
5454
#define VMFLTVF_FLOAT vmflt_vf_f64m8_b8

‎kernel/riscv64/amin_vector.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3434
#define VSETVL_MAX vsetvlmax_e32m1()
3535
#define FLOAT_V_T vfloat32m8_t
3636
#define FLOAT_V_T_M1 vfloat32m1_t
37-
#define VLEV_FLOAT vle_v_f32m8
38-
#define VLSEV_FLOAT vlse_v_f32m8
37+
#define VLEV_FLOAT vle32_v_f32m8
38+
#define VLSEV_FLOAT vlse32_v_f32m8
3939
#define VFREDMINVS_FLOAT vfredmin_vs_f32m8_f32m1
4040
#define MASK_T vbool4_t
4141
#define VMFLTVF_FLOAT vmflt_vf_f32m8_b4
@@ -48,8 +48,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4848
#define VSETVL_MAX vsetvlmax_e32m1()
4949
#define FLOAT_V_T vfloat64m8_t
5050
#define FLOAT_V_T_M1 vfloat64m1_t
51-
#define VLEV_FLOAT vle_v_f64m8
52-
#define VLSEV_FLOAT vlse_v_f64m8
51+
#define VLEV_FLOAT vle64_v_f64m8
52+
#define VLSEV_FLOAT vlse64_v_f64m8
5353
#define VFREDMINVS_FLOAT vfredmin_vs_f64m8_f64m1
5454
#define MASK_T vbool8_t
5555
#define VMFLTVF_FLOAT vmflt_vf_f64m8_b8

‎kernel/riscv64/asum_vector.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -33,8 +33,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3333
#define VSETVL_MAX vsetvlmax_e32m1()
3434
#define FLOAT_V_T vfloat32m8_t
3535
#define FLOAT_V_T_M1 vfloat32m1_t
36-
#define VLEV_FLOAT vle_v_f32m8
37-
#define VLSEV_FLOAT vlse_v_f32m8
36+
#define VLEV_FLOAT vle32_v_f32m8
37+
#define VLSEV_FLOAT vlse32_v_f32m8
3838
#define VFREDSUMVS_FLOAT vfredosum_vs_f32m8_f32m1
3939
#define MASK_T vbool4_t
4040
#define VMFLTVF_FLOAT vmflt_vf_f32m8_b4
@@ -47,8 +47,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4747
#define VSETVL_MAX vsetvlmax_e64m1()
4848
#define FLOAT_V_T vfloat64m8_t
4949
#define FLOAT_V_T_M1 vfloat64m1_t
50-
#define VLEV_FLOAT vle_v_f64m8
51-
#define VLSEV_FLOAT vlse_v_f64m8
50+
#define VLEV_FLOAT vle64_v_f64m8
51+
#define VLSEV_FLOAT vlse64_v_f64m8
5252
#define VFREDSUMVS_FLOAT vfredusum_vs_f64m8_f64m1
5353
#define MASK_T vbool8_t
5454
#define VMFLTVF_FLOAT vmflt_vf_f64m8_b8

‎kernel/riscv64/axpby_vector.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,20 +30,20 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
#if !defined(DOUBLE)
3131
#define VSETVL(n) vsetvl_e32m4(n)
3232
#define FLOAT_V_T vfloat32m4_t
33-
#define VLEV_FLOAT vle_v_f32m4
34-
#define VLSEV_FLOAT vlse_v_f32m4
35-
#define VSEV_FLOAT vse_v_f32m4
36-
#define VSSEV_FLOAT vsse_v_f32m4
33+
#define VLEV_FLOAT vle32_v_f32m4
34+
#define VLSEV_FLOAT vlse32_v_f32m4
35+
#define VSEV_FLOAT vse32_v_f32m4
36+
#define VSSEV_FLOAT vsse32_v_f32m4
3737
#define VFMACCVF_FLOAT vfmacc_vf_f32m4
3838
#define VFMVVF_FLOAT vfmv_v_f_f32m4
3939
#define VFMULVF_FLOAT vfmul_vf_f32m4
4040
#else
4141
#define VSETVL(n) vsetvl_e64m4(n)
4242
#define FLOAT_V_T vfloat64m4_t
43-
#define VLEV_FLOAT vle_v_f64m4
44-
#define VLSEV_FLOAT vlse_v_f64m4
45-
#define VSEV_FLOAT vse_v_f64m4
46-
#define VSSEV_FLOAT vsse_v_f64m4
43+
#define VLEV_FLOAT vle64_v_f64m4
44+
#define VLSEV_FLOAT vlse64_v_f64m4
45+
#define VSEV_FLOAT vse64_v_f64m4
46+
#define VSSEV_FLOAT vsse64_v_f64m4
4747
#define VFMACCVF_FLOAT vfmacc_vf_f64m4
4848
#define VFMVVF_FLOAT vfmv_v_f_f64m4
4949
#define VFMULVF_FLOAT vfmul_vf_f64m4

‎kernel/riscv64/axpy_vector.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -30,18 +30,18 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3030
#if !defined(DOUBLE)
3131
#define VSETVL(n) vsetvl_e32m4(n)
3232
#define FLOAT_V_T vfloat32m4_t
33-
#define VLEV_FLOAT vle_v_f32m4
34-
#define VLSEV_FLOAT vlse_v_f32m4
35-
#define VSEV_FLOAT vse_v_f32m4
36-
#define VSSEV_FLOAT vsse_v_f32m4
33+
#define VLEV_FLOAT vle32_v_f32m4
34+
#define VLSEV_FLOAT vlse32_v_f32m4
35+
#define VSEV_FLOAT vse32_v_f32m4
36+
#define VSSEV_FLOAT vsse32_v_f32m4
3737
#define VFMACCVF_FLOAT vfmacc_vf_f32m4
3838
#else
3939
#define VSETVL(n) vsetvl_e64m4(n)
4040
#define FLOAT_V_T vfloat64m4_t
41-
#define VLEV_FLOAT vle_v_f64m4
42-
#define VLSEV_FLOAT vlse_v_f64m4
43-
#define VSEV_FLOAT vse_v_f64m4
44-
#define VSSEV_FLOAT vsse_v_f64m4
41+
#define VLEV_FLOAT vle64_v_f64m4
42+
#define VLSEV_FLOAT vlse64_v_f64m4
43+
#define VSEV_FLOAT vse64_v_f64m4
44+
#define VSSEV_FLOAT vsse64_v_f64m4
4545
#define VFMACCVF_FLOAT vfmacc_vf_f64m4
4646
#endif
4747

‎kernel/riscv64/copy_vector.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -28,17 +28,17 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2828
#if !defined(DOUBLE)
2929
#define VSETVL(n) vsetvl_e32m8(n)
3030
#define FLOAT_V_T vfloat32m8_t
31-
#define VLEV_FLOAT vle_v_f32m8
32-
#define VLSEV_FLOAT vlse_v_f32m8
33-
#define VSEV_FLOAT vse_v_f32m8
34-
#define VSSEV_FLOAT vsse_v_f32m8
31+
#define VLEV_FLOAT vle32_v_f32m8
32+
#define VLSEV_FLOAT vlse32_v_f32m8
33+
#define VSEV_FLOAT vse32_v_f32m8
34+
#define VSSEV_FLOAT vsse32_v_f32m8
3535
#else
3636
#define VSETVL(n) vsetvl_e64m8(n)
3737
#define FLOAT_V_T vfloat64m8_t
38-
#define VLEV_FLOAT vle_v_f64m8
39-
#define VLSEV_FLOAT vlse_v_f64m8
40-
#define VSEV_FLOAT vse_v_f64m8
41-
#define VSSEV_FLOAT vsse_v_f64m8
38+
#define VLEV_FLOAT vle64_v_f64m8
39+
#define VLSEV_FLOAT vlse64_v_f64m8
40+
#define VSEV_FLOAT vse64_v_f64m8
41+
#define VSSEV_FLOAT vsse64_v_f64m8
4242
#endif
4343

4444
int CNAME(BLASLONG n, FLOAT *x, BLASLONG inc_x, FLOAT *y, BLASLONG inc_y)

‎kernel/riscv64/dot_vector.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3232
#define FLOAT_V_T vfloat32m4_t
3333
#define FLOAT_V_T_M1 vfloat32m1_t
3434
#define VFMVFS_FLOAT vfmv_f_s_f32m1_f32
35-
#define VLEV_FLOAT vle_v_f32m4
36-
#define VLSEV_FLOAT vlse_v_f32m4
35+
#define VLEV_FLOAT vle32_v_f32m4
36+
#define VLSEV_FLOAT vlse32_v_f32m4
3737
#define VFREDSUM_FLOAT vfredosum_vs_f32m4_f32m1
3838
#define VFMACCVV_FLOAT vfmacc_vv_f32m4
3939
#define VFMVVF_FLOAT vfmv_v_f_f32m4
@@ -45,8 +45,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4545
#define FLOAT_V_T vfloat64m4_t
4646
#define FLOAT_V_T_M1 vfloat64m1_t
4747
#define VFMVFS_FLOAT vfmv_f_s_f64m1_f64
48-
#define VLEV_FLOAT vle_v_f64m4
49-
#define VLSEV_FLOAT vlse_v_f64m4
48+
#define VLEV_FLOAT vle64_v_f64m4
49+
#define VLSEV_FLOAT vlse64_v_f64m4
5050
#define VFREDSUM_FLOAT vfredusum_vs_f64m4_f64m1
5151
#define VFMACCVV_FLOAT vfmacc_vv_f64m4
5252
#define VFMVVF_FLOAT vfmv_v_f_f64m4

‎kernel/riscv64/gemv_n_vector.c‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -29,18 +29,18 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2929
#if !defined(DOUBLE)
3030
#define VSETVL(n) vsetvl_e32m4(n)
3131
#define FLOAT_V_T vfloat32m4_t
32-
#define VLEV_FLOAT vle_v_f32m4
33-
#define VLSEV_FLOAT vlse_v_f32m4
34-
#define VSEV_FLOAT vse_v_f32m4
35-
#define VSSEV_FLOAT vsse_v_f32m4
32+
#define VLEV_FLOAT vle32_v_f32m4
33+
#define VLSEV_FLOAT vlse32_v_f32m4
34+
#define VSEV_FLOAT vse32_v_f32m4
35+
#define VSSEV_FLOAT vsse32_v_f32m4
3636
#define VFMACCVF_FLOAT vfmacc_vf_f32m4
3737
#else
3838
#define VSETVL(n) vsetvl_e64m4(n)
3939
#define FLOAT_V_T vfloat64m4_t
40-
#define VLEV_FLOAT vle_v_f64m4
41-
#define VLSEV_FLOAT vlse_v_f64m4
42-
#define VSEV_FLOAT vse_v_f64m4
43-
#define VSSEV_FLOAT vsse_v_f64m4
40+
#define VLEV_FLOAT vle64_v_f64m4
41+
#define VLSEV_FLOAT vlse64_v_f64m4
42+
#define VSEV_FLOAT vse64_v_f64m4
43+
#define VSSEV_FLOAT vsse64_v_f64m4
4444
#define VFMACCVF_FLOAT vfmacc_vf_f64m4
4545
#endif
4646

‎kernel/riscv64/gemv_t_vector.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3232
#define FLOAT_V_T vfloat32m4_t
3333
#define FLOAT_V_T_M1 vfloat32m1_t
3434
#define VFMVFS_FLOAT vfmv_f_s_f32m1_f32
35-
#define VLEV_FLOAT vle_v_f32m4
36-
#define VLSEV_FLOAT vlse_v_f32m4
35+
#define VLEV_FLOAT vle32_v_f32m4
36+
#define VLSEV_FLOAT vlse32_v_f32m4
3737
#define VFREDSUM_FLOAT vfredosum_vs_f32m4_f32m1
3838
#define VFMACCVV_FLOAT vfmacc_vv_f32m4
3939
#define VFMVVF_FLOAT vfmv_v_f_f32m4
@@ -46,8 +46,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4646
#define FLOAT_V_T vfloat64m4_t
4747
#define FLOAT_V_T_M1 vfloat64m1_t
4848
#define VFMVFS_FLOAT vfmv_f_s_f64m1_f64
49-
#define VLEV_FLOAT vle_v_f64m4
50-
#define VLSEV_FLOAT vlse_v_f64m4
49+
#define VLEV_FLOAT vle64_v_f64m4
50+
#define VLSEV_FLOAT vlse64_v_f64m4
5151
#define VFREDSUM_FLOAT vfredusum_vs_f64m4_f64m1
5252
#define VFMACCVV_FLOAT vfmacc_vv_f64m4
5353
#define VFMVVF_FLOAT vfmv_v_f_f64m4

‎kernel/riscv64/iamax_vector.c‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
3535
#define VSETVL_MAX vsetvlmax_e64m1()
3636
#define FLOAT_V_T vfloat64m8_t
3737
#define FLOAT_V_T_M1 vfloat64m1_t
38-
#define VLEV_FLOAT vle_v_f64m8
39-
#define VLSEV_FLOAT vlse_v_f64m8
38+
#define VLEV_FLOAT vle64_v_f64m8
39+
#define VLSEV_FLOAT vlse64_v_f64m8
4040
#define VFREDMAXVS_FLOAT vfredmax_vs_f64m8_f64m1
4141
#define MASK_T vbool8_t
4242
#define VMFLTVF_FLOAT vmflt_vf_f64m8_b8
@@ -60,8 +60,8 @@ USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
6060
#define VSETVL_MAX vsetvlmax_e32m1()
6161
#define FLOAT_V_T vfloat32m8_t
6262
#define FLOAT_V_T_M1 vfloat32m1_t
63-
#define VLEV_FLOAT vle_v_f32m8
64-
#define VLSEV_FLOAT vlse_v_f32m8
63+
#define VLEV_FLOAT vle32_v_f32m8
64+
#define VLSEV_FLOAT vlse32_v_f32m8
6565
#define VFREDMAXVS_FLOAT vfredmax_vs_f32m8_f32m1
6666
#define MASK_T vbool4_t
6767
#define VMFLTVF_FLOAT vmflt_vf_f32m8_b4

0 commit comments

Comments
 (0)