| Message ID | 28cf665e-68a0-0494-af80-af20b4b96a1e@arm.com |
|---|---|
| State | New |
| Headers | show |
| Series | [ARM] Fix test fail with conflicting -mfloat-abi | expand |
Le 12 janv. 2018 15:26, "Sudakshina Das" <sudi.das@arm.com> a écrit :
Hi
This patch fixes my earlier test case that fails for arm-none-eabi
with explicit user option for -mfloat-abi which conflict with
the test case options. I have added a guard to skip the test
on those cases.
@Christophe:
Sorry about this. I think this should fix the test case.
Can you please confirm if this works for you?
Yes it does thanks
Thanks
Sudi
gcc/testsuite/ChangeLog
2018-01-12 Sudakshina Das <sudi.das@arm.com>
* gcc.c-torture/compile/pr82096.c: Add dg-skip-if
directive.
Hi Christophe On 12/01/18 18:32, Christophe Lyon wrote: > Le 12 janv. 2018 15:26, "Sudakshina Das" <sudi.das@arm.com> a écrit : > > Hi > > This patch fixes my earlier test case that fails for arm-none-eabi > with explicit user option for -mfloat-abi which conflict with > the test case options. I have added a guard to skip the test > on those cases. > > @Christophe: > Sorry about this. I think this should fix the test case. > Can you please confirm if this works for you? > > > Yes it does thanks Thanks for checking that. I have added one more directive for armv5t as well to avoid any conflicts for mcpu options. Sudi > > > Thanks > Sudi > > gcc/testsuite/ChangeLog > > 2018-01-12 Sudakshina Das <sudi.das@arm.com> > > * gcc.c-torture/compile/pr82096.c: Add dg-skip-if > directive. > diff --git a/gcc/testsuite/gcc.c-torture/compile/pr82096.c b/gcc/testsuite/gcc.c-torture/compile/pr82096.c index 9fed28c..35551f5 100644 --- a/gcc/testsuite/gcc.c-torture/compile/pr82096.c +++ b/gcc/testsuite/gcc.c-torture/compile/pr82096.c @@ -1,3 +1,5 @@ +/* { dg-require-effective-target arm_arch_v5t_ok } */ +/* { dg-skip-if "Do not combine float-abi values" { arm*-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */ /* { dg-additional-options "-march=armv5t -mthumb -mfloat-abi=soft" { target arm*-*-* } } */ static long long AL[24];
On 16/01/18 10:31, Sudakshina Das wrote: > Hi Christophe > > On 12/01/18 18:32, Christophe Lyon wrote: >> Le 12 janv. 2018 15:26, "Sudakshina Das" <sudi.das@arm.com> a écrit : >> >> Hi >> >> This patch fixes my earlier test case that fails for arm-none-eabi >> with explicit user option for -mfloat-abi which conflict with >> the test case options. I have added a guard to skip the test >> on those cases. >> >> @Christophe: >> Sorry about this. I think this should fix the test case. >> Can you please confirm if this works for you? >> >> >> Yes it does thanks > > Thanks for checking that. I have added one more directive for armv5t as well to avoid any conflicts for mcpu options. > I agree with what Sudi said in https://gcc.gnu.org/ml/gcc-patches/2018-01/msg01422.html I'd rather keep the test in the generic torture suite as long as we get the directives right. So this is ok for trunk (as the changes are arm-specific directives) with one change below: Thanks, Kyrill > Sudi > >> >> >> Thanks >> Sudi >> >> gcc/testsuite/ChangeLog >> >> 2018-01-12 Sudakshina Das <sudi.das@arm.com> >> >> * gcc.c-torture/compile/pr82096.c: Add dg-skip-if >> directive. >> > diff --git a/gcc/testsuite/gcc.c-torture/compile/pr82096.c b/gcc/testsuite/gcc.c-torture/compile/pr82096.c index 9fed28c..35551f5 100644 --- a/gcc/testsuite/gcc.c-torture/compile/pr82096.c +++ b/gcc/testsuite/gcc.c-torture/compile/pr82096.c @@ -1,3 +1,5 @@ +/* { dg-require-effective-target arm_arch_v5t_ok } */ Please also guard this on { target arm*-*-* } That way this test will be run on other targets as well so that they can benefit from it. +/* { dg-skip-if "Do not combine float-abi values" { arm*-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */ /* { dg-additional-options "-march=armv5t -mthumb -mfloat-abi=soft" { target arm*-*-* } } */
Hi Kyrill On 19/01/18 18:00, Kyrill Tkachov wrote: > > On 16/01/18 10:31, Sudakshina Das wrote: >> Hi Christophe >> >> On 12/01/18 18:32, Christophe Lyon wrote: >>> Le 12 janv. 2018 15:26, "Sudakshina Das" <sudi.das@arm.com> a écrit : >>> >>> Hi >>> >>> This patch fixes my earlier test case that fails for arm-none-eabi >>> with explicit user option for -mfloat-abi which conflict with >>> the test case options. I have added a guard to skip the test >>> on those cases. >>> >>> @Christophe: >>> Sorry about this. I think this should fix the test case. >>> Can you please confirm if this works for you? >>> >>> >>> Yes it does thanks >> >> Thanks for checking that. I have added one more directive for armv5t >> as well to avoid any conflicts for mcpu options. >> > > I agree with what Sudi said in > https://gcc.gnu.org/ml/gcc-patches/2018-01/msg01422.html > I'd rather keep the test in the generic torture suite as long as we get > the directives right. > > So this is ok for trunk (as the changes are arm-specific directives) > with one change below: > > Thanks, > Kyrill > >> Sudi >> >>> >>> >>> Thanks >>> Sudi >>> >>> gcc/testsuite/ChangeLog >>> >>> 2018-01-12 Sudakshina Das <sudi.das@arm.com> >>> >>> * gcc.c-torture/compile/pr82096.c: Add dg-skip-if >>> directive. >>> >> > > > diff --git a/gcc/testsuite/gcc.c-torture/compile/pr82096.c > b/gcc/testsuite/gcc.c-torture/compile/pr82096.c > index 9fed28c..35551f5 100644 > --- a/gcc/testsuite/gcc.c-torture/compile/pr82096.c > +++ b/gcc/testsuite/gcc.c-torture/compile/pr82096.c > @@ -1,3 +1,5 @@ > +/* { dg-require-effective-target arm_arch_v5t_ok } */ > > Please also guard this on { target arm*-*-* } > That way this test will be run on other targets as well so that they can > benefit from it. > > +/* { dg-skip-if "Do not combine float-abi values" { arm*-*-* } { > "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */ > /* { dg-additional-options "-march=armv5t -mthumb -mfloat-abi=soft" { > target arm*-*-* } } */ > Thanks committed with the change as r256941 Sudi >
diff --git a/gcc/testsuite/gcc.c-torture/compile/pr82096.c b/gcc/testsuite/gcc.c-torture/compile/pr82096.c index 9fed28c..759d390 100644 --- a/gcc/testsuite/gcc.c-torture/compile/pr82096.c +++ b/gcc/testsuite/gcc.c-torture/compile/pr82096.c @@ -1,3 +1,4 @@ +/* { dg-skip-if "Do not combine float-abi values" { arm*-*-* } { "-mfloat-abi=*" } { "-mfloat-abi=soft" } } */ /* { dg-additional-options "-march=armv5t -mthumb -mfloat-abi=soft" { target arm*-*-* } } */ static long long AL[24];