LGTM
<pan2...@intel.com> 於 2024年8月17日 週六 19:37 寫道：
> From: Pan Li <pan2...@intel.com>
>
> This patch would like to add test cases for the unsigned scalar
> .SAT_TRUNC form 3. Aka:
>
> Form 3:
> #define DEF_SAT_U_TRUC_FMT_3(NT, WT) \
> NT __attribute__((noinline)) \
> sat_u_truc_##WT##_to_##NT##_fmt_3 (WT x) \
> { \
> WT max = (WT)(NT)-1; \
> return x <= max ? (NT)x : (NT) max; \
> }
>
> DEF_SAT_U_TRUC_FMT_3 (uint32_t, uint64_t)
>
> The below test is passed for this patch.
> * The rv64gcv regression test.
>
> gcc/testsuite/ChangeLog:
>
> * gcc.target/riscv/sat_arith.h: Add test helper macros.
> * gcc.target/riscv/sat_u_trunc-13.c: New test.
> * gcc.target/riscv/sat_u_trunc-14.c: New test.
> * gcc.target/riscv/sat_u_trunc-15.c: New test.
> * gcc.target/riscv/sat_u_trunc-run-13.c: New test.
> * gcc.target/riscv/sat_u_trunc-run-14.c: New test.
> * gcc.target/riscv/sat_u_trunc-run-15.c: New test.
>
> Signed-off-by: Pan Li <pan2...@intel.com>
> ---
> gcc/testsuite/gcc.target/riscv/sat_arith.h | 12 +++++++++++
> .../gcc.target/riscv/sat_u_trunc-13.c | 17 ++++++++++++++++
> .../gcc.target/riscv/sat_u_trunc-14.c | 20 +++++++++++++++++++
> .../gcc.target/riscv/sat_u_trunc-15.c | 19 ++++++++++++++++++
> .../gcc.target/riscv/sat_u_trunc-run-13.c | 16 +++++++++++++++
> .../gcc.target/riscv/sat_u_trunc-run-14.c | 16 +++++++++++++++
> .../gcc.target/riscv/sat_u_trunc-run-15.c | 16 +++++++++++++++
> 7 files changed, 116 insertions(+)
> create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-13.c
> create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-14.c
> create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-15.c
> create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-13.c
> create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-14.c
> create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-15.c
>
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_arith.h
> b/gcc/testsuite/gcc.target/riscv/sat_arith.h
> index 576a4926d1f..cf055410fd1 100644
> --- a/gcc/testsuite/gcc.target/riscv/sat_arith.h
> +++ b/gcc/testsuite/gcc.target/riscv/sat_arith.h
> @@ -236,10 +236,22 @@ sat_u_truc_##WT##_to_##NT##_fmt_2 (WT x) \
> }
> #define DEF_SAT_U_TRUC_FMT_2_WRAP(NT, WT) DEF_SAT_U_TRUC_FMT_2(NT, WT)
>
> +#define DEF_SAT_U_TRUC_FMT_3(NT, WT) \
> +NT __attribute__((noinline)) \
> +sat_u_truc_##WT##_to_##NT##_fmt_3 (WT x) \
> +{ \
> + WT max = (WT)(NT)-1; \
> + return x <= max ? (NT)x : (NT) max; \
> +}
> +#define DEF_SAT_U_TRUC_FMT_3_WRAP(NT, WT) DEF_SAT_U_TRUC_FMT_3(NT, WT)
> +
> #define RUN_SAT_U_TRUC_FMT_1(NT, WT, x) sat_u_truc_##WT##_to_##NT##_fmt_1
> (x)
> #define RUN_SAT_U_TRUC_FMT_1_WRAP(NT, WT, x) RUN_SAT_U_TRUC_FMT_1(NT, WT,
> x)
>
> #define RUN_SAT_U_TRUC_FMT_2(NT, WT, x) sat_u_truc_##WT##_to_##NT##_fmt_2
> (x)
> #define RUN_SAT_U_TRUC_FMT_2_WRAP(NT, WT, x) RUN_SAT_U_TRUC_FMT_2(NT, WT,
> x)
>
> +#define RUN_SAT_U_TRUC_FMT_3(NT, WT, x) sat_u_truc_##WT##_to_##NT##_fmt_3
> (x)
> +#define RUN_SAT_U_TRUC_FMT_3_WRAP(NT, WT, x) RUN_SAT_U_TRUC_FMT_3(NT, WT,
> x)
> +
> #endif
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-13.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-13.c
> new file mode 100644
> index 00000000000..58910793a80
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-13.c
> @@ -0,0 +1,17 @@
> +/* { 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_truc_uint16_t_to_uint8_t_fmt_3:
> +** sltiu\s+[atx][0-9]+,\s*a0,\s*255
> +** addi\s+[atx][0-9]+,\s*[atx][0-9]+,\s*-1
> +** or\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+
> +** andi\s+[atx][0-9]+,\s*[atx][0-9]+,\s*0xff
> +** ret
> +*/
> +DEF_SAT_U_TRUC_FMT_3(uint8_t, uint16_t)
> +
> +/* { dg-final { scan-rtl-dump-times ".SAT_TRUNC " 2 "expand" } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-14.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-14.c
> new file mode 100644
> index 00000000000..236ea1d45f7
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-14.c
> @@ -0,0 +1,20 @@
> +/* { 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_truc_uint32_t_to_uint16_t_fmt_3:
> +** li\s+[atx][0-9]+,\s*65536
> +** addi\s+[atx][0-9]+,\s*[atx][0-9]+,\s*-1
> +** sltu\s+[atx][0-9]+,\s*a0,\s*[atx][0-9]+
> +** addi\s+[atx][0-9]+,\s*[atx][0-9]+,\s*-1
> +** or\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+
> +** slli\s+a0,\s*a0,\s*48
> +** srli\s+a0,\s*a0,\s*48
> +** ret
> +*/
> +DEF_SAT_U_TRUC_FMT_3(uint16_t, uint32_t)
> +
> +/* { dg-final { scan-rtl-dump-times ".SAT_TRUNC " 2 "expand" } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-15.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-15.c
> new file mode 100644
> index 00000000000..33c3686c053
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-15.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_truc_uint64_t_to_uint32_t_fmt_3:
> +** li\s+[atx][0-9]+,\s*-1
> +** srli\s+[atx][0-9]+,\s*[atx][0-9]+,\s*32
> +** sltu\s+[atx][0-9]+,\s*a0,\s*[atx][0-9]+
> +** addi\s+[atx][0-9]+,\s*[atx][0-9]+,\s*-1
> +** or\s+[atx][0-9]+,\s*[atx][0-9]+,\s*[atx][0-9]+
> +** sext.w\s+a0,\s*a0
> +** ret
> +*/
> +DEF_SAT_U_TRUC_FMT_3(uint32_t, uint64_t)
> +
> +/* { dg-final { scan-rtl-dump-times ".SAT_TRUNC " 2 "expand" } } */
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-13.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-13.c
> new file mode 100644
> index 00000000000..6322305c5ed
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-13.c
> @@ -0,0 +1,16 @@
> +/* { dg-do run { target { riscv_v } } } */
> +/* { dg-additional-options "-std=c99" } */
> +
> +#include "sat_arith.h"
> +#include "sat_arith_data.h"
> +
> +#define T1 uint8_t
> +#define T2 uint16_t
> +
> +DEF_SAT_U_TRUC_FMT_3_WRAP(T1, T2)
> +
> +#define DATA TEST_UNARY_DATA_WRAP(T1, T2)
> +#define T TEST_UNARY_STRUCT_DECL(T1, T2)
> +#define RUN_UNARY(x) RUN_SAT_U_TRUC_FMT_3_WRAP(T1, T2, x)
> +
> +#include "scalar_sat_unary.h"
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-14.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-14.c
> new file mode 100644
> index 00000000000..a29e887aeeb
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-14.c
> @@ -0,0 +1,16 @@
> +/* { dg-do run { target { riscv_v } } } */
> +/* { dg-additional-options "-std=c99" } */
> +
> +#include "sat_arith.h"
> +#include "sat_arith_data.h"
> +
> +#define T1 uint16_t
> +#define T2 uint32_t
> +
> +DEF_SAT_U_TRUC_FMT_3_WRAP(T1, T2)
> +
> +#define DATA TEST_UNARY_DATA_WRAP(T1, T2)
> +#define T TEST_UNARY_STRUCT_DECL(T1, T2)
> +#define RUN_UNARY(x) RUN_SAT_U_TRUC_FMT_3_WRAP(T1, T2, x)
> +
> +#include "scalar_sat_unary.h"
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-15.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-15.c
> new file mode 100644
> index 00000000000..a29e887aeeb
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-15.c
> @@ -0,0 +1,16 @@
> +/* { dg-do run { target { riscv_v } } } */
> +/* { dg-additional-options "-std=c99" } */
> +
> +#include "sat_arith.h"
> +#include "sat_arith_data.h"
> +
> +#define T1 uint16_t
> +#define T2 uint32_t
> +
> +DEF_SAT_U_TRUC_FMT_3_WRAP(T1, T2)
> +
> +#define DATA TEST_UNARY_DATA_WRAP(T1, T2)
> +#define T TEST_UNARY_STRUCT_DECL(T1, T2)
> +#define RUN_UNARY(x) RUN_SAT_U_TRUC_FMT_3_WRAP(T1, T2, x)
> +
> +#include "scalar_sat_unary.h"
> --
> 2.43.0
>
>
