[gcc(refs/vendors/riscv/heads/gcc-14-with-riscv-opts)] RISC-V: Add testcases for scalar unsigned SAT_ADD form 5
https://gcc.gnu.org/g:1c438d611ed62e7898a4a3430032b6ab662f5540 commit 1c438d611ed62e7898a4a3430032b6ab662f5540 Author: Pan Li Date: Mon Jun 3 10:43:10 2024 +0800 RISC-V: Add testcases for scalar unsigned SAT_ADD form 5 After the middle-end support the form 5 of unsigned SAT_ADD and the RISC-V backend implement the scalar .SAT_ADD, add more test case to cover the form 5 of unsigned .SAT_ADD. Form 5: #define SAT_ADD_U_5(T) \ T sat_add_u_5_##T(T x, T y) \ { \ return (T)(x + y) < x ? -1 : (x + y); \ } Passed the riscv fully regression tests. gcc/testsuite/ChangeLog: * gcc.target/riscv/sat_arith.h: Add test macro for form 5. * gcc.target/riscv/sat_u_add-21.c: New test. * gcc.target/riscv/sat_u_add-22.c: New test. * gcc.target/riscv/sat_u_add-23.c: New test. * gcc.target/riscv/sat_u_add-24.c: New test. * gcc.target/riscv/sat_u_add-run-21.c: New test. * gcc.target/riscv/sat_u_add-run-22.c: New test. * gcc.target/riscv/sat_u_add-run-23.c: New test. * gcc.target/riscv/sat_u_add-run-24.c: New test. Signed-off-by: Pan Li (cherry picked from commit 93f44e18cddb2b5eb3a00232d3be9a5bc8179f25) Diff: --- gcc/testsuite/gcc.target/riscv/sat_arith.h| 8 gcc/testsuite/gcc.target/riscv/sat_u_add-21.c | 19 + gcc/testsuite/gcc.target/riscv/sat_u_add-22.c | 21 +++ gcc/testsuite/gcc.target/riscv/sat_u_add-23.c | 18 gcc/testsuite/gcc.target/riscv/sat_u_add-24.c | 17 +++ gcc/testsuite/gcc.target/riscv/sat_u_add-run-21.c | 25 +++ gcc/testsuite/gcc.target/riscv/sat_u_add-run-22.c | 25 +++ gcc/testsuite/gcc.target/riscv/sat_u_add-run-23.c | 25 +++ gcc/testsuite/gcc.target/riscv/sat_u_add-run-24.c | 25 +++ 9 files changed, 183 insertions(+) diff --git a/gcc/testsuite/gcc.target/riscv/sat_arith.h b/gcc/testsuite/gcc.target/riscv/sat_arith.h index 6ca158d57c4..976ef1c44c1 100644 --- a/gcc/testsuite/gcc.target/riscv/sat_arith.h +++ b/gcc/testsuite/gcc.target/riscv/sat_arith.h @@ -42,6 +42,13 @@ sat_u_add_##T##_fmt_5 (T x, T y) \ return __builtin_add_overflow (x, y, &ret) == 0 ? ret : -1; \ } +#define DEF_SAT_U_ADD_FMT_6(T) \ +T __attribute__((noinline)) \ +sat_u_add_##T##_fmt_6 (T x, T y)\ +{ \ + return (T)(x + y) < x ? -1 : (x + y); \ +} + #define DEF_VEC_SAT_U_ADD_FMT_1(T) \ void __attribute__((noinline)) \ vec_sat_u_add_##T##_fmt_1 (T *out, T *op_1, T *op_2, unsigned limit) \ @@ -60,6 +67,7 @@ vec_sat_u_add_##T##_fmt_1 (T *out, T *op_1, T *op_2, unsigned limit) \ #define RUN_SAT_U_ADD_FMT_3(T, x, y) sat_u_add_##T##_fmt_3(x, y) #define RUN_SAT_U_ADD_FMT_4(T, x, y) sat_u_add_##T##_fmt_4(x, y) #define RUN_SAT_U_ADD_FMT_5(T, x, y) sat_u_add_##T##_fmt_5(x, y) +#define RUN_SAT_U_ADD_FMT_6(T, x, y) sat_u_add_##T##_fmt_6(x, y) #define RUN_VEC_SAT_U_ADD_FMT_1(T, out, op_1, op_2, N) \ vec_sat_u_add_##T##_fmt_1(out, op_1, op_2, N) diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-21.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-21.c new file mode 100644 index 000..f75e35a5fa9 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-21.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */ +/* { dg-final { check-function-bodies "**" "" } } */ + +#include "sat_arith.h" + +/* +** sat_u_add_uint8_t_fmt_6: +** add\s+[atx][0-9]+,\s*a0,\s*a1 +** andi\s+[atx][0-9]+,\s*[atx][0-9]+,\s*0xff +** sltu\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** neg\s+[atx][0-9]+,\s*[atx][0-9]+ +** or\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** andi\s+a0,\s*a0,\s*0xff +** ret +*/ +DEF_SAT_U_ADD_FMT_6(uint8_t) + +/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-22.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-22.c new file mode 100644 index 000..ad957a061f4 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-22.c @@ -0,0 +1,21 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */ +/* { dg-final { check-function-bodies "**" "" } } */ + +#include "sat_arith.h" + +/* +** sat_u_add_uint16_t_fmt_6: +** add\s+[atx][0-9]+,\s*a0,\s*a1 +** slli\s+[atx][0-9]+,\s*[atx][0-9]+,\s*48 +** srli\s+[atx][0-9]+,\s*[atx][0-9]+,\s*48 +** sltu\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** neg\s+[atx][0-9]+,\s*[atx][0-9]+ +** or\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** slli\s+a0,\s*a0,\s*48 +** srli\s+a0
[gcc(refs/vendors/riscv/heads/gcc-14-with-riscv-opts)] RISC-V: Add testcases for scalar unsigned SAT_ADD form 5
https://gcc.gnu.org/g:1a6d2ed7fbd20bfa3079da4700eb591f2abaa395 commit 1a6d2ed7fbd20bfa3079da4700eb591f2abaa395 Author: Pan Li Date: Mon Jun 3 10:43:10 2024 +0800 RISC-V: Add testcases for scalar unsigned SAT_ADD form 5 After the middle-end support the form 5 of unsigned SAT_ADD and the RISC-V backend implement the scalar .SAT_ADD, add more test case to cover the form 5 of unsigned .SAT_ADD. Form 5: #define SAT_ADD_U_5(T) \ T sat_add_u_5_##T(T x, T y) \ { \ return (T)(x + y) < x ? -1 : (x + y); \ } Passed the riscv fully regression tests. gcc/testsuite/ChangeLog: * gcc.target/riscv/sat_arith.h: Add test macro for form 5. * gcc.target/riscv/sat_u_add-21.c: New test. * gcc.target/riscv/sat_u_add-22.c: New test. * gcc.target/riscv/sat_u_add-23.c: New test. * gcc.target/riscv/sat_u_add-24.c: New test. * gcc.target/riscv/sat_u_add-run-21.c: New test. * gcc.target/riscv/sat_u_add-run-22.c: New test. * gcc.target/riscv/sat_u_add-run-23.c: New test. * gcc.target/riscv/sat_u_add-run-24.c: New test. Signed-off-by: Pan Li (cherry picked from commit 93f44e18cddb2b5eb3a00232d3be9a5bc8179f25) Diff: --- gcc/testsuite/gcc.target/riscv/sat_arith.h| 8 gcc/testsuite/gcc.target/riscv/sat_u_add-21.c | 19 + gcc/testsuite/gcc.target/riscv/sat_u_add-22.c | 21 +++ gcc/testsuite/gcc.target/riscv/sat_u_add-23.c | 18 gcc/testsuite/gcc.target/riscv/sat_u_add-24.c | 17 +++ gcc/testsuite/gcc.target/riscv/sat_u_add-run-21.c | 25 +++ gcc/testsuite/gcc.target/riscv/sat_u_add-run-22.c | 25 +++ gcc/testsuite/gcc.target/riscv/sat_u_add-run-23.c | 25 +++ gcc/testsuite/gcc.target/riscv/sat_u_add-run-24.c | 25 +++ 9 files changed, 183 insertions(+) diff --git a/gcc/testsuite/gcc.target/riscv/sat_arith.h b/gcc/testsuite/gcc.target/riscv/sat_arith.h index 6ca158d57c4..976ef1c44c1 100644 --- a/gcc/testsuite/gcc.target/riscv/sat_arith.h +++ b/gcc/testsuite/gcc.target/riscv/sat_arith.h @@ -42,6 +42,13 @@ sat_u_add_##T##_fmt_5 (T x, T y) \ return __builtin_add_overflow (x, y, &ret) == 0 ? ret : -1; \ } +#define DEF_SAT_U_ADD_FMT_6(T) \ +T __attribute__((noinline)) \ +sat_u_add_##T##_fmt_6 (T x, T y)\ +{ \ + return (T)(x + y) < x ? -1 : (x + y); \ +} + #define DEF_VEC_SAT_U_ADD_FMT_1(T) \ void __attribute__((noinline)) \ vec_sat_u_add_##T##_fmt_1 (T *out, T *op_1, T *op_2, unsigned limit) \ @@ -60,6 +67,7 @@ vec_sat_u_add_##T##_fmt_1 (T *out, T *op_1, T *op_2, unsigned limit) \ #define RUN_SAT_U_ADD_FMT_3(T, x, y) sat_u_add_##T##_fmt_3(x, y) #define RUN_SAT_U_ADD_FMT_4(T, x, y) sat_u_add_##T##_fmt_4(x, y) #define RUN_SAT_U_ADD_FMT_5(T, x, y) sat_u_add_##T##_fmt_5(x, y) +#define RUN_SAT_U_ADD_FMT_6(T, x, y) sat_u_add_##T##_fmt_6(x, y) #define RUN_VEC_SAT_U_ADD_FMT_1(T, out, op_1, op_2, N) \ vec_sat_u_add_##T##_fmt_1(out, op_1, op_2, N) diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-21.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-21.c new file mode 100644 index 000..f75e35a5fa9 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-21.c @@ -0,0 +1,19 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */ +/* { dg-final { check-function-bodies "**" "" } } */ + +#include "sat_arith.h" + +/* +** sat_u_add_uint8_t_fmt_6: +** add\s+[atx][0-9]+,\s*a0,\s*a1 +** andi\s+[atx][0-9]+,\s*[atx][0-9]+,\s*0xff +** sltu\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** neg\s+[atx][0-9]+,\s*[atx][0-9]+ +** or\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** andi\s+a0,\s*a0,\s*0xff +** ret +*/ +DEF_SAT_U_ADD_FMT_6(uint8_t) + +/* { dg-final { scan-rtl-dump-times ".SAT_ADD " 2 "expand" } } */ diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_add-22.c b/gcc/testsuite/gcc.target/riscv/sat_u_add-22.c new file mode 100644 index 000..ad957a061f4 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/sat_u_add-22.c @@ -0,0 +1,21 @@ +/* { dg-do compile } */ +/* { dg-options "-march=rv64gc -mabi=lp64d -O3 -fdump-rtl-expand-details -fno-schedule-insns -fno-schedule-insns2" } */ +/* { dg-final { check-function-bodies "**" "" } } */ + +#include "sat_arith.h" + +/* +** sat_u_add_uint16_t_fmt_6: +** add\s+[atx][0-9]+,\s*a0,\s*a1 +** slli\s+[atx][0-9]+,\s*[atx][0-9]+,\s*48 +** srli\s+[atx][0-9]+,\s*[atx][0-9]+,\s*48 +** sltu\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** neg\s+[atx][0-9]+,\s*[atx][0-9]+ +** or\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+ +** slli\s+a0,\s*a0,\s*48 +** srli\s+a0