cgraphunit.c (ipa_passes): Handle flag_generate_offload.

gcc/
	* cgraphunit.c (ipa_passes): Handle flag_generate_offload.
	(symbol_table::compile): Set flag_generate_offload if there is something
	to offload.
	* common.opt (flag_generate_offload): New Variable declaration.
	* dwarf2out.c (dwarf2out_finish): Handle flag_generate_offload.
	* ipa-inline-analysis.c (inline_generate_summary): Do not skip if
	flag_generate_offload is set.
	* lto-streamer.c (gate_lto_out): Handle flag_generate_offload.
	* passes.c (ipa_write_summaries): Do not skip if flag_generate_offload
	is set.
	* toplev.c (compile_file): Emit LTO marker if offload info has been
	previously emitted.  Do not emit lto_slim marker if
	flag_generate_offload is without flag_generate_lto.
	* tree.c (free_lang_data): Do not skip if flag_generate_offload is set.

From-SVN: r218147

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 3c33c216ab5ea276f4695b60f3b783ffd53100b6..4e6da0cd27996b607b7b4dc04698b63cb2282037 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,20 @@
+2014-11-28  Ilya Verbin  <ilya.verbin@intel.com>
+
+       * cgraphunit.c (ipa_passes): Handle flag_generate_offload.
+       (symbol_table::compile): Set flag_generate_offload if there is something
+       to offload.
+       * common.opt (flag_generate_offload): New Variable declaration.
+       * dwarf2out.c (dwarf2out_finish): Handle flag_generate_offload.
+       * ipa-inline-analysis.c (inline_generate_summary): Do not skip if
+       flag_generate_offload is set.
+       * lto-streamer.c (gate_lto_out): Handle flag_generate_offload.
+       * passes.c (ipa_write_summaries): Do not skip if flag_generate_offload
+       is set.
+       * toplev.c (compile_file): Emit LTO marker if offload info has been
+       previously emitted.  Do not emit lto_slim marker if
+       flag_generate_offload is without flag_generate_lto.
+       * tree.c (free_lang_data): Do not skip if flag_generate_offload is set.
+
 2014-11-28  Kyrylo Tkachov  <kyrylo.tkachov@arm.com>
 
        * config/arm/arm-cores.def (cortex-a17.cortex-a7): New entry.

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 2fd99a7c09840d5238b68ae91c05eaba7db5674f..fed1a3e0053723fe76579c39580b495283ad55c3 100644 (file)
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -2075,7 +2075,7 @@ ipa_passes (void)
     }
 
   /* Some targets need to handle LTO assembler output specially.  */
-  if (flag_generate_lto)
+  if (flag_generate_lto || flag_generate_offload)
     targetm.asm_out.lto_start ();
 
   if (!in_lto_p)
@@ -2092,7 +2092,7 @@ ipa_passes (void)
        }
     }
 
-  if (flag_generate_lto)
+  if (flag_generate_lto || flag_generate_offload)
     targetm.asm_out.lto_end ();
 
   if (!flag_ltrans && (in_lto_p || !flag_lto || flag_fat_lto_objects))
@@ -2176,10 +2176,10 @@ symbol_table::compile (void)
 
   /* Offloading requires LTO infrastructure.  */
   if (!in_lto_p && g->have_offload)
-    flag_generate_lto = 1;
+    flag_generate_offload = 1;
 
   /* If LTO is enabled, initialize the streamer hooks needed by GIMPLE.  */
-  if (flag_generate_lto)
+  if (flag_generate_lto || flag_generate_offload)
     lto_streamer_hooks_init ();
 
   /* Don't run the IPA passes if there was any error or sorry messages.  */

diff --git a/gcc/common.opt b/gcc/common.opt
index 41c8d4ed76db65d4ffe78c8dc0793de1253c4926..752d939ed67f9122589e4c7f2f378fd210f31434 100644 (file)
--- a/gcc/common.opt
+++ b/gcc/common.opt
@@ -67,6 +67,10 @@ int *param_values
 Variable
 int flag_generate_lto
 
+; Nonzero if we should write GIMPLE bytecode for offload compilation.
+Variable
+int flag_generate_offload = 0
+
 ; True to warn about any objects definitions whose size is larger
 ; than N bytes.  Also want about function definitions whose returned
 ; values are larger than N bytes, where N is 'larger_than_size'.

diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index b7f93f080fcea88512dc9223f03a8d82f9fac71d..ca1e3ef63f019c1a85792d3fb736aa1f25ecdf76 100644 (file)
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -24423,7 +24423,8 @@ dwarf2out_finish (const char *filename)
       /* When generating LTO bytecode we can not generate new assembler
          names at this point and all important decls got theirs via
         free-lang-data.  */
-      if ((!flag_generate_lto || DECL_ASSEMBLER_NAME_SET_P (decl))
+      if (((!flag_generate_lto && !flag_generate_offload)
+          || DECL_ASSEMBLER_NAME_SET_P (decl))
          && DECL_ASSEMBLER_NAME (decl) != DECL_NAME (decl))
        {
          add_linkage_attr (node->die, decl);

diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index 2f2993ce2995117e524c2a35d36fcfd38e9b00c0..9d62722980999fb4688bf466d76813c99433808b 100644 (file)
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -4031,7 +4031,7 @@ inline_generate_summary (void)
 
   /* When not optimizing, do not bother to analyze.  Inlining is still done
      because edge redirection needs to happen there.  */
-  if (!optimize && !flag_generate_lto && !flag_wpa)
+  if (!optimize && !flag_generate_lto && !flag_generate_offload && !flag_wpa)
     return;
 
   function_insertion_hook_holder =

diff --git a/gcc/lto-streamer.c b/gcc/lto-streamer.c
index e8347dccd654de020c0a135a3ea5c94997519d92..af203302243ca137204be1b1427c8ca4f664b4c1 100644 (file)
--- a/gcc/lto-streamer.c
+++ b/gcc/lto-streamer.c
@@ -328,7 +328,7 @@ lto_streamer_init (void)
 bool
 gate_lto_out (void)
 {
-  return ((flag_generate_lto || in_lto_p)
+  return ((flag_generate_lto || flag_generate_offload || in_lto_p)
          /* Don't bother doing anything if the program has errors.  */
          && !seen_error ());
 }

diff --git a/gcc/passes.c b/gcc/passes.c
index a3be0bbdcf90020b0e4bc74944db05f095b6c745..74b40e5d80b3ea80ab18d8825d830c54d01b2068 100644 (file)
--- a/gcc/passes.c
+++ b/gcc/passes.c
@@ -2466,7 +2466,7 @@ ipa_write_summaries (bool offload_lto_mode)
   struct cgraph_node *node;
   struct cgraph_node **order;
 
-  if (!flag_generate_lto || seen_error ())
+  if ((!flag_generate_lto && !flag_generate_offload) || seen_error ())
     return;
 
   select_what_to_stream (offload_lto_mode);

diff --git a/gcc/toplev.c b/gcc/toplev.c
index 6e6adfa19f0437a9f08351bde6fd4a9e05fd68ff..2f547bfd9510b5c034b5d914d4930b2a6211dab6 100644 (file)
--- a/gcc/toplev.c
+++ b/gcc/toplev.c
@@ -639,7 +639,7 @@ compile_file (void)
      We used to emit an undefined reference here, but this produces
      link errors if an object file with IL is stored into a shared
      library without invoking lto1.  */
-  if (flag_generate_lto)
+  if (flag_generate_lto || flag_generate_offload)
     {
 #if defined ASM_OUTPUT_ALIGNED_DECL_COMMON
       ASM_OUTPUT_ALIGNED_DECL_COMMON (asm_out_file, NULL_TREE,
@@ -653,23 +653,23 @@ compile_file (void)
                         (unsigned HOST_WIDE_INT) 1,
                         (unsigned HOST_WIDE_INT) 1);
 #endif
-      /* Let linker plugin know that this is a slim object and must be LTOed
-         even when user did not ask for it.  */
-      if (!flag_fat_lto_objects)
-        {
+    }
+
+  /* Let linker plugin know that this is a slim object and must be LTOed
+     even when user did not ask for it.  */
+  if (flag_generate_lto && !flag_fat_lto_objects)
+    {
 #if defined ASM_OUTPUT_ALIGNED_DECL_COMMON
-         ASM_OUTPUT_ALIGNED_DECL_COMMON (asm_out_file, NULL_TREE,
-                                         "__gnu_lto_slim",
-                                         (unsigned HOST_WIDE_INT) 1, 8);
+      ASM_OUTPUT_ALIGNED_DECL_COMMON (asm_out_file, NULL_TREE, "__gnu_lto_slim",
+                                     (unsigned HOST_WIDE_INT) 1, 8);
 #elif defined ASM_OUTPUT_ALIGNED_COMMON
-         ASM_OUTPUT_ALIGNED_COMMON (asm_out_file, "__gnu_lto_slim",
-                                    (unsigned HOST_WIDE_INT) 1, 8);
+      ASM_OUTPUT_ALIGNED_COMMON (asm_out_file, "__gnu_lto_slim",
+                                (unsigned HOST_WIDE_INT) 1, 8);
 #else
-         ASM_OUTPUT_COMMON (asm_out_file, "__gnu_lto_slim",
-                            (unsigned HOST_WIDE_INT) 1,
-                            (unsigned HOST_WIDE_INT) 1);
+      ASM_OUTPUT_COMMON (asm_out_file, "__gnu_lto_slim",
+                        (unsigned HOST_WIDE_INT) 1,
+                        (unsigned HOST_WIDE_INT) 1);
 #endif
-        }
     }
 
   /* Attach a special .ident directive to the end of the file to identify

diff --git a/gcc/tree.c b/gcc/tree.c
index 1d5e4f6cd1eca5189ded8f9a40d1d6e15d74d8b4..f6a6d04a14ac8436fb1834c49229c6ade6d6a463 100644 (file)
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -5730,7 +5730,7 @@ free_lang_data (void)
 
   /* If we are the LTO frontend we have freed lang-specific data already.  */
   if (in_lto_p
-      || !flag_generate_lto)
+      || (!flag_generate_lto && !flag_generate_offload))
     return 0;
 
   /* Allocate and assign alias sets to the standard integer types