diff options
| author | Jakub Jelinek <jakub@redhat.com> | 2017-04-11 19:15:47 +0200 |
|---|---|---|
| committer | Jakub Jelinek <jakub@gcc.gnu.org> | 2017-04-11 19:15:47 +0200 |
| commit | fbc698e0f4c35b3d16127682636bd141fad1d369 (patch) | |
| tree | 1b7c0a6ec56ef768e30e5aefbb8f962556f53a6e | |
| parent | c6cf6ef7c090883c950ed6bec89bbee887130130 (diff) | |
| download | gcc-fbc698e0f4c35b3d16127682636bd141fad1d369.zip gcc-fbc698e0f4c35b3d16127682636bd141fad1d369.tar.gz gcc-fbc698e0f4c35b3d16127682636bd141fad1d369.tar.bz2 | |
re PR libgomp/80394 (Empty OpenMP task is wrongly removed when optimizing)
PR libgomp/80394
* omp-low.c (scan_omp_task): Don't optimize away empty tasks
if they have any depend clauses.
* testsuite/libgomp.c/pr80394.c: New test.
From-SVN: r246849
| -rw-r--r-- | gcc/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/omp-low.c | 6 | ||||
| -rw-r--r-- | libgomp/ChangeLog | 5 | ||||
| -rw-r--r-- | libgomp/testsuite/libgomp.c/pr80394.c | 22 |
4 files changed, 37 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 4e62a49..900e58c 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2017-04-11 Jakub Jelinek <jakub@redhat.com> + + PR libgomp/80394 + * omp-low.c (scan_omp_task): Don't optimize away empty tasks + if they have any depend clauses. + 2017-04-11 Martin Liska <mliska@suse.cz> PR ipa/80212 diff --git a/gcc/omp-low.c b/gcc/omp-low.c index 253dc85..22772ba 100644 --- a/gcc/omp-low.c +++ b/gcc/omp-low.c @@ -1857,9 +1857,11 @@ scan_omp_task (gimple_stmt_iterator *gsi, omp_context *outer_ctx) tree name, t; gomp_task *stmt = as_a <gomp_task *> (gsi_stmt (*gsi)); - /* Ignore task directives with empty bodies. */ + /* Ignore task directives with empty bodies, unless they have depend + clause. */ if (optimize > 0 - && empty_body_p (gimple_omp_body (stmt))) + && empty_body_p (gimple_omp_body (stmt)) + && !omp_find_clause (gimple_omp_task_clauses (stmt), OMP_CLAUSE_DEPEND)) { gsi_replace (gsi, gimple_build_nop (), false); return; diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 5beaaa7..67351ae 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2017-04-11 Jakub Jelinek <jakub@redhat.com> + + PR libgomp/80394 + * testsuite/libgomp.c/pr80394.c: New test. + 2017-04-04 Jakub Jelinek <jakub@redhat.com> PR libgomp/79876 diff --git a/libgomp/testsuite/libgomp.c/pr80394.c b/libgomp/testsuite/libgomp.c/pr80394.c new file mode 100644 index 0000000..6c5a740 --- /dev/null +++ b/libgomp/testsuite/libgomp.c/pr80394.c @@ -0,0 +1,22 @@ +/* PR libgomp/80394 */ + +int +main () +{ + int x = 0; + #pragma omp parallel shared(x) + #pragma omp single + { + #pragma omp task depend(inout: x) + { + for (int i = 0; i < 100000; i++) + asm volatile ("" : : : "memory"); + x += 5; + } + #pragma omp task if (0) depend(inout: x) + ; + if (x != 5) + __builtin_abort (); + } + return 0; +} |