From: Pan Li <[email protected]>
The vfwcvt_x_f_v and vfwcvt_rtz_x_f_v are placed in
one file, and when allow overlap for vfwcvt_x_f_v.
The csrr scan still xfail.
Therefore, split it into two files to make sure
both the vfwcvt_x_f_v and vfwcvt_rtz_x_f_v has
no csrr after enable overlap.
gcc/testsuite/ChangeLog:
* gcc.target/riscv/rvv/base/pr112431-13.c: Move to...
* gcc.target/riscv/rvv/base/pr112431-13-0.c: ...here.
* gcc.target/riscv/rvv/base/pr112431-13-1.c: New test.
Signed-off-by: Pan Li <[email protected]>
---
.../base/{pr112431-13.c => pr112431-13-0.c} | 84 --------------
.../gcc.target/riscv/rvv/base/pr112431-13-1.c | 104 ++++++++++++++++++
2 files changed, 104 insertions(+), 84 deletions(-)
rename gcc/testsuite/gcc.target/riscv/rvv/base/{pr112431-13.c =>
pr112431-13-0.c} (55%)
create mode 100644 gcc/testsuite/gcc.target/riscv/rvv/base/pr112431-13-1.c
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/pr112431-13.c
b/gcc/testsuite/gcc.target/riscv/rvv/base/pr112431-13-0.c
similarity index 55%
rename from gcc/testsuite/gcc.target/riscv/rvv/base/pr112431-13.c
rename to gcc/testsuite/gcc.target/riscv/rvv/base/pr112431-13-0.c
index 71786995c56..88f69f49800 100644
--- a/gcc/testsuite/gcc.target/riscv/rvv/base/pr112431-13.c
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/pr112431-13-0.c
@@ -97,90 +97,6 @@ foo (char const *buf, size_t len)
return sum;
}
-double
-foo2 (char const *buf, size_t len)
-{
- double sum = 0;
- size_t vl = __riscv_vsetvlmax_e8m8 ();
- size_t step = vl * 4;
- const char *it = buf, *end = buf + len;
- for (; it + step <= end;)
- {
- vfloat32m1_t v0 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v1 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v2 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v3 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v4 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v5 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v6 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v7 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v8 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v9 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v10 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v11 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v12 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v13 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v14 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
- vfloat32m1_t v15 = __riscv_vle32_v_f32m1 ((void *) it, vl);
- it += vl;
-
- asm volatile("nop" ::: "memory");
- vint64m2_t vw0 = __riscv_vfwcvt_x_f_v_i64m2 (v0, vl);
- vint64m2_t vw1 = __riscv_vfwcvt_x_f_v_i64m2 (v1, vl);
- vint64m2_t vw2 = __riscv_vfwcvt_x_f_v_i64m2 (v2, vl);
- vint64m2_t vw3 = __riscv_vfwcvt_x_f_v_i64m2 (v3, vl);
- vint64m2_t vw4 = __riscv_vfwcvt_x_f_v_i64m2 (v4, vl);
- vint64m2_t vw5 = __riscv_vfwcvt_x_f_v_i64m2 (v5, vl);
- vint64m2_t vw6 = __riscv_vfwcvt_x_f_v_i64m2 (v6, vl);
- vint64m2_t vw7 = __riscv_vfwcvt_x_f_v_i64m2 (v7, vl);
- vint64m2_t vw8 = __riscv_vfwcvt_x_f_v_i64m2 (v8, vl);
- vint64m2_t vw9 = __riscv_vfwcvt_x_f_v_i64m2 (v9, vl);
- vint64m2_t vw10 = __riscv_vfwcvt_x_f_v_i64m2 (v10, vl);
- vint64m2_t vw11 = __riscv_vfwcvt_x_f_v_i64m2 (v11, vl);
- vint64m2_t vw12 = __riscv_vfwcvt_x_f_v_i64m2 (v12, vl);
- vint64m2_t vw13 = __riscv_vfwcvt_x_f_v_i64m2 (v13, vl);
- vint64m2_t vw14 = __riscv_vfwcvt_x_f_v_i64m2 (v14, vl);
- vint64m2_t vw15 = __riscv_vfwcvt_x_f_v_i64m2 (v15, vl);
-
- asm volatile("nop" ::: "memory");
- double sum0 = __riscv_vmv_x_s_i64m2_i64 (vw0);
- double sum1 = __riscv_vmv_x_s_i64m2_i64 (vw1);
- double sum2 = __riscv_vmv_x_s_i64m2_i64 (vw2);
- double sum3 = __riscv_vmv_x_s_i64m2_i64 (vw3);
- double sum4 = __riscv_vmv_x_s_i64m2_i64 (vw4);
- double sum5 = __riscv_vmv_x_s_i64m2_i64 (vw5);
- double sum6 = __riscv_vmv_x_s_i64m2_i64 (vw6);
- double sum7 = __riscv_vmv_x_s_i64m2_i64 (vw7);
- double sum8 = __riscv_vmv_x_s_i64m2_i64 (vw8);
- double sum9 = __riscv_vmv_x_s_i64m2_i64 (vw9);
- double sum10 = __riscv_vmv_x_s_i64m2_i64 (vw10);
- double sum11 = __riscv_vmv_x_s_i64m2_i64 (vw11);
- double sum12 = __riscv_vmv_x_s_i64m2_i64 (vw12);
- double sum13 = __riscv_vmv_x_s_i64m2_i64 (vw13);
- double sum14 = __riscv_vmv_x_s_i64m2_i64 (vw14);
- double sum15 = __riscv_vmv_x_s_i64m2_i64 (vw15);
-
- sum += sumation (sum0, sum1, sum2, sum3, sum4, sum5, sum6, sum7, sum8,
- sum9, sum10, sum11, sum12, sum13, sum14, sum15);
- }
- return sum;
-}
-
/* { dg-final { scan-assembler-not {vmv1r} } } */
/* { dg-final { scan-assembler-not {vmv2r} } } */
/* { dg-final { scan-assembler-not {vmv4r} } } */
diff --git a/gcc/testsuite/gcc.target/riscv/rvv/base/pr112431-13-1.c
b/gcc/testsuite/gcc.target/riscv/rvv/base/pr112431-13-1.c
new file mode 100644
index 00000000000..468bf532c65
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/rvv/base/pr112431-13-1.c
@@ -0,0 +1,104 @@
+/* { dg-do compile } */
+/* { dg-options "-march=rv64gcv -mabi=lp64d -O3" } */
+
+#include "riscv_vector.h"
+
+double __attribute__ ((noinline))
+sumation (double sum0, double sum1, double sum2, double sum3, double sum4,
+ double sum5, double sum6, double sum7, double sum8, double sum9,
+ double sum10, double sum11, double sum12, double sum13, double sum14,
+ double sum15)
+{
+ return sum0 + sum1 + sum2 + sum3 + sum4 + sum5 + sum6 + sum7 + sum8 + sum9
+ + sum10 + sum11 + sum12 + sum13 + sum14 + sum15;
+}
+
+double
+foo2 (char const *buf, size_t len)
+{
+ double sum = 0;
+ size_t vl = __riscv_vsetvlmax_e8m8 ();
+ size_t step = vl * 4;
+ const char *it = buf, *end = buf + len;
+ for (; it + step <= end;)
+ {
+ vfloat32m1_t v0 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v1 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v2 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v3 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v4 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v5 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v6 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v7 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v8 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v9 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v10 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v11 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v12 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v13 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v14 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+ vfloat32m1_t v15 = __riscv_vle32_v_f32m1 ((void *) it, vl);
+ it += vl;
+
+ asm volatile("nop" ::: "memory");
+ vint64m2_t vw0 = __riscv_vfwcvt_x_f_v_i64m2 (v0, vl);
+ vint64m2_t vw1 = __riscv_vfwcvt_x_f_v_i64m2 (v1, vl);
+ vint64m2_t vw2 = __riscv_vfwcvt_x_f_v_i64m2 (v2, vl);
+ vint64m2_t vw3 = __riscv_vfwcvt_x_f_v_i64m2 (v3, vl);
+ vint64m2_t vw4 = __riscv_vfwcvt_x_f_v_i64m2 (v4, vl);
+ vint64m2_t vw5 = __riscv_vfwcvt_x_f_v_i64m2 (v5, vl);
+ vint64m2_t vw6 = __riscv_vfwcvt_x_f_v_i64m2 (v6, vl);
+ vint64m2_t vw7 = __riscv_vfwcvt_x_f_v_i64m2 (v7, vl);
+ vint64m2_t vw8 = __riscv_vfwcvt_x_f_v_i64m2 (v8, vl);
+ vint64m2_t vw9 = __riscv_vfwcvt_x_f_v_i64m2 (v9, vl);
+ vint64m2_t vw10 = __riscv_vfwcvt_x_f_v_i64m2 (v10, vl);
+ vint64m2_t vw11 = __riscv_vfwcvt_x_f_v_i64m2 (v11, vl);
+ vint64m2_t vw12 = __riscv_vfwcvt_x_f_v_i64m2 (v12, vl);
+ vint64m2_t vw13 = __riscv_vfwcvt_x_f_v_i64m2 (v13, vl);
+ vint64m2_t vw14 = __riscv_vfwcvt_x_f_v_i64m2 (v14, vl);
+ vint64m2_t vw15 = __riscv_vfwcvt_x_f_v_i64m2 (v15, vl);
+
+ asm volatile("nop" ::: "memory");
+ double sum0 = __riscv_vmv_x_s_i64m2_i64 (vw0);
+ double sum1 = __riscv_vmv_x_s_i64m2_i64 (vw1);
+ double sum2 = __riscv_vmv_x_s_i64m2_i64 (vw2);
+ double sum3 = __riscv_vmv_x_s_i64m2_i64 (vw3);
+ double sum4 = __riscv_vmv_x_s_i64m2_i64 (vw4);
+ double sum5 = __riscv_vmv_x_s_i64m2_i64 (vw5);
+ double sum6 = __riscv_vmv_x_s_i64m2_i64 (vw6);
+ double sum7 = __riscv_vmv_x_s_i64m2_i64 (vw7);
+ double sum8 = __riscv_vmv_x_s_i64m2_i64 (vw8);
+ double sum9 = __riscv_vmv_x_s_i64m2_i64 (vw9);
+ double sum10 = __riscv_vmv_x_s_i64m2_i64 (vw10);
+ double sum11 = __riscv_vmv_x_s_i64m2_i64 (vw11);
+ double sum12 = __riscv_vmv_x_s_i64m2_i64 (vw12);
+ double sum13 = __riscv_vmv_x_s_i64m2_i64 (vw13);
+ double sum14 = __riscv_vmv_x_s_i64m2_i64 (vw14);
+ double sum15 = __riscv_vmv_x_s_i64m2_i64 (vw15);
+
+ sum += sumation (sum0, sum1, sum2, sum3, sum4, sum5, sum6, sum7, sum8,
+ sum9, sum10, sum11, sum12, sum13, sum14, sum15);
+ }
+ return sum;
+}
+
+/* { dg-final { scan-assembler-not {vmv1r} } } */
+/* { dg-final { scan-assembler-not {vmv2r} } } */
+/* { dg-final { scan-assembler-not {vmv4r} } } */
+/* { dg-final { scan-assembler-not {vmv8r} } } */
+/* { dg-final { scan-assembler-not {csrr} } } */
--
2.43.0