From: Rainer Orth Date: Thu, 28 Apr 2016 15:16:57 +0000 (+0000) Subject: Cilk Plus testsuite needs massive cleanup (PR testsuite/70595) X-Git-Tag: basepoints/gcc-8~7341 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=713dedcd5dcaa3e7b1da940ffdde80dadeb2192f;p=thirdparty%2Fgcc.git Cilk Plus testsuite needs massive cleanup (PR testsuite/70595) gcc: PR testsuite/70595 * doc/sourcebuild.texi (Effective-Target Keywords, Other attributes): Document cilkplus_runtime. gcc/testsuite: PR testsuite/70595 * lib/target-supports.exp (check_libcilkrts_available): Rename to ... (check_effective_target_cilkplus_runtime): ... this. * g++.dg/cilk-plus/cilk-plus.exp: Adapt to it. * gcc.dg/cilk-plus/cilk-plus.exp: Likewise. * c-c++-common/cilk-plus/CK/cilk-for-2.c: Remove dg-do target selector. Require cilkplus_runtime. Don't add -lcilkrts. * c-c++-common/cilk-plus/CK/cilk-fors.c: Likewise. * c-c++-common/cilk-plus/CK/cilk_for_grain.c: Likewise. * c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c: Likewise. * c-c++-common/cilk-plus/CK/fib.c: Likewise. * c-c++-common/cilk-plus/CK/fib_init_expr_xy.c: Likewise. * c-c++-common/cilk-plus/CK/fib_no_return.c: Likewise. * c-c++-common/cilk-plus/CK/fib_no_sync.c: Likewise. * c-c++-common/cilk-plus/CK/nested_cilk_for.c: Likewise. * c-c++-common/cilk-plus/CK/pr60586.c: Likewise. * c-c++-common/cilk-plus/CK/pr69826-1.c: Likewise. * c-c++-common/cilk-plus/CK/pr69826-2.c: Likewise. * c-c++-common/cilk-plus/CK/spawnee_inline.c: Likewise. * c-c++-common/cilk-plus/CK/spawner_inline.c: Likewise. * c-c++-common/cilk-plus/CK/spawning_arg.c: Likewise. * c-c++-common/cilk-plus/CK/steal_check.c: Likewise. * c-c++-common/cilk-plus/CK/varargs_test.c: Likewise. * g++.dg/cilk-plus/CK/catch_exc.cc: Likewise. * g++.dg/cilk-plus/CK/cilk-for-tplt.cc: Likewise. * g++.dg/cilk-plus/CK/const_spawn.cc: Likewise. * g++.dg/cilk-plus/CK/fib-opr-overload.cc: Likewise. * g++.dg/cilk-plus/CK/fib-tplt.cc: Likewise. * g++.dg/cilk-plus/CK/for1.cc: Likewise. * g++.dg/cilk-plus/CK/lambda_spawns.cc: Likewise. * g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc: Likewise. * g++.dg/cilk-plus/CK/pr60586.cc: Likewise. * g++.dg/cilk-plus/CK/pr66326.cc: Likewise. * g++.dg/cilk-plus/CK/stl_iter.cc: Likewise. * g++.dg/cilk-plus/CK/stl_rev_iter.cc: Likewise. * g++.dg/cilk-plus/CK/stl_test.cc: Likewise. * c-c++-common/cilk-plus/CK/pr63307.c: Remove dg-do target selector. * c-c++-common/cilk-plus/SE/ef_error3.c: Likewise. * c-c++-common/cilk-plus/SE/ef_error2.c: Explain target selector. * c-c++-common/cilk-plus/CK/test__cilk.c: Run if cilkplus_runtime. From-SVN: r235574 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1b657f183ca2..c129db948251 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2016-04-28 Rainer Orth + + PR testsuite/70595 + * doc/sourcebuild.texi (Effective-Target Keywords, Other + attributes): Document cilkplus_runtime. + 2016-04-28 Martin Jambor * tree-cfg.c (verify_expr): Verify that local declarations belong to diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index c5354cfc8f36..9a349a3f03aa 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -1878,6 +1878,9 @@ Target supports wide characters. @item automatic_stack_alignment Target supports automatic stack alignment. +@item cilkplus_runtime +Target supports the Cilk Plus runtime library. + @item cxa_atexit Target uses @code{__cxa_atexit}. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ec1f3a2cc45d..ff7051bd97f8 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,52 @@ +2016-04-28 Rainer Orth + + PR testsuite/70595 + * lib/target-supports.exp (check_libcilkrts_available): Rename to ... + (check_effective_target_cilkplus_runtime): ... this. + * g++.dg/cilk-plus/cilk-plus.exp: Adapt to it. + * gcc.dg/cilk-plus/cilk-plus.exp: Likewise. + + * c-c++-common/cilk-plus/CK/cilk-for-2.c: Remove dg-do target selector. + Require cilkplus_runtime. + Don't add -lcilkrts. + * c-c++-common/cilk-plus/CK/cilk-fors.c: Likewise. + * c-c++-common/cilk-plus/CK/cilk_for_grain.c: Likewise. + * c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c: Likewise. + * c-c++-common/cilk-plus/CK/fib.c: Likewise. + * c-c++-common/cilk-plus/CK/fib_init_expr_xy.c: Likewise. + * c-c++-common/cilk-plus/CK/fib_no_return.c: Likewise. + * c-c++-common/cilk-plus/CK/fib_no_sync.c: Likewise. + * c-c++-common/cilk-plus/CK/nested_cilk_for.c: Likewise. + * c-c++-common/cilk-plus/CK/pr60586.c: Likewise. + * c-c++-common/cilk-plus/CK/pr69826-1.c: Likewise. + * c-c++-common/cilk-plus/CK/pr69826-2.c: Likewise. + * c-c++-common/cilk-plus/CK/spawnee_inline.c: Likewise. + * c-c++-common/cilk-plus/CK/spawner_inline.c: Likewise. + * c-c++-common/cilk-plus/CK/spawning_arg.c: Likewise. + * c-c++-common/cilk-plus/CK/steal_check.c: Likewise. + * c-c++-common/cilk-plus/CK/varargs_test.c: Likewise. + * g++.dg/cilk-plus/CK/catch_exc.cc: Likewise. + * g++.dg/cilk-plus/CK/cilk-for-tplt.cc: Likewise. + * g++.dg/cilk-plus/CK/const_spawn.cc: Likewise. + * g++.dg/cilk-plus/CK/fib-opr-overload.cc: Likewise. + * g++.dg/cilk-plus/CK/fib-tplt.cc: Likewise. + * g++.dg/cilk-plus/CK/for1.cc: Likewise. + * g++.dg/cilk-plus/CK/lambda_spawns.cc: Likewise. + * g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc: Likewise. + * g++.dg/cilk-plus/CK/pr60586.cc: Likewise. + * g++.dg/cilk-plus/CK/pr66326.cc: Likewise. + * g++.dg/cilk-plus/CK/stl_iter.cc: Likewise. + * g++.dg/cilk-plus/CK/stl_rev_iter.cc: Likewise. + * g++.dg/cilk-plus/CK/stl_test.cc: Likewise. + + * c-c++-common/cilk-plus/CK/pr63307.c: Remove dg-do target selector. + * c-c++-common/cilk-plus/SE/ef_error3.c: Likewise. + + * c-c++-common/cilk-plus/SE/ef_error2.c: Explain target selector. + + * c-c++-common/cilk-plus/CK/test__cilk.c: Run if + cilkplus_runtime. + 2016-04-27 Marc Glisse * gcc.dg/tree-ssa/overflow-2.c: New testcase. diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-for-2.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-for-2.c index fd30667f8dcc..32e4b9a57697 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-for-2.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-for-2.c @@ -1,7 +1,7 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ /* { dg-additional-options "-std=gnu99" { target c } } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ int msk; diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-fors.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-fors.c index 0a8f046b6376..6b2bbf779ae8 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-fors.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk-fors.c @@ -1,7 +1,7 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ /* { dg-additional-options "-std=gnu99" { target c } } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #if HAVE_IO #include diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_grain.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_grain.c index ec02613ee912..5a95a06274f8 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_grain.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_grain.c @@ -1,7 +1,7 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ /* { dg-additional-options "-std=gnu99" { target c } } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ int grain_value = 2; diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c index f4a1f4c1324e..1f8e84ee3d59 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/cilk_for_ptr_iter.c @@ -1,7 +1,7 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ /* { dg-additional-options "-std=gnu99" { target c } } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib.c index a8849fb9e6c9..40e1cb48c256 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib.c @@ -1,6 +1,6 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* } } */ -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #if HAVE_IO #include diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_init_expr_xy.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_init_expr_xy.c index 0196a8daba8e..41fd0dbe1d6f 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_init_expr_xy.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_init_expr_xy.c @@ -1,6 +1,6 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* } } */ -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #if HAVE_IO #include diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_return.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_return.c index 47ebef52030c..ccdbcfdce66b 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_return.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_return.c @@ -1,6 +1,6 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* } } */ -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #if HAVE_IO #include diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_sync.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_sync.c index a23051d48199..2c2a94b27a53 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_sync.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/fib_no_sync.c @@ -1,6 +1,6 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* } } */ -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #if HAVE_IO #include diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/nested_cilk_for.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/nested_cilk_for.c index 3daaca9ae87d..8f080a112522 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/nested_cilk_for.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/nested_cilk_for.c @@ -1,7 +1,7 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ /* { dg-additional-options "-std=gnu99" { target c } } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #if HAVE_IO #include diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60586.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60586.c index c4012a0a4b11..e2dc7b0c9d57 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60586.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr60586.c @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus -O2" } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ int noop(int x) { diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr63307.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr63307.c index d476c4547123..6db5386eaf0f 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr63307.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr63307.c @@ -1,4 +1,4 @@ /* { dg-options "-fcilkplus -fcompare-debug" } */ -/* { dg-do compile { target i?86-*-* x86_64-*-* } } */ +/* { dg-do compile } */ #include "fib_no_return.c" diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-1.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-1.c index bcf7727f0ae5..97775243ccda 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-1.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-1.c @@ -1,7 +1,7 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ /* { dg-additional-options "-std=gnu99" { target c } } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #define GRAINSIZE 2 diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-2.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-2.c index f4056c62e34c..64d59291975c 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-2.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/pr69826-2.c @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus -save-temps" } */ /* { dg-additional-options "-std=gnu99" { target c } } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #include "pr69826-1.c" diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c index 233a371f140e..416d77abb11d 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawnee_inline.c @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus -w" } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #include #include diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c index 55ec223abb35..49592c9e979f 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawner_inline.c @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #include #define DEFAULT_VALUE 30 diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawning_arg.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawning_arg.c index 138b82c187cf..f5f062c32b30 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/spawning_arg.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/spawning_arg.c @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #ifdef __cplusplus extern "C" { diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/steal_check.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/steal_check.c index 6b41c7faf041..00b3c7918333 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/steal_check.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/steal_check.c @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #ifdef __cplusplus extern "C" { diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/test__cilk.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/test__cilk.c index 2b37cd664c1b..3157473fff4e 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/test__cilk.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/test__cilk.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run { target cilkplus_runtime } } */ /* { dg-options "-fcilkplus" } */ int main (void) diff --git a/gcc/testsuite/c-c++-common/cilk-plus/CK/varargs_test.c b/gcc/testsuite/c-c++-common/cilk-plus/CK/varargs_test.c index 271460024409..d97280043de6 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/CK/varargs_test.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/CK/varargs_test.c @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #include #include diff --git a/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error2.c b/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error2.c index 89e0c39b02c3..28c3c9874184 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error2.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error2.c @@ -1,3 +1,4 @@ +/* The warning is x86-only. */ /* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */ /* { dg-options "-fcilkplus -Wall" } */ diff --git a/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error3.c b/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error3.c index 195e9f1d7a66..789e2bc013d8 100644 --- a/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error3.c +++ b/gcc/testsuite/c-c++-common/cilk-plus/SE/ef_error3.c @@ -1,4 +1,4 @@ -/* { dg-do compile { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do compile } */ /* { dg-options "-fcilkplus -Wall" } */ __attribute__((vector (linear (x:y)))) /* { dg-message "parameter" "" { target c++ } } */ diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc index 09ddf8b28e32..82b74886ded5 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/catch_exc.cc @@ -1,6 +1,6 @@ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */ -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ #include #include diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/cilk-for-tplt.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/cilk-for-tplt.cc index ff9a324a13f7..9481dbef74ef 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/cilk-for-tplt.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/cilk-for-tplt.cc @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #define SIZE 100 #define CHECK_VALUE 5 diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/const_spawn.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/const_spawn.cc index 1ea473f1d57f..c654826b3d94 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/const_spawn.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/const_spawn.cc @@ -1,6 +1,6 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */ -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */ class Rectangle { diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/fib-opr-overload.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/fib-opr-overload.cc index 6af4a367b7d6..386a5021c929 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/fib-opr-overload.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/fib-opr-overload.cc @@ -1,6 +1,6 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */ -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */ #if HAVE_IO #include diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/fib-tplt.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/fib-tplt.cc index dbc2da881a9e..66b1dfa9eb15 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/fib-tplt.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/fib-tplt.cc @@ -1,6 +1,6 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */ -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-*-* } } } */ struct fib_struct { diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/for1.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/for1.cc index d2243acf581b..b2f76c7019ff 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/for1.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/for1.cc @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-additional-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #if HAVE_IO #include diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns.cc index 9b3d2cc26e7a..96d2ea19c111 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns.cc @@ -1,7 +1,8 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ +/* { dg-require-effective-target c++11 } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */ -// { dg-require-effective-target c++11 } -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */ + #define FIRST_NUMBER 5 #define SECOND_NUMBER 3 #define HAVE_IO 0 diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc index b6e3fea8531f..1a36262dc6da 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/lambda_spawns_tplt.cc @@ -1,7 +1,7 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ +/* { dg-require-effective-target c++11 } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */ -// { dg-require-effective-target c++11 } -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */ #define FIRST_NUMBER 5 #define SECOND_NUMBER 3 diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/pr60586.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/pr60586.cc index 6a27cade876c..47c782813009 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/pr60586.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/pr60586.cc @@ -1,6 +1,6 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* arm*-*-* } } */ -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* arm*-*-* } } } */ class Rectangle { diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc index 057a9ced2830..102b9734275a 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/pr66326.cc @@ -1,6 +1,6 @@ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-do run { target i?86-*-* x86_64-*-* } } */ -/* { dg-options "-fcilkplus -lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #include #include diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_iter.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_iter.cc index d68ee7b7e7bf..ed489d8b00a4 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_iter.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_iter.cc @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #include #include diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_rev_iter.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_rev_iter.cc index 6eee0d99ed14..ddc96d1223dc 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_rev_iter.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_rev_iter.cc @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #include diff --git a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_test.cc b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_test.cc index 84518f343440..02b57c33a66e 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/CK/stl_test.cc +++ b/gcc/testsuite/g++.dg/cilk-plus/CK/stl_test.cc @@ -1,6 +1,6 @@ -/* { dg-do run { target { i?86-*-* x86_64-*-* } } } */ +/* { dg-do run } */ +/* { dg-require-effective-target cilkplus_runtime } */ /* { dg-options "-fcilkplus" } */ -/* { dg-options "-lcilkrts" { target { i?86-*-* x86_64-*-* } } } */ #include diff --git a/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp b/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp index c8ffe9762fe4..1e9f4af3a70b 100644 --- a/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp +++ b/gcc/testsuite/g++.dg/cilk-plus/cilk-plus.exp @@ -55,7 +55,7 @@ if [cilkplus_init] { dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/AN/*.cc]] " -g -O3 -fcilkplus" " " dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/AN/*.cc]] " -O3 -ftree-vectorize -fcilkplus -g" " " - if { [check_libcilkrts_available] } { + if { [check_effective_target_cilkplus_runtime] } { dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/CK/*.cc]] " -O1 -fcilkplus" " " dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/CK/*.cc]] " -O3 -fcilkplus" " " dg-runtest [lsort [glob -nocomplain $srcdir/g++.dg/cilk-plus/CK/*.cc]] " -g -fcilkplus" " " diff --git a/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp b/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp index dbcd0be780bb..fac975c6fc1c 100644 --- a/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp +++ b/gcc/testsuite/gcc.dg/cilk-plus/cilk-plus.exp @@ -44,7 +44,7 @@ if [cilkplus_init] { dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -O3 -std=c99" " " dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/AN/*.c]] " -fcilkplus -g -O0 -std=c99" " " - if { [check_libcilkrts_available] } { + if { [check_effective_target_cilkplus_runtime] } { dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -g " " " dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O1 " " " dg-runtest [lsort [glob -nocomplain $srcdir/c-c++-common/cilk-plus/CK/*.c]] " -O2 -std=c99 " " " diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index 422bbab16cb6..04ca17656f2f 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -1279,8 +1279,8 @@ proc check_iconv_available { test_what } { } # Return true if Cilk Library is supported on the target. -proc check_libcilkrts_available { } { - return [ check_no_compiler_messages_nocache libcilkrts_available executable { +proc check_effective_target_cilkplus_runtime { } { + return [ check_no_compiler_messages_nocache cilkplus_runtime executable { #ifdef __cplusplus extern "C" #endif