From 05e0af43867f79ab6f2e9ad7664ec969ad484890 Mon Sep 17 00:00:00 2001 From: Cesar Philippidis Date: Mon, 16 Apr 2018 11:01:09 -0700 Subject: [PATCH] [openacc] Fix ICE when compiling tile loop containing infinite loop 2018-04-16 Cesar Philippidis Tom de Vries PR middle-end/84955 * omp-expand.c (expand_oacc_for): Add dummy false branch for tiled basic blocks without omp continue statements. * testsuite/libgomp.oacc-c-c++-common/pr84955.c: New test. * testsuite/libgomp.oacc-fortran/pr84955.f90: New test. Co-Authored-By: Tom de Vries From-SVN: r259406 --- gcc/ChangeLog | 7 +++++++ gcc/omp-expand.c | 8 ++++++++ libgomp/ChangeLog | 7 +++++++ .../testsuite/libgomp.oacc-c-c++-common/pr84955.c | 15 +++++++++++++++ .../testsuite/libgomp.oacc-fortran/pr84955.f90 | 13 +++++++++++++ 5 files changed, 50 insertions(+) create mode 100644 libgomp/testsuite/libgomp.oacc-c-c++-common/pr84955.c create mode 100644 libgomp/testsuite/libgomp.oacc-fortran/pr84955.f90 diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c3ea8d62e43..caef3054ec6 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2018-04-16 Cesar Philippidis + Tom de Vries + + PR middle-end/84955 + * omp-expand.c (expand_oacc_for): Add dummy false branch for + tiled basic blocks without omp continue statements. + 2018-04-16 Aaron Sawdey PR target/83660 diff --git a/gcc/omp-expand.c b/gcc/omp-expand.c index bb204906ea6..c7d30ea3964 100644 --- a/gcc/omp-expand.c +++ b/gcc/omp-expand.c @@ -5439,6 +5439,14 @@ expand_oacc_for (struct omp_region *region, struct omp_for_data *fd) split->flags ^= EDGE_FALLTHRU | EDGE_TRUE_VALUE; + /* Add a dummy exit for the tiled block when cont_bb is missing. */ + if (cont_bb == NULL) + { + edge e = make_edge (body_bb, exit_bb, EDGE_FALSE_VALUE); + e->probability = profile_probability::even (); + split->probability = profile_probability::even (); + } + /* Initialize the user's loop vars. */ gsi = gsi_start_bb (elem_body_bb); expand_oacc_collapse_vars (fd, true, &gsi, counts, e_offset); diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 9568a73738e..ef528093c12 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,10 @@ +2018-04-16 Cesar Philippidis + Tom de Vries + + PR middle-end/84955 + * testsuite/libgomp.oacc-c-c++-common/pr84955.c: New test. + * testsuite/libgomp.oacc-fortran/pr84955.f90: New test. + 2018-04-12 Thomas Koenig PR fortran/83064 diff --git a/libgomp/testsuite/libgomp.oacc-c-c++-common/pr84955.c b/libgomp/testsuite/libgomp.oacc-c-c++-common/pr84955.c new file mode 100644 index 00000000000..e528faad0c4 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-c-c++-common/pr84955.c @@ -0,0 +1,15 @@ +/* { dg-do compile } */ + +int +main (void) +{ + int i, j; + +#pragma acc parallel loop tile(2,3) + for (i = 1; i < 10; i++) + for (j = 1; j < 10; j++) + for (;;) + ; + + return i + j; +} diff --git a/libgomp/testsuite/libgomp.oacc-fortran/pr84955.f90 b/libgomp/testsuite/libgomp.oacc-fortran/pr84955.f90 new file mode 100644 index 00000000000..dc858653808 --- /dev/null +++ b/libgomp/testsuite/libgomp.oacc-fortran/pr84955.f90 @@ -0,0 +1,13 @@ +! { dg-do compile } + +subroutine s + integer :: i, j + !$acc parallel loop tile(2,3) + do i = 1, 10 + do j = 1, 10 + do + end do + end do + end do + !$acc end parallel loop +end subroutine s -- 2.30.2