| Message ID | 1564729885-7984-1-git-send-email-kito.cheng@sifive.com |
|---|---|
| State | New |
| Headers | show |
| Series | [v2] RISC-V: Promote type correctly for libcalls | expand |
On Fri, Aug 2, 2019 at 12:11 AM Kito Cheng <kito.cheng@sifive.com> wrote: > gcc/ChangeLog > * config/riscv/riscv.c (riscv_promote_function_mode): New. > (TARGET_PROMOTE_FUNCTION_MODE): Use riscv_promote_function_mode. > gcc/testsuite/ChangeLog > * gcc.target/riscv/promote-type-for-libcall.c: New. Thanks. This looks good, and fails with gcc mainline without the patch. Jim
Committed as r274107 Hi Jakub, Richard: This patch is fix ABI bug for libcall on RISC-V, we've also tested on gcc 8 and 9, it's ok for gcc 9 and 8? Thanks. On Fri, Aug 2, 2019 at 11:52 PM Jim Wilson <jimw@sifive.com> wrote: > > On Fri, Aug 2, 2019 at 12:11 AM Kito Cheng <kito.cheng@sifive.com> wrote: > > gcc/ChangeLog > > * config/riscv/riscv.c (riscv_promote_function_mode): New. > > (TARGET_PROMOTE_FUNCTION_MODE): Use riscv_promote_function_mode. > > gcc/testsuite/ChangeLog > > * gcc.target/riscv/promote-type-for-libcall.c: New. > > Thanks. This looks good, and fails with gcc mainline without the patch. > > Jim
On Mon, 5 Aug 2019, Kito Cheng wrote: > Committed as r274107 > > Hi Jakub, Richard: > > This patch is fix ABI bug for libcall on RISC-V, we've also tested on > gcc 8 and 9, it's ok for gcc 9 and 8? Works for me. Thanks, Richard. > Thanks. > > On Fri, Aug 2, 2019 at 11:52 PM Jim Wilson <jimw@sifive.com> wrote: > > > > On Fri, Aug 2, 2019 at 12:11 AM Kito Cheng <kito.cheng@sifive.com> wrote: > > > gcc/ChangeLog > > > * config/riscv/riscv.c (riscv_promote_function_mode): New. > > > (TARGET_PROMOTE_FUNCTION_MODE): Use riscv_promote_function_mode. > > > gcc/testsuite/ChangeLog > > > * gcc.target/riscv/promote-type-for-libcall.c: New. > > > > Thanks. This looks good, and fails with gcc mainline without the patch. > > > > Jim >
Committed to gcc-9 as r274108 and gcc-8 as r274113 On Mon, Aug 5, 2019 at 3:29 PM Richard Biener <rguenther@suse.de> wrote: > > On Mon, 5 Aug 2019, Kito Cheng wrote: > > > Committed as r274107 > > > > Hi Jakub, Richard: > > > > This patch is fix ABI bug for libcall on RISC-V, we've also tested on > > gcc 8 and 9, it's ok for gcc 9 and 8? > > Works for me. > > Thanks, > Richard. > > > Thanks. > > > > On Fri, Aug 2, 2019 at 11:52 PM Jim Wilson <jimw@sifive.com> wrote: > > > > > > On Fri, Aug 2, 2019 at 12:11 AM Kito Cheng <kito.cheng@sifive.com> wrote: > > > > gcc/ChangeLog > > > > * config/riscv/riscv.c (riscv_promote_function_mode): New. > > > > (TARGET_PROMOTE_FUNCTION_MODE): Use riscv_promote_function_mode. > > > > gcc/testsuite/ChangeLog > > > > * gcc.target/riscv/promote-type-for-libcall.c: New. > > > > > > Thanks. This looks good, and fails with gcc mainline without the patch. > > > > > > Jim > > > > -- > Richard Biener <rguenther@suse.de> > SUSE Linux GmbH, Maxfeldstrasse 5, 90409 Nuernberg, Germany; > GF: Felix Imendörffer, Mary Higgins, Sri Rasiah; HRB 21284 (AG Nürnberg)
diff --git a/gcc/config/riscv/riscv.c b/gcc/config/riscv/riscv.c index e274f1b..431e90a 100644 --- a/gcc/config/riscv/riscv.c +++ b/gcc/config/riscv/riscv.c @@ -4910,6 +4910,32 @@ riscv_constant_alignment (const_tree exp, HOST_WIDE_INT align) return align; } +/* Implement TARGET_PROMOTE_FUNCTION_MODE. */ + +/* This function is equivalent to default_promote_function_mode_always_promote + except that it returns a promoted mode even if type is NULL_TREE. This is + needed by libcalls which have no type (only a mode) such as fixed conversion + routines that take a signed or unsigned char/short/int argument and convert + it to a fixed type. */ + +static machine_mode +riscv_promote_function_mode (const_tree type ATTRIBUTE_UNUSED, + machine_mode mode, + int *punsignedp ATTRIBUTE_UNUSED, + const_tree fntype ATTRIBUTE_UNUSED, + int for_return ATTRIBUTE_UNUSED) +{ + int unsignedp; + + if (type != NULL_TREE) + return promote_mode (type, mode, punsignedp); + + unsignedp = *punsignedp; + PROMOTE_MODE (mode, unsignedp, type); + *punsignedp = unsignedp; + return mode; +} + /* Initialize the GCC target structure. */ #undef TARGET_ASM_ALIGNED_HI_OP #define TARGET_ASM_ALIGNED_HI_OP "\t.half\t" @@ -4951,7 +4977,7 @@ riscv_constant_alignment (const_tree exp, HOST_WIDE_INT align) #define TARGET_EXPAND_BUILTIN_VA_START riscv_va_start #undef TARGET_PROMOTE_FUNCTION_MODE -#define TARGET_PROMOTE_FUNCTION_MODE default_promote_function_mode_always_promote +#define TARGET_PROMOTE_FUNCTION_MODE riscv_promote_function_mode #undef TARGET_RETURN_IN_MEMORY #define TARGET_RETURN_IN_MEMORY riscv_return_in_memory diff --git a/gcc/testsuite/gcc.target/riscv/promote-type-for-libcall.c b/gcc/testsuite/gcc.target/riscv/promote-type-for-libcall.c new file mode 100644 index 0000000..bdbcbc0 --- /dev/null +++ b/gcc/testsuite/gcc.target/riscv/promote-type-for-libcall.c @@ -0,0 +1,37 @@ +/* { dg-do run } */ +/* { dg-options "-O1 -ftree-slp-vectorize -funroll-loops" } */ + +#include <stdio.h> +#include <stdlib.h> +#define N 4 +volatile float f[N]; +int x[N] __attribute__((aligned(8))); +int main() { + int i; + x[0] = -1; + x[1] = 2; + x[2] = -2; + x[3] = 2; + + for (i=0;i<N;++i){ + f[i] = x[i]; + } + + if (f[0] != -1.0f) { + abort(); + } + + if (f[1] != 2.0f) { + abort(); + } + + if (f[2] != -2.0f) { + abort(); + } + + if (f[3] != 2.0f) { + abort(); + } + + return 0; +}