From a422e1ca494ee59303caf362fede7cc142ce678c Mon Sep 17 00:00:00 2001 From: Kyrylo Tkachov Date: Tue, 17 Apr 2018 16:34:56 +0000 Subject: [PATCH] [AArch64/arm] PR testsuite/85326 Avoid C++ tests when C++ compiler not present PR testsuite/85326 * gcc.target/arm/pr54300.C: Move to... * g++.dg/other/pr54300.C: ... Here. Add target directives. * gcc.target/arm/pr55073.C: Move to... * g++.dg/other/pr55073.C: ... Here. Add target directives. * gcc.target/arm/pr56184.C: Move to... * g++.dg/other/pr56184.C: ... Here. Add target directives. * gcc.target/arm/pr59985.C: Move to... * g++.dg/other/pr59985.C: ... Here. Add target directives. * gcc.target/aarch64/pr60675.C: Move to... * g++.dg/other/pr60675.C: ... Here. Add target directives. * gcc.target/aarch64/pr81422.C: Move to... * g++.dg/other/pr81422.C: ... Here. Add target directives. * gcc.target/aarch64/sve/const_pred_1.C: Move to... * g++.dg/other/sve_const_pred_1.C: ... Here. Add target directives. * gcc.target/aarch64/sve/const_pred_2.C: Move to... * g++.dg/other/sve_const_pred_2.C: ... Here. Add target directives. * gcc.target/aarch64/sve/const_pred_3.C: Move to... * g++.dg/other/sve_const_pred_3.C: ... Here. Add target directives. * gcc.target/aarch64/sve/const_pred_4.C: Move to... * g++.dg/other/sve_const_pred_4.C: ... Here. Add target directives. * gcc.target/aarch64/sve/tls_2.C: Move to... * g++.dg/other/sve_tls_2.C: ... Here. Add target directives. * gcc.target/aarch64/pr81414.C: Rename to... * gcc.target/aarch64/pr81414.c: ... This. * gcc.target/aarch64/simd/pr67896.C: Rename to... * gcc.target/aarch64/simd/pr67896.c: ... This. Update error expected messages. * gcc.target/aarch64/sve/vcond_1.C: Rename to... * gcc.target/aarch64/sve/vcond_1.c: ... This. Avoid use of stdint.h. * gcc.target/aarch64/sve/vcond_1_run.C: Rename to... * gcc.target/aarch64/sve/vcond_1_run.c: ... This. Update include file name. From-SVN: r259435 --- gcc/testsuite/ChangeLog | 36 +++++++++++++++++++ .../arm => g++.dg/other}/pr54300.C | 2 +- .../arm => g++.dg/other}/pr55073.C | 2 +- .../arm => g++.dg/other}/pr56184.C | 2 +- .../arm => g++.dg/other}/pr59985.C | 2 +- .../aarch64 => g++.dg/other}/pr60675.C | 2 +- .../aarch64 => g++.dg/other}/pr81422.C | 0 .../other/sve_const_pred_1.C} | 4 +-- .../other/sve_const_pred_2.C} | 4 +-- .../other/sve_const_pred_3.C} | 4 +-- .../other/sve_const_pred_4.C} | 4 +-- .../sve/tls_2.C => g++.dg/other/sve_tls_2.C} | 4 +-- .../aarch64/{pr81414.C => pr81414.c} | 0 .../gcc.target/aarch64/simd/pr67896.C | 7 ---- .../gcc.target/aarch64/simd/pr67896.c | 7 ++++ .../gcc.target/aarch64/sve/vcond_1.C | 20 +++++------ .../gcc.target/aarch64/sve/vcond_1_run.C | 2 +- 17 files changed, 68 insertions(+), 34 deletions(-) rename gcc/testsuite/{gcc.target/arm => g++.dg/other}/pr54300.C (97%) rename gcc/testsuite/{gcc.target/arm => g++.dg/other}/pr55073.C (98%) rename gcc/testsuite/{gcc.target/arm => g++.dg/other}/pr56184.C (99%) rename gcc/testsuite/{gcc.target/arm => g++.dg/other}/pr59985.C (97%) rename gcc/testsuite/{gcc.target/aarch64 => g++.dg/other}/pr60675.C (99%) rename gcc/testsuite/{gcc.target/aarch64 => g++.dg/other}/pr81422.C (100%) rename gcc/testsuite/{gcc.target/aarch64/sve/const_pred_1.C => g++.dg/other/sve_const_pred_1.C} (78%) rename gcc/testsuite/{gcc.target/aarch64/sve/const_pred_2.C => g++.dg/other/sve_const_pred_2.C} (75%) rename gcc/testsuite/{gcc.target/aarch64/sve/const_pred_3.C => g++.dg/other/sve_const_pred_3.C} (73%) rename gcc/testsuite/{gcc.target/aarch64/sve/const_pred_4.C => g++.dg/other/sve_const_pred_4.C} (72%) rename gcc/testsuite/{gcc.target/aarch64/sve/tls_2.C => g++.dg/other/sve_tls_2.C} (84%) rename gcc/testsuite/gcc.target/aarch64/{pr81414.C => pr81414.c} (100%) delete mode 100644 gcc/testsuite/gcc.target/aarch64/simd/pr67896.C create mode 100644 gcc/testsuite/gcc.target/aarch64/simd/pr67896.c diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 95bdc0349b4..af61628ca76 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,39 @@ +2018-04-17 Kyrylo Tkachov + + PR testsuite/85326 + * gcc.target/arm/pr54300.C: Move to... + * g++.dg/other/pr54300.C: ... Here. Add target directives. + * gcc.target/arm/pr55073.C: Move to... + * g++.dg/other/pr55073.C: ... Here. Add target directives. + * gcc.target/arm/pr56184.C: Move to... + * g++.dg/other/pr56184.C: ... Here. Add target directives. + * gcc.target/arm/pr59985.C: Move to... + * g++.dg/other/pr59985.C: ... Here. Add target directives. + * gcc.target/aarch64/pr60675.C: Move to... + * g++.dg/other/pr60675.C: ... Here. Add target directives. + * gcc.target/aarch64/pr81422.C: Move to... + * g++.dg/other/pr81422.C: ... Here. Add target directives. + * gcc.target/aarch64/sve/const_pred_1.C: Move to... + * g++.dg/other/sve_const_pred_1.C: ... Here. Add target directives. + * gcc.target/aarch64/sve/const_pred_2.C: Move to... + * g++.dg/other/sve_const_pred_2.C: ... Here. Add target directives. + * gcc.target/aarch64/sve/const_pred_3.C: Move to... + * g++.dg/other/sve_const_pred_3.C: ... Here. Add target directives. + * gcc.target/aarch64/sve/const_pred_4.C: Move to... + * g++.dg/other/sve_const_pred_4.C: ... Here. Add target directives. + * gcc.target/aarch64/sve/tls_2.C: Move to... + * g++.dg/other/sve_tls_2.C: ... Here. Add target directives. + * gcc.target/aarch64/pr81414.C: Rename to... + * gcc.target/aarch64/pr81414.c: ... This. + * gcc.target/aarch64/simd/pr67896.C: Rename to... + * gcc.target/aarch64/simd/pr67896.c: ... This. Update error expected + messages. + * gcc.target/aarch64/sve/vcond_1.C: Rename to... + * gcc.target/aarch64/sve/vcond_1.c: ... This. Avoid use of stdint.h. + * gcc.target/aarch64/sve/vcond_1_run.C: Rename to... + * gcc.target/aarch64/sve/vcond_1_run.c: ... This. Update include + file name. + 2018-04-17 Jakub Jelinek PR middle-end/85414 diff --git a/gcc/testsuite/gcc.target/arm/pr54300.C b/gcc/testsuite/g++.dg/other/pr54300.C similarity index 97% rename from gcc/testsuite/gcc.target/arm/pr54300.C rename to gcc/testsuite/g++.dg/other/pr54300.C index 9105e279b33..e16646a3041 100644 --- a/gcc/testsuite/gcc.target/arm/pr54300.C +++ b/gcc/testsuite/g++.dg/other/pr54300.C @@ -1,4 +1,4 @@ -/* { dg-do run } */ +/* { dg-do run { target arm*-*-* } } */ /* { dg-require-effective-target arm_neon } */ /* { dg-options "-O2" } */ /* { dg-add-options arm_neon } */ diff --git a/gcc/testsuite/gcc.target/arm/pr55073.C b/gcc/testsuite/g++.dg/other/pr55073.C similarity index 98% rename from gcc/testsuite/gcc.target/arm/pr55073.C rename to gcc/testsuite/g++.dg/other/pr55073.C index 5575cf77911..859c5d46a09 100644 --- a/gcc/testsuite/gcc.target/arm/pr55073.C +++ b/gcc/testsuite/g++.dg/other/pr55073.C @@ -1,4 +1,4 @@ -/* { dg-do run } */ +/* { dg-do run { target arm*-*-* } } */ /* { dg-require-effective-target arm_neon } */ /* { dg-options "-O2" } */ /* { dg-add-options arm_neon } */ diff --git a/gcc/testsuite/gcc.target/arm/pr56184.C b/gcc/testsuite/g++.dg/other/pr56184.C similarity index 99% rename from gcc/testsuite/gcc.target/arm/pr56184.C rename to gcc/testsuite/g++.dg/other/pr56184.C index 82442225603..dc949283c98 100644 --- a/gcc/testsuite/gcc.target/arm/pr56184.C +++ b/gcc/testsuite/g++.dg/other/pr56184.C @@ -1,4 +1,4 @@ -/* { dg-do compile } */ +/* { dg-do compile { target arm*-*-* } } */ /* { dg-skip-if "incompatible options" { ! { arm_thumb1_ok || arm_thumb2_ok } } } */ /* { dg-options "-fno-short-enums -O2 -mthumb -march=armv7-a -mfpu=neon -mfloat-abi=softfp -mtune=cortex-a9 -fno-section-anchors -Wno-return-type" } */ diff --git a/gcc/testsuite/gcc.target/arm/pr59985.C b/gcc/testsuite/g++.dg/other/pr59985.C similarity index 97% rename from gcc/testsuite/gcc.target/arm/pr59985.C rename to gcc/testsuite/g++.dg/other/pr59985.C index ecf72b190b4..7c9bfab35f1 100644 --- a/gcc/testsuite/gcc.target/arm/pr59985.C +++ b/gcc/testsuite/g++.dg/other/pr59985.C @@ -1,4 +1,4 @@ -/* { dg-do compile } */ +/* { dg-do compile { target arm*-*-* } } */ /* { dg-skip-if "incompatible options" { arm_thumb1 } } */ /* { dg-options "-g -fcompare-debug -O2 -march=armv7-a -mtune=cortex-a9 -mfpu=vfpv3-d16 -mfloat-abi=hard" } */ /* { dg-skip-if "need hardfp abi" { *-*-* } { "-mfloat-abi=soft" } { "" } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/pr60675.C b/gcc/testsuite/g++.dg/other/pr60675.C similarity index 99% rename from gcc/testsuite/gcc.target/aarch64/pr60675.C rename to gcc/testsuite/g++.dg/other/pr60675.C index aa88cdb2403..11001559147 100644 --- a/gcc/testsuite/gcc.target/aarch64/pr60675.C +++ b/gcc/testsuite/g++.dg/other/pr60675.C @@ -1,4 +1,4 @@ -/* { dg-do compile } */ +/* { dg-do compile { target fpic } } */ /* { dg-options "-std=c++11 -w -O2 -fPIC" } */ namespace CLHEP { static const double meter = 1000.*10; diff --git a/gcc/testsuite/gcc.target/aarch64/pr81422.C b/gcc/testsuite/g++.dg/other/pr81422.C similarity index 100% rename from gcc/testsuite/gcc.target/aarch64/pr81422.C rename to gcc/testsuite/g++.dg/other/pr81422.C diff --git a/gcc/testsuite/gcc.target/aarch64/sve/const_pred_1.C b/gcc/testsuite/g++.dg/other/sve_const_pred_1.C similarity index 78% rename from gcc/testsuite/gcc.target/aarch64/sve/const_pred_1.C rename to gcc/testsuite/g++.dg/other/sve_const_pred_1.C index 25b7663273f..cc124c06ee5 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/const_pred_1.C +++ b/gcc/testsuite/g++.dg/other/sve_const_pred_1.C @@ -1,5 +1,5 @@ -/* { dg-do compile } */ -/* { dg-options "-O2 -msve-vector-bits=256" } */ +/* { dg-do compile { target aarch64*-*-* } } */ +/* { dg-options "-O2 -march=armv8.2-a+sve -msve-vector-bits=256" } */ #include diff --git a/gcc/testsuite/gcc.target/aarch64/sve/const_pred_2.C b/gcc/testsuite/g++.dg/other/sve_const_pred_2.C similarity index 75% rename from gcc/testsuite/gcc.target/aarch64/sve/const_pred_2.C rename to gcc/testsuite/g++.dg/other/sve_const_pred_2.C index 4c781ca560c..e3bce397cbf 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/const_pred_2.C +++ b/gcc/testsuite/g++.dg/other/sve_const_pred_2.C @@ -1,5 +1,5 @@ -/* { dg-do compile } */ -/* { dg-options "-O2 -msve-vector-bits=256" } */ +/* { dg-do compile { target aarch64*-*-* } } */ +/* { dg-options "-O2 -march=armv8.2-a+sve -msve-vector-bits=256" } */ #include diff --git a/gcc/testsuite/gcc.target/aarch64/sve/const_pred_3.C b/gcc/testsuite/g++.dg/other/sve_const_pred_3.C similarity index 73% rename from gcc/testsuite/gcc.target/aarch64/sve/const_pred_3.C rename to gcc/testsuite/g++.dg/other/sve_const_pred_3.C index 6196ee05be7..9e75f399e4b 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/const_pred_3.C +++ b/gcc/testsuite/g++.dg/other/sve_const_pred_3.C @@ -1,5 +1,5 @@ -/* { dg-do compile } */ -/* { dg-options "-O2 -msve-vector-bits=256" } */ +/* { dg-do compile { target aarch64*-*-* } } */ +/* { dg-options "-O2 -march=armv8.2-a+sve -msve-vector-bits=256" } */ #include diff --git a/gcc/testsuite/gcc.target/aarch64/sve/const_pred_4.C b/gcc/testsuite/g++.dg/other/sve_const_pred_4.C similarity index 72% rename from gcc/testsuite/gcc.target/aarch64/sve/const_pred_4.C rename to gcc/testsuite/g++.dg/other/sve_const_pred_4.C index 2bdf67fd038..04a13513380 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/const_pred_4.C +++ b/gcc/testsuite/g++.dg/other/sve_const_pred_4.C @@ -1,5 +1,5 @@ -/* { dg-do compile } */ -/* { dg-options "-O2 -msve-vector-bits=256" } */ +/* { dg-do compile { target aarch64*-*-* } } */ +/* { dg-options "-O2 -march=armv8.2-a+sve -msve-vector-bits=256" } */ #include diff --git a/gcc/testsuite/gcc.target/aarch64/sve/tls_2.C b/gcc/testsuite/g++.dg/other/sve_tls_2.C similarity index 84% rename from gcc/testsuite/gcc.target/aarch64/sve/tls_2.C rename to gcc/testsuite/g++.dg/other/sve_tls_2.C index c18a737ae04..d159255fc94 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/tls_2.C +++ b/gcc/testsuite/g++.dg/other/sve_tls_2.C @@ -1,5 +1,5 @@ -/* { dg-do compile } */ -/* { dg-options "-O2 -fPIC -msve-vector-bits=256" } */ +/* { dg-do compile { target aarch64*-*-* } } */ +/* { dg-options "-O2 -march=armv8.2-a+sve -fPIC -msve-vector-bits=256" } */ #include diff --git a/gcc/testsuite/gcc.target/aarch64/pr81414.C b/gcc/testsuite/gcc.target/aarch64/pr81414.c similarity index 100% rename from gcc/testsuite/gcc.target/aarch64/pr81414.C rename to gcc/testsuite/gcc.target/aarch64/pr81414.c diff --git a/gcc/testsuite/gcc.target/aarch64/simd/pr67896.C b/gcc/testsuite/gcc.target/aarch64/simd/pr67896.C deleted file mode 100644 index 1f916e09f4f..00000000000 --- a/gcc/testsuite/gcc.target/aarch64/simd/pr67896.C +++ /dev/null @@ -1,7 +0,0 @@ -typedef __Poly8_t A; -typedef __Poly16_t A; /* { dg-error "conflicting declaration" } */ -typedef __Poly64_t A; /* { dg-error "conflicting declaration" } */ -typedef __Poly128_t A; /* { dg-error "conflicting declaration" } */ - -typedef __Poly8x8_t B; -typedef __Poly16x8_t B; /* { dg-error "conflicting declaration" } */ diff --git a/gcc/testsuite/gcc.target/aarch64/simd/pr67896.c b/gcc/testsuite/gcc.target/aarch64/simd/pr67896.c new file mode 100644 index 00000000000..3e27bea0e95 --- /dev/null +++ b/gcc/testsuite/gcc.target/aarch64/simd/pr67896.c @@ -0,0 +1,7 @@ +typedef __Poly8_t A; +typedef __Poly16_t A; /* { dg-error "conflicting types" } */ +typedef __Poly64_t A; /* { dg-error "conflicting types" } */ +typedef __Poly128_t A; /* { dg-error "conflicting types" } */ + +typedef __Poly8x8_t B; +typedef __Poly16x8_t B; /* { dg-error "conflicting types" } */ diff --git a/gcc/testsuite/gcc.target/aarch64/sve/vcond_1.C b/gcc/testsuite/gcc.target/aarch64/sve/vcond_1.C index 6fd6b420eef..66208425e2e 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/vcond_1.C +++ b/gcc/testsuite/gcc.target/aarch64/sve/vcond_1.C @@ -1,17 +1,15 @@ /* { dg-do assemble { target aarch64_asm_sve_ok } } */ /* { dg-options "-O -msve-vector-bits=256 --save-temps" } */ -#include - -typedef int8_t vnx16qi __attribute__((vector_size(32))); -typedef int16_t vnx8hi __attribute__((vector_size(32))); -typedef int32_t vnx4si __attribute__((vector_size(32))); -typedef int64_t vnx2di __attribute__((vector_size(32))); - -typedef uint8_t v32qu __attribute__((vector_size(32))); -typedef uint16_t v16hu __attribute__((vector_size(32))); -typedef uint32_t v8su __attribute__((vector_size(32))); -typedef uint64_t v4du __attribute__((vector_size(32))); +typedef __INT8_TYPE__ vnx16qi __attribute__((vector_size(32))); +typedef __INT16_TYPE__ vnx8hi __attribute__((vector_size(32))); +typedef __INT32_TYPE__ vnx4si __attribute__((vector_size(32))); +typedef __INT64_TYPE__ vnx2di __attribute__((vector_size(32))); + +typedef __UINT8_TYPE__ v32qu __attribute__((vector_size(32))); +typedef __UINT16_TYPE__ v16hu __attribute__((vector_size(32))); +typedef __UINT32_TYPE__ v8su __attribute__((vector_size(32))); +typedef __UINT64_TYPE__ v4du __attribute__((vector_size(32))); #define DEF_VCOND_VAR(TYPE, COND, SUFFIX) \ TYPE vcond_##TYPE##_##SUFFIX (TYPE x, TYPE y, TYPE a, TYPE b) \ diff --git a/gcc/testsuite/gcc.target/aarch64/sve/vcond_1_run.C b/gcc/testsuite/gcc.target/aarch64/sve/vcond_1_run.C index 2df33710d8f..72dab3942a9 100644 --- a/gcc/testsuite/gcc.target/aarch64/sve/vcond_1_run.C +++ b/gcc/testsuite/gcc.target/aarch64/sve/vcond_1_run.C @@ -2,7 +2,7 @@ /* { dg-options "-O" } */ /* { dg-options "-O -msve-vector-bits=256" { target aarch64_sve256_hw } } */ -#include "vcond_1.C" +#include "vcond_1.c" #define NUM_ELEMS(X) (sizeof (X) / sizeof (X[0])) -- 2.30.2