diff options
| author | Tom de Vries <tom@codesourcery.com> | 2017-12-30 17:02:00 +0000 |
|---|---|---|
| committer | Tom de Vries <vries@gcc.gnu.org> | 2017-12-30 17:02:00 +0000 |
| commit | 60bf575ccb787310f5f3063b036498de7e9c2c6b (patch) | |
| tree | 1c337e37aa3127cc198dd0a948673450a1d8395f /gcc | |
| parent | 1e4423dbb50bcafd41a1246602e4222d8562eb93 (diff) | |
| download | gcc-60bf575ccb787310f5f3063b036498de7e9c2c6b.zip gcc-60bf575ccb787310f5f3063b036498de7e9c2c6b.tar.gz gcc-60bf575ccb787310f5f3063b036498de7e9c2c6b.tar.bz2 | |
Prune removed funcs from offload table
2017-12-30 Tom de Vries <tom@codesourcery.com>
PR libgomp/83046
* omp-expand.c (expand_omp_target): If in_lto_p, mark offload_funcs with
DECL_PRESERVE_P.
* lto-streamer-out.c (prune_offload_funcs): New function. Remove
offload_funcs entries that no longer have a corresponding cgraph_node.
Mark the remaining ones as DECL_PRESERVE_P.
(output_lto): Call prune_offload_funcs.
* testsuite/libgomp.oacc-c-c++-common/pr83046.c: New test.
* testsuite/libgomp.c-c++-common/pr83046.c: New test.
From-SVN: r256045
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/ChangeLog | 10 | ||||
| -rw-r--r-- | gcc/lto-streamer-out.c | 32 | ||||
| -rw-r--r-- | gcc/omp-expand.c | 6 |
3 files changed, 47 insertions, 1 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 18a92a9..3ea3f5b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,13 @@ +2017-12-30 Tom de Vries <tom@codesourcery.com> + + PR libgomp/83046 + * omp-expand.c (expand_omp_target): If in_lto_p, mark offload_funcs with + DECL_PRESERVE_P. + * lto-streamer-out.c (prune_offload_funcs): New function. Remove + offload_funcs entries that no longer have a corresponding cgraph_node. + Mark the remaining ones as DECL_PRESERVE_P. + (output_lto): Call prune_offload_funcs. + 2017-12-30 Jakub Jelinek <jakub@redhat.com> * config/i386/sse.md (vgf2p8affineinvqb_<mode><mask_name>, diff --git a/gcc/lto-streamer-out.c b/gcc/lto-streamer-out.c index ba29bd0..ef17083 100644 --- a/gcc/lto-streamer-out.c +++ b/gcc/lto-streamer-out.c @@ -41,6 +41,7 @@ along with GCC; see the file COPYING3. If not see #include "builtins.h" #include "gomp-constants.h" #include "debug.h" +#include "omp-offload.h" static void lto_write_tree (struct output_block*, tree, bool); @@ -2345,6 +2346,35 @@ wrap_refs (tree *tp, int *ws, void *) return NULL_TREE; } +/* Remove functions that are no longer used from offload_funcs, and mark the + remaining ones with DECL_PRESERVE_P. */ + +static void +prune_offload_funcs (void) +{ + if (!offload_funcs) + return; + + unsigned int write_index = 0; + for (unsigned read_index = 0; read_index < vec_safe_length (offload_funcs); + read_index++) + { + tree fn_decl = (*offload_funcs)[read_index]; + bool remove_p = cgraph_node::get (fn_decl) == NULL; + if (remove_p) + continue; + + DECL_PRESERVE_P (fn_decl) = 1; + + if (write_index != read_index) + (*offload_funcs)[write_index] = (*offload_funcs)[read_index]; + + write_index++; + } + + offload_funcs->truncate (write_index); +} + /* Main entry point from the pass manager. */ void @@ -2355,6 +2385,8 @@ lto_output (void) int i, n_nodes; lto_symtab_encoder_t encoder = lto_get_out_decl_state ()->symtab_node_encoder; + prune_offload_funcs (); + if (flag_checking) output = lto_bitmap_alloc (); diff --git a/gcc/omp-expand.c b/gcc/omp-expand.c index 0248833..663711b 100644 --- a/gcc/omp-expand.c +++ b/gcc/omp-expand.c @@ -7058,7 +7058,11 @@ expand_omp_target (struct omp_region *region) /* Add the new function to the offload table. */ if (ENABLE_OFFLOADING) - vec_safe_push (offload_funcs, child_fn); + { + if (in_lto_p) + DECL_PRESERVE_P (child_fn) = 1; + vec_safe_push (offload_funcs, child_fn); + } bool need_asm = DECL_ASSEMBLER_NAME_SET_P (current_function_decl) && !DECL_ASSEMBLER_NAME_SET_P (child_fn); |