diff mbox

lto wrapper verboseness

Message ID 87d1wzsvdt.fsf@kepler.schwinge.homeip.net
State New
Headers show

Commit Message

Thomas Schwinge Sept. 30, 2015, 4:51 p.m. UTC 
Hi!

On Mon, 28 Sep 2015 12:23:37 +0200, Bernd Schmidt <bschmidt@redhat.com> wrote:
> >
> > We need to pass on the verbose flag.  I once came up with the following
> > patch (depends on "Refactor intelmic-mkoffload.c argv building",
> > <http://news.gmane.org/find-root.php?message_id=%3C87r3ljuez8.fsf%40kepler.schwinge.homeip.net%3E>);
> > OK for trunk?
> >
> >     /* Run objcopy.  */
> > @@ -457,6 +465,8 @@ prepare_target_image (const char *target_compiler, int argc, char **argv)
> >     sprintf (rename_section_opt, ".data=%s", image_section_name);
> >     objcopy_argc = 0;
> >     objcopy_argv[objcopy_argc++] = "objcopy";
> > +  if (verbose)
> > +    objcopy_argv[objcopy_argc++] = "-v";
> >     objcopy_argv[objcopy_argc++] = "-B";
> >     objcopy_argv[objcopy_argc++] = "i386";
> >     objcopy_argv[objcopy_argc++] = "-I";
> 
> I'm not convinced we gain much by passing "-v" to objcopy, but I'll 
> leave that for the Intel folks to decide.

Actually it may even be harmful if objcopy (and likewise, ld) write to
stdout, and that disturbs the lto-wrapper usage of communication by
listing object files on stdout (as I understand it)...  So, I dropped
that.

> Other than that, ok if all argv arrays are constructed using obstacks.

Thanks for the review.  Committed in r228301:

commit 74d66c731d39a1464a34ec790432d068215a246b
Author: tschwinge <tschwinge@138bc75d-0d04-0410-961f-82ee72b054a4>
Date:   Wed Sep 30 16:42:32 2015 +0000

    Pass on the verbose flag "-v" to/in the mkoffloads
    
    	gcc/
    	* config/i386/intelmic-mkoffload.c (main): Parse "-v" flag.
    	(generate_target_descr_file, generate_target_offloadend_file)
    	(generate_host_descr_file, prepare_target_image, main): Pass it
    	on.
    	* config/nvptx/mkoffload.c (main): Parse "-v" flag.
    	(compile_native, main): Pass it on.
    	* lto-wrapper.c (compile_offload_image): Likewise.
    
    git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@228301 138bc75d-0d04-0410-961f-82ee72b054a4
---
 gcc/ChangeLog                        | 10 ++++++++++
 gcc/config/i386/intelmic-mkoffload.c | 10 ++++++++++
 gcc/config/nvptx/mkoffload.c         |  6 ++++++
 gcc/lto-wrapper.c                    |  2 ++
 4 files changed, 28 insertions(+)



Grüße,
 Thomas
diff mbox

Patch

diff --git gcc/ChangeLog gcc/ChangeLog
index 15f84ab..ba82953 100644
--- gcc/ChangeLog
+++ gcc/ChangeLog
@@ -1,4 +1,14 @@ 
 2015-09-30  Thomas Schwinge  <thomas@codesourcery.com>
+
+	* config/i386/intelmic-mkoffload.c (main): Parse "-v" flag.
+	(generate_target_descr_file, generate_target_offloadend_file)
+	(generate_host_descr_file, prepare_target_image, main): Pass it
+	on.
+	* config/nvptx/mkoffload.c (main): Parse "-v" flag.
+	(compile_native, main): Pass it on.
+	* lto-wrapper.c (compile_offload_image): Likewise.
+
+2015-09-30  Thomas Schwinge  <thomas@codesourcery.com>
 	    Ilya Verbin  <ilya.verbin@intel.com>
 	    Andrey Turetskiy  <andrey.turetskiy@intel.com>
 
diff --git gcc/config/i386/intelmic-mkoffload.c gcc/config/i386/intelmic-mkoffload.c
index ae88ecd..14f3fb3 100644
--- gcc/config/i386/intelmic-mkoffload.c
+++ gcc/config/i386/intelmic-mkoffload.c
@@ -281,6 +281,8 @@  generate_target_descr_file (const char *target_compiler)
   struct obstack argv_obstack;
   obstack_init (&argv_obstack);
   obstack_ptr_grow (&argv_obstack, target_compiler);
+  if (verbose)
+    obstack_ptr_grow (&argv_obstack, "-v");
   obstack_ptr_grow (&argv_obstack, "-c");
   obstack_ptr_grow (&argv_obstack, "-shared");
   obstack_ptr_grow (&argv_obstack, "-fPIC");
@@ -319,6 +321,8 @@  generate_target_offloadend_file (const char *target_compiler)
   struct obstack argv_obstack;
   obstack_init (&argv_obstack);
   obstack_ptr_grow (&argv_obstack, target_compiler);
+  if (verbose)
+    obstack_ptr_grow (&argv_obstack, "-v");
   obstack_ptr_grow (&argv_obstack, "-c");
   obstack_ptr_grow (&argv_obstack, "-shared");
   obstack_ptr_grow (&argv_obstack, "-fPIC");
@@ -382,6 +386,8 @@  generate_host_descr_file (const char *host_compiler)
   struct obstack argv_obstack;
   obstack_init (&argv_obstack);
   obstack_ptr_grow (&argv_obstack, host_compiler);
+  if (verbose)
+    obstack_ptr_grow (&argv_obstack, "-v");
   obstack_ptr_grow (&argv_obstack, "-c");
   obstack_ptr_grow (&argv_obstack, "-fPIC");
   obstack_ptr_grow (&argv_obstack, "-shared");
@@ -428,6 +434,8 @@  prepare_target_image (const char *target_compiler, int argc, char **argv)
   struct obstack argv_obstack;
   obstack_init (&argv_obstack);
   obstack_ptr_grow (&argv_obstack, target_compiler);
+  if (verbose)
+    obstack_ptr_grow (&argv_obstack, "-v");
   obstack_ptr_grow (&argv_obstack, "-xlto");
   obstack_ptr_grow (&argv_obstack, "-shared");
   obstack_ptr_grow (&argv_obstack, "-fPIC");
@@ -560,6 +568,8 @@  main (int argc, char **argv)
 			 "unrecognizable argument of option " STR);
 	}
 #undef STR
+      else if (strcmp (argv[i], "-v") == 0)
+	verbose = true;
     }
 
   const char *target_so_filename
diff --git gcc/config/nvptx/mkoffload.c gcc/config/nvptx/mkoffload.c
index fe0e8cd..99c0254 100644
--- gcc/config/nvptx/mkoffload.c
+++ gcc/config/nvptx/mkoffload.c
@@ -925,6 +925,8 @@  compile_native (const char *infile, const char *outfile, const char *compiler)
   struct obstack argv_obstack;
   obstack_init (&argv_obstack);
   obstack_ptr_grow (&argv_obstack, compiler);
+  if (verbose)
+    obstack_ptr_grow (&argv_obstack, "-v");
   switch (offload_abi)
     {
     case OFFLOAD_ABI_LP64:
@@ -1028,11 +1030,15 @@  main (int argc, char **argv)
 			 "unrecognizable argument of option " STR);
 	}
 #undef STR
+      else if (strcmp (argv[i], "-v") == 0)
+	verbose = true;
     }
 
   struct obstack argv_obstack;
   obstack_init (&argv_obstack);
   obstack_ptr_grow (&argv_obstack, driver);
+  if (verbose)
+    obstack_ptr_grow (&argv_obstack, "-v");
   obstack_ptr_grow (&argv_obstack, "-xlto");
   switch (offload_abi)
     {
diff --git gcc/lto-wrapper.c gcc/lto-wrapper.c
index e13a82a..f932758 100644
--- gcc/lto-wrapper.c
+++ gcc/lto-wrapper.c
@@ -685,6 +685,8 @@  compile_offload_image (const char *target, const char *compiler_path,
       struct obstack argv_obstack;
       obstack_init (&argv_obstack);
       obstack_ptr_grow (&argv_obstack, compiler);
+      if (verbose)
+	obstack_ptr_grow (&argv_obstack, "-v");
       obstack_ptr_grow (&argv_obstack, "-o");
       obstack_ptr_grow (&argv_obstack, filename);