On Tue, Nov 7, 2023 at 2:19 AM Kito Cheng <kito.ch...@sifive.com> wrote: > > LGTM, and maybe change stdint.h to stdint-gcc.h in > xtheadmemidx-helpers.h? that could make it more portable on multi-lib > testing.
Can be found here: https://gcc.gnu.org/pipermail/gcc-patches/2023-November/635508.html Thanks! > > On Tue, Nov 7, 2023 at 3:44 AM Christoph Muellner > <christoph.muell...@vrull.eu> wrote: > > > > From: Christoph Müllner <christoph.muell...@vrull.eu> > > > > The XTheadFMemIdx tests set the required ABI for RV32, but not > > for RV64, which has the effect that the tests are expected to > > succeed for RV64/LP64. Let's set the ABI to LP64D in these > > tests to clarify the requirements. > > > > Signed-off-by: Christoph Müllner <christoph.muell...@vrull.eu> > > > > gcc/testsuite/ChangeLog: > > > > * gcc.target/riscv/xtheadfmemidx-index-update.c: Add ABI. > > * gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c: Likewise. > > * gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c: Likewise. > > * gcc.target/riscv/xtheadfmemidx-index.c: Likewise. > > * gcc.target/riscv/xtheadfmemidx-uindex-update.c: Likewise. > > * gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c: Likewise. > > * gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c: Likewise. > > * gcc.target/riscv/xtheadfmemidx-uindex.c: Likewise. > > --- > > gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-update.c | 2 +- > > .../gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c | 2 +- > > gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c | 2 +- > > gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index.c | 2 +- > > gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-update.c | 2 +- > > .../gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c | 2 +- > > gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c | 2 +- > > gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex.c | 2 +- > > 8 files changed, 8 insertions(+), 8 deletions(-) > > > > diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-update.c > > b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-update.c > > index 24bbb63d174..cb86b8ad296 100644 > > --- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-update.c > > +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-update.c > > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > > /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ > > -/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx" { target { rv64 > > } } } */ > > +/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx -mabi=lp64d" { > > target { rv64 } } } */ > > /* { dg-options "-march=rv32imafc_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" > > { target { rv32 } } } */ > > > > #include "xtheadmemidx-helpers.h" > > diff --git > > a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c > > b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c > > index 3b931a4b980..cc3f6219c05 100644 > > --- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c > > +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb-update.c > > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > > /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ > > -/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx" { > > target { rv64 } } } */ > > +/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx > > -mabi=lp64d" { target { rv64 } } } */ > > /* { dg-options "-march=rv32imafc_xtheadbb_xtheadmemidx_xtheadfmemidx > > -mabi=ilp32f" { target { rv32 } } } */ > > > > #include "xtheadmemidx-helpers.h" > > diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c > > b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c > > index 48858605c24..8ee98c87469 100644 > > --- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c > > +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index-xtheadbb.c > > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > > /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ > > -/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx" { > > target { rv64 } } } */ > > +/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx > > -mabi=lp64d" { target { rv64 } } } */ > > /* { dg-options "-march=rv32imafc_xtheadbb_xtheadmemidx_xtheadfmemidx > > -mabi=ilp32f" { target { rv32 } } } */ > > > > #include "xtheadmemidx-helpers.h" > > diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index.c > > b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index.c > > index 1bb231a9e88..35704063598 100644 > > --- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index.c > > +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-index.c > > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > > /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ > > -/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx" { target { rv64 > > } } } */ > > +/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx -mabi=lp64d" { > > target { rv64 } } } */ > > /* { dg-options "-march=rv32imafc_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" > > { target { rv32 } } } */ > > > > #include "xtheadmemidx-helpers.h" > > diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-update.c > > b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-update.c > > index bc50fa799e0..37ffe6afd53 100644 > > --- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-update.c > > +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-update.c > > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > > /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ > > -/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx" { target { rv64 > > } } } */ > > +/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx -mabi=lp64d" { > > target { rv64 } } } */ > > /* { dg-options "-march=rv32imafc_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" > > { target { rv32 } } } */ > > > > #include "xtheadmemidx-helpers.h" > > diff --git > > a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c > > b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c > > index 242be7af4a4..95bf3e616b8 100644 > > --- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c > > +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb-update.c > > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > > /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ > > -/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx" { > > target { rv64 } } } */ > > +/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx > > -mabi=lp64d" { target { rv64 } } } */ > > /* { dg-options "-march=rv32imafc_xtheadbb_xtheadmemidx_xtheadfmemidx > > -mabi=ilp32f" { target { rv32 } } } */ > > > > #include "xtheadmemidx-helpers.h" > > diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c > > b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c > > index e2a4f36796f..5b57bb0a738 100644 > > --- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c > > +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex-xtheadbb.c > > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > > /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ > > -/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx" { > > target { rv64 } } } */ > > +/* { dg-options "-march=rv64gc_xtheadbb_xtheadmemidx_xtheadfmemidx > > -mabi=lp64d" { target { rv64 } } } */ > > /* { dg-options "-march=rv32imafc_xtheadbb_xtheadmemidx_xtheadfmemidx > > -mabi=ilp32f" { target { rv32 } } } */ > > > > #include "xtheadmemidx-helpers.h" > > diff --git a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex.c > > b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex.c > > index 32783ebed03..268a31ba21d 100644 > > --- a/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex.c > > +++ b/gcc/testsuite/gcc.target/riscv/xtheadfmemidx-uindex.c > > @@ -1,6 +1,6 @@ > > /* { dg-do compile } */ > > /* { dg-skip-if "" { *-*-* } { "-O0" "-O1" "-Og" } } */ > > -/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx" { target { rv64 > > } } } */ > > +/* { dg-options "-march=rv64gc_xtheadmemidx_xtheadfmemidx -mabi=lp64d" { > > target { rv64 } } } */ > > /* { dg-options "-march=rv32imafc_xtheadmemidx_xtheadfmemidx -mabi=ilp32f" > > { target { rv32 } } } */ > > > > #include "xtheadmemidx-helpers.h" > > -- > > 2.41.0 > >
