Hi, what about that one?
Tested on x86_64, s390, and s390x. Bye, -Andreas- 2014-04-08 Andreas Krebbel <andreas.kreb...@de.ibm.com> * gcc.dg/builtin-bswap-6.c: Use -mbranch-cost=0 for s390. * gcc.dg/builtin-bswap-7.c: Likewise. Revert 2014-04-04 Andreas Krebbel <andreas.kreb...@de.ibm.com> * gcc.dg/builtin-bswap-6.c: Adjust return value to disable GCC optimization. * gcc.dg/builtin-bswap-7.c: Likewise. diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-6.c b/gcc/testsuite/gcc.dg/builtin-bswap-6.c index 6f0c782..efda870 100644 --- a/gcc/testsuite/gcc.dg/builtin-bswap-6.c +++ b/gcc/testsuite/gcc.dg/builtin-bswap-6.c @@ -1,11 +1,10 @@ /* { dg-do compile { target arm*-*-* alpha*-*-* i?86-*-* powerpc*-*-* rs6000-*-* x86_64-*-* s390*-*-* } } */ /* { dg-require-effective-target stdint_types } */ /* { dg-options "-O -fdump-rtl-combine" } */ -/* { dg-options "-O -fdump-rtl-combine -march=z900" { target s390-*-* } } */ -/* The test intentionally returns 1/2 instead of the obvious 0/1 to - prevent GCC from calculating the return value with arithmetic - instead of a comparison. */ +/* The branch cost setting prevents the return value from being + calculated with arithmetic instead of doing a compare. */ +/* { dg-additional-options "-march=z900 -mbranch-cost=0" { target s390*-*-* } } */ #include <stdint.h> @@ -15,28 +14,28 @@ int foo1 (uint32_t a) { if (BS (a) == 0xA0000) return 1; - return 2; + return 0; } int foo2 (uint32_t a) { if (BS (a) != 0xA0000) return 1; - return 2; + return 0; } int foo3 (uint32_t a, uint32_t b) { if (BS (a) == BS (b)) return 1; - return 2; + return 0; } int foo4 (uint32_t a, uint32_t b) { if (BS (a) != BS (b)) return 1; - return 2; + return 0; } /* { dg-final { scan-rtl-dump-not "bswapsi" "combine" } } */ diff --git a/gcc/testsuite/gcc.dg/builtin-bswap-7.c b/gcc/testsuite/gcc.dg/builtin-bswap-7.c index 0eecdd8..035c736 100644 --- a/gcc/testsuite/gcc.dg/builtin-bswap-7.c +++ b/gcc/testsuite/gcc.dg/builtin-bswap-7.c @@ -3,9 +3,9 @@ /* { dg-require-effective-target lp64 } */ /* { dg-options "-O -fdump-rtl-combine" } */ -/* The test intentionally returns 1/2 instead of the obvious 0/1 to - prevent GCC from calculating the return value with arithmetic - instead of a comparison. */ +/* The branch cost setting prevents the return value from being + calculated with arithmetic instead of doing a compare. */ +/* { dg-additional-options "-mbranch-cost=0" { target s390x-*-* } } */ #include <stdint.h> @@ -15,28 +15,28 @@ int foo1 (uint64_t a) { if (BS (a) == 0xA00000000) return 1; - return 2; + return 0; } int foo2 (uint64_t a) { if (BS (a) != 0xA00000000) return 1; - return 2; + return 0; } int foo3 (uint64_t a, uint64_t b) { if (BS (a) == BS (b)) return 1; - return 2; + return 0; } int foo4 (uint64_t a, uint64_t b) { if (BS (a) != BS (b)) return 1; - return 2; + return 0; } /* { dg-final { scan-rtl-dump-not "bswapdi" "combine" } } */