diff mbox series

[v1,1/2] RISC-V: Add testcases for unsigned scalar .SAT_TRUNC form 2

Message ID 20240817113641.73334-1-pan2.li@intel.com
State New
Headers show
Series [v1,1/2] RISC-V: Add testcases for unsigned scalar .SAT_TRUNC form 2 | expand

Commit Message

Li, Pan2 Aug. 17, 2024, 11:36 a.m. UTC
From: Pan Li <pan2.li@intel.com>

This patch would like to add test cases for the unsigned scalar
.SAT_TRUNC form 2.  Aka:

Form 2:
  #define DEF_SAT_U_TRUC_FMT_2(NT, WT)     \
  NT __attribute__((noinline))             \
  sat_u_truc_##WT##_to_##NT##_fmt_2 (WT x) \
  {                                        \
    WT max = (WT)(NT)-1;                   \
    return x > max ? (NT) max : (NT)x;     \
  }

DEF_SAT_U_TRUC_FMT_2 (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-7.c: New test.
	* gcc.target/riscv/sat_u_trunc-8.c: New test.
	* gcc.target/riscv/sat_u_trunc-9.c: New test.
	* gcc.target/riscv/sat_u_trunc-run-7.c: New test.
	* gcc.target/riscv/sat_u_trunc-run-8.c: New test.
	* gcc.target/riscv/sat_u_trunc-run-9.c: New test.

Signed-off-by: Pan Li <pan2.li@intel.com>
---
 gcc/testsuite/gcc.target/riscv/sat_arith.h    | 12 +++++++++++
 .../gcc.target/riscv/sat_u_trunc-7.c          | 17 ++++++++++++++++
 .../gcc.target/riscv/sat_u_trunc-8.c          | 20 +++++++++++++++++++
 .../gcc.target/riscv/sat_u_trunc-9.c          | 19 ++++++++++++++++++
 .../gcc.target/riscv/sat_u_trunc-run-7.c      | 16 +++++++++++++++
 .../gcc.target/riscv/sat_u_trunc-run-8.c      | 16 +++++++++++++++
 .../gcc.target/riscv/sat_u_trunc-run-9.c      | 16 +++++++++++++++
 7 files changed, 116 insertions(+)
 create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-7.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-8.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-9.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-7.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-8.c
 create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-9.c

Comments

Kito Cheng Aug. 17, 2024, 1:53 p.m. UTC | #1
LGTM

<pan2.li@intel.com> 於 2024年8月17日 週六 19:37 寫道:

> From: Pan Li <pan2.li@intel.com>
>
> This patch would like to add test cases for the unsigned scalar
> .SAT_TRUNC form 2.  Aka:
>
> Form 2:
>   #define DEF_SAT_U_TRUC_FMT_2(NT, WT)     \
>   NT __attribute__((noinline))             \
>   sat_u_truc_##WT##_to_##NT##_fmt_2 (WT x) \
>   {                                        \
>     WT max = (WT)(NT)-1;                   \
>     return x > max ? (NT) max : (NT)x;     \
>   }
>
> DEF_SAT_U_TRUC_FMT_2 (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-7.c: New test.
>         * gcc.target/riscv/sat_u_trunc-8.c: New test.
>         * gcc.target/riscv/sat_u_trunc-9.c: New test.
>         * gcc.target/riscv/sat_u_trunc-run-7.c: New test.
>         * gcc.target/riscv/sat_u_trunc-run-8.c: New test.
>         * gcc.target/riscv/sat_u_trunc-run-9.c: New test.
>
> Signed-off-by: Pan Li <pan2.li@intel.com>
> ---
>  gcc/testsuite/gcc.target/riscv/sat_arith.h    | 12 +++++++++++
>  .../gcc.target/riscv/sat_u_trunc-7.c          | 17 ++++++++++++++++
>  .../gcc.target/riscv/sat_u_trunc-8.c          | 20 +++++++++++++++++++
>  .../gcc.target/riscv/sat_u_trunc-9.c          | 19 ++++++++++++++++++
>  .../gcc.target/riscv/sat_u_trunc-run-7.c      | 16 +++++++++++++++
>  .../gcc.target/riscv/sat_u_trunc-run-8.c      | 16 +++++++++++++++
>  .../gcc.target/riscv/sat_u_trunc-run-9.c      | 16 +++++++++++++++
>  7 files changed, 116 insertions(+)
>  create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-7.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-8.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-9.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-7.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-8.c
>  create mode 100644 gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-9.c
>
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_arith.h
> b/gcc/testsuite/gcc.target/riscv/sat_arith.h
> index 37e0a60f21b..576a4926d1f 100644
> --- a/gcc/testsuite/gcc.target/riscv/sat_arith.h
> +++ b/gcc/testsuite/gcc.target/riscv/sat_arith.h
> @@ -227,7 +227,19 @@ sat_u_truc_##WT##_to_##NT##_fmt_1 (WT x) \
>  }
>  #define DEF_SAT_U_TRUC_FMT_1_WRAP(NT, WT) DEF_SAT_U_TRUC_FMT_1(NT, WT)
>
> +#define DEF_SAT_U_TRUC_FMT_2(NT, WT)     \
> +NT __attribute__((noinline))             \
> +sat_u_truc_##WT##_to_##NT##_fmt_2 (WT x) \
> +{                                        \
> +  WT max = (WT)(NT)-1;                   \
> +  return x > max ? (NT) max : (NT)x;     \
> +}
> +#define DEF_SAT_U_TRUC_FMT_2_WRAP(NT, WT) DEF_SAT_U_TRUC_FMT_2(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)
> +
>  #endif
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-7.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-7.c
> new file mode 100644
> index 00000000000..95d513a15fb
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-7.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_2:
> +** 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_2(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-8.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-8.c
> new file mode 100644
> index 00000000000..f168912293d
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-8.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_2:
> +** 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_2(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-9.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-9.c
> new file mode 100644
> index 00000000000..d82363d6aef
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-9.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_2:
> +** 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_2(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-7.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-7.c
> new file mode 100644
> index 00000000000..b98d40fa7ec
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-7.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_2_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_2_WRAP(T1, T2, x)
> +
> +#include "scalar_sat_unary.h"
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-8.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-8.c
> new file mode 100644
> index 00000000000..486585df7b8
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-8.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_2_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_2_WRAP(T1, T2, x)
> +
> +#include "scalar_sat_unary.h"
> diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-9.c
> b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-9.c
> new file mode 100644
> index 00000000000..2099304a0be
> --- /dev/null
> +++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-9.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 uint32_t
> +#define T2 uint64_t
> +
> +DEF_SAT_U_TRUC_FMT_2_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_2_WRAP(T1, T2, x)
> +
> +#include "scalar_sat_unary.h"
> --
> 2.43.0
>
>
diff mbox series

Patch

diff --git a/gcc/testsuite/gcc.target/riscv/sat_arith.h b/gcc/testsuite/gcc.target/riscv/sat_arith.h
index 37e0a60f21b..576a4926d1f 100644
--- a/gcc/testsuite/gcc.target/riscv/sat_arith.h
+++ b/gcc/testsuite/gcc.target/riscv/sat_arith.h
@@ -227,7 +227,19 @@  sat_u_truc_##WT##_to_##NT##_fmt_1 (WT x) \
 }
 #define DEF_SAT_U_TRUC_FMT_1_WRAP(NT, WT) DEF_SAT_U_TRUC_FMT_1(NT, WT)
 
+#define DEF_SAT_U_TRUC_FMT_2(NT, WT)     \
+NT __attribute__((noinline))             \
+sat_u_truc_##WT##_to_##NT##_fmt_2 (WT x) \
+{                                        \
+  WT max = (WT)(NT)-1;                   \
+  return x > max ? (NT) max : (NT)x;     \
+}
+#define DEF_SAT_U_TRUC_FMT_2_WRAP(NT, WT) DEF_SAT_U_TRUC_FMT_2(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)
+
 #endif
diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-7.c b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-7.c
new file mode 100644
index 00000000000..95d513a15fb
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-7.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_2:
+** 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_2(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-8.c b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-8.c
new file mode 100644
index 00000000000..f168912293d
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-8.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_2:
+** 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_2(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-9.c b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-9.c
new file mode 100644
index 00000000000..d82363d6aef
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-9.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_2:
+** 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_2(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-7.c b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-7.c
new file mode 100644
index 00000000000..b98d40fa7ec
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-7.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_2_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_2_WRAP(T1, T2, x)
+
+#include "scalar_sat_unary.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-8.c b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-8.c
new file mode 100644
index 00000000000..486585df7b8
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-8.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_2_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_2_WRAP(T1, T2, x)
+
+#include "scalar_sat_unary.h"
diff --git a/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-9.c b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-9.c
new file mode 100644
index 00000000000..2099304a0be
--- /dev/null
+++ b/gcc/testsuite/gcc.target/riscv/sat_u_trunc-run-9.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 uint32_t
+#define T2 uint64_t
+
+DEF_SAT_U_TRUC_FMT_2_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_2_WRAP(T1, T2, x)
+
+#include "scalar_sat_unary.h"