diff options
| author | Cesar Philippidis <cesar@codesourcery.com> | 2018-04-12 06:15:45 -0700 |
|---|---|---|
| committer | Cesar Philippidis <cesar@gcc.gnu.org> | 2018-04-12 06:15:45 -0700 |
| commit | 2e5efa6760314aac101b63d1a7742cff5f5e650f (patch) | |
| tree | b8576600c7c102a8375ae41777eabe324a6b4f07 /gcc | |
| parent | c1566f8942f107774fbe0d41cc5de641175043e7 (diff) | |
| download | gcc-2e5efa6760314aac101b63d1a7742cff5f5e650f.zip gcc-2e5efa6760314aac101b63d1a7742cff5f5e650f.tar.gz gcc-2e5efa6760314aac101b63d1a7742cff5f5e650f.tar.bz2 | |
re PR middle-end/84955 (Incorrect OpenACC tile expansion)
PR middle-end/84955
gcc/
* lto-streamer-out.c (output_function): Fix CFG loop state before
streaming out.
* omp-expand.c (expand_oacc_for): Handle calls to internal
functions like regular functions.
libgomp/
* testsuite/libgomp.oacc-c-c++-common/pr84955.c: New test.
* testsuite/libgomp.oacc-fortran/pr84955.f90: New test.
Co-Authored-By: Richard Biener <rguenther@suse.de>
From-SVN: r259346
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/lto-streamer-out.c | 8 | ||||
| -rw-r--r-- | gcc/omp-expand.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 |
4 files changed, 29 insertions, 2 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c36052d..798469f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,12 @@ +2018-04-12 Cesar Philippidis <cesar@codesourcery.com> + Richard Biener <rguenther@suse.de> + + PR middle-end/84955 + * lto-streamer-out.c (output_function): Fix CFG loop state before + streaming out. + * omp-expand.c (expand_oacc_for): Handle calls to internal + functions like regular functions. + 2018-04-12 Richard Biener <rguenther@suse.de> PR lto/85371 diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index 1d2ab97..fd6788a 100644 --- a/gcc/lto-streamer-out.c +++ b/gcc/lto-streamer-out.c @@ -2084,6 +2084,9 @@ output_function (struct cgraph_node *node) /* Set current_function_decl and cfun. */ push_cfun (fn); + /* Fixup loops if required to match discovery done in the reader. */ + loop_optimizer_init (AVOID_CFG_MODIFICATIONS); + /* Make string 0 be a NULL string. */ streamer_write_char_stream (ob->string_stream, 0); @@ -2176,12 +2179,13 @@ output_function (struct cgraph_node *node) streamer_write_record_start (ob, LTO_null); output_cfg (ob, fn); - - pop_cfun (); } else streamer_write_uhwi (ob, 0); + loop_optimizer_finalize (); + pop_cfun (); + /* Create a section to hold the pickled output of this function. */ produce_asm (ob, function); diff --git a/gcc/omp-expand.c b/gcc/omp-expand.c index bb20490..c7d30ea 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/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 0309915..9011b65 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2018-04-12 Cesar Philippidis <cesar@codesourcery.com> + + 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 Jakub Jelinek <jakub@redhat.com> PR target/85328 |