From b3bdf019b761cc75d967e1330f3e90cd4c94e116 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 3 Mar 2014 08:27:46 +0100 Subject: [PATCH] c-pragma.c (c_pp_lookup_pragma): Handle PRAGMA_CILK_SIMD. * c-pragma.c (c_pp_lookup_pragma): Handle PRAGMA_CILK_SIMD. (init_pragma): Call cpp_register_deferred_pragma for PRAGMA_CILK_SIMD even when flag_preprocess_only. * c-c++-common/cilk-plus/PS/vectorlength-2.c: New test. * c-c++-common/cilk-plus/PS/vectorlength-3.c: New test. From-SVN: r208268 --- gcc/c-family/ChangeLog | 6 ++++++ gcc/c-family/c-pragma.c | 9 ++++++++- gcc/testsuite/ChangeLog | 5 +++++ .../c-c++-common/cilk-plus/PS/vectorlength-2.c | 12 ++++++++++++ .../c-c++-common/cilk-plus/PS/vectorlength-3.c | 14 ++++++++++++++ 5 files changed, 45 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-2.c create mode 100644 gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-3.c diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 088d158a083..a775d4c3381 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,9 @@ +2014-03-03 Jakub Jelinek + + * c-pragma.c (c_pp_lookup_pragma): Handle PRAGMA_CILK_SIMD. + (init_pragma): Call cpp_register_deferred_pragma for PRAGMA_CILK_SIMD + even when flag_preprocess_only. + 2014-02-26 Jason Merrill PR c++/59231 diff --git a/gcc/c-family/c-pragma.c b/gcc/c-family/c-pragma.c index 91fffdbd5ba..2594d73a216 100644 --- a/gcc/c-family/c-pragma.c +++ b/gcc/c-family/c-pragma.c @@ -1221,6 +1221,13 @@ c_pp_lookup_pragma (unsigned int id, const char **space, const char **name) return; } + if (id == PRAGMA_CILK_SIMD) + { + *space = NULL; + *name = "simd"; + return; + } + if (id >= PRAGMA_FIRST_EXTERNAL && (id < PRAGMA_FIRST_EXTERNAL + registered_pp_pragmas.length ())) { @@ -1384,7 +1391,7 @@ init_pragma (void) omp_pragmas_simd[i].id, true, true); } - if (flag_cilkplus && !flag_preprocess_only) + if (flag_cilkplus) cpp_register_deferred_pragma (parse_in, NULL, "simd", PRAGMA_CILK_SIMD, true, false); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 7db73e40675..7ba8d1b3336 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-03-03 Jakub Jelinek + + * c-c++-common/cilk-plus/PS/vectorlength-2.c: New test. + * c-c++-common/cilk-plus/PS/vectorlength-3.c: New test. + 2014-03-02 Jan Hubicka PR ipa/60150 diff --git a/gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-2.c b/gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-2.c new file mode 100644 index 00000000000..d90397717ac --- /dev/null +++ b/gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-2.c @@ -0,0 +1,12 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fcilkplus" } */ + +#define vl(n) vectorlength(2*n) +void +foo (int *a, int *b, int *c) +{ + int i; +#pragma simd vl(4) + for (i = 0; i < 64; i++) + a[i] = b[i] * c[i]; +} diff --git a/gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-3.c b/gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-3.c new file mode 100644 index 00000000000..9cef5a5812d --- /dev/null +++ b/gcc/testsuite/c-c++-common/cilk-plus/PS/vectorlength-3.c @@ -0,0 +1,14 @@ +/* { dg-do compile } */ +/* { dg-options "-O2 -fcilkplus -save-temps" } */ + +#define vl(n) vectorlength(2*n) +void +foo (int *a, int *b, int *c) +{ + int i; +#pragma simd vl(4) + for (i = 0; i < 64; i++) + a[i] = b[i] * c[i]; +} + +/* { dg-final { cleanup-saved-temps } } */ -- 2.30.2