> On Fri, Jan 09, 2015 at 12:07:26PM +0100, Thomas Schwinge wrote:
> > On Thu, 8 Jan 2015 15:11:49 +0100, Jakub Jelinek <ja...@redhat.com> wrote:
> > > On Thu, Nov 20, 2014 at 01:27:08PM +0100, Bernd Schmidt wrote:
> > > > On 11/13/2014 05:06 AM, Jan Hubicka wrote:
> > > > >this patch adds infrastructure for proper streaming and merging of
> > > > >TREE_TARGET_OPTION.
> > > > 
> > > > This breaks the offloading path via LTO since it introduces an
> > > > incompatibility in LTO format between host and offload machine.
> > > > 
> > > > A very quick patch to fix it is below - the OpenACC testcase I was using
> > > > seems to be working again with this. Thoughts, suggestions?
> > > 
> > > I actually think
> > 
> > Thanks for picking up this issue!
> 
> Richard said on IRC he doesn't like the string comparisons, so here is
> untested modification of the patch.  If it looks good, I'll test it today:
> 
> 2015-01-09  Bernd Schmidt  <ber...@codesourcery.com>
>           Jakub Jelinek  <ja...@redhat.com>
> 
>       PR middle-end/64412
>       * lto-streamer.h (lto_stream_offload_p): New declaration.
>       * lto-streamer.c (lto_stream_offload_p): New variable.
>       * cgraphunit.c (ipa_passes): Set lto_stream_offload_p
>       at the same time as section_name_prefix.
>       * lto-streamer-out.c (hash_tree): Don't hash TREE_TARGET_OPTION
>       if lto_stream_offload_p.
>       * tree-streamer-out.c (streamer_pack_tree_bitfields): Don't
>       stream TREE_TARGET_OPTION if lto_stream_offload_p.
>       (write_ts_function_decl_tree_pointers): Don't
>       stream DECL_FUNCTION_SPECIFIC_TARGET if lto_stream_offload_p.
>       * tree-streamer-in.c (unpack_value_fields): Don't stream
>       TREE_TARGET_OPTION in if ACCEL_COMPILER.
>       (lto_input_ts_function_decl_tree_pointers): Don't stream
>       DECL_FUNCTION_SPECIFIC_TARGET in if ACCEL_COMPILER.
>       * lto-opts.c (lto_write_options): Use lto_stream_offload_p
>       instead of section_name_prefix string comparisons.
> lto/
>       * lto.c (read_cgraph_and_symbols): Set lto_stream_offload_p
>       if ACCEL_COMPILER.

This looks fine to me. Thanks for looking into this issue (that was mine,
but I was quite busy last month)

Honza

Reply via email to