From patchwork Mon Sep 28 08:08:27 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Schwinge X-Patchwork-Id: 523258 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 5FA5814010F for ; Mon, 28 Sep 2015 18:08:52 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=vvFI4Cks; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; q=dns; s=default; b=it+WCZeiRgQSlLGe WcH6JkUI6mSTOJxplVgKteikbOe9Ce4uWdUvnsCcHGgFePimGJcVvVrNese5c+K7 dQhxqYT8IaUwl6VuVlJaffVY+EfRapJ8QIfXraOJFQzyjW16FhESs8yGR0nL4XK4 2Dk0HFppKCmhC2pKscnuHs5frUM= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:from :to:cc:subject:in-reply-to:references:date:message-id :mime-version:content-type; s=default; bh=UgFytZcVO07GF3Eykjn4ef EkF4s=; b=vvFI4CksI0QQth95gYGNgSh4aW4ZyIccKYkW3RQv3nL57B5AO7VQNk C5QcLp0DiczT1jsF2zyGG0NMlXAcUeHc6PtcKJz+4SFR2wEqGrsuFv5a+1nBrGkH OMXKfohyEvlPZw63Y8rAwpHdrTMJugjmEUJ5iFX3SPAwtdBeCqfCU= Received: (qmail 118809 invoked by alias); 28 Sep 2015 08:08:44 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 116963 invoked by uid 89); 28 Sep 2015 08:08:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.3 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Mon, 28 Sep 2015 08:08:40 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-FEM-02.mgc.mentorg.com) by relay1.mentorg.com with esmtp id 1ZgTUB-0007P7-K2 from Thomas_Schwinge@mentor.com ; Mon, 28 Sep 2015 01:08:36 -0700 Received: from feldtkeller.schwinge.homeip.net (137.202.0.76) by SVR-IES-FEM-02.mgc.mentorg.com (137.202.0.106) with Microsoft SMTP Server id 14.3.224.2; Mon, 28 Sep 2015 09:08:34 +0100 From: Thomas Schwinge To: "H.J. Lu" , Jakub Jelinek , Ilya Verbin , GCC Patches CC: Kirill Yukhin , Andrey Turetskiy , Bernd Schmidt Subject: Re: Use gcc/coretypes.h:enum offload_abi in mkoffloads In-Reply-To: <87io8vmhar.fsf@kepler.schwinge.homeip.net> References: <20141021171323.GA47586@msticlxl57.ims.intel.com> <20141021171602.GB47586@msticlxl57.ims.intel.com> <20141022082103.GH10376@tucnak.redhat.com> <20141022185701.GA21398@msticlxl57.ims.intel.com> <87sig8ylhv.fsf@kepler.schwinge.homeip.net> <20141222112820.GJ1667@tucnak.redhat.com> <87ioghwc6e.fsf@schwinge.name> <87io8vmhar.fsf@kepler.schwinge.homeip.net> User-Agent: Notmuch/0.9-125-g4686d11 (http://notmuchmail.org) Emacs/24.5.1 (i586-pc-linux-gnu) Date: Mon, 28 Sep 2015 10:08:27 +0200 Message-ID: <87vbavuft0.fsf@kepler.schwinge.homeip.net> MIME-Version: 1.0 Hi! On Tue, 4 Aug 2015 13:20:12 +0200, I wrote: > On Thu, 8 Jan 2015 07:02:19 -0800, "H.J. Lu" wrote: > > On Thu, Jan 8, 2015 at 6:59 AM, Thomas Schwinge wrote: > > > On Mon, 22 Dec 2014 12:28:20 +0100, Jakub Jelinek wrote: > > >> On Mon, Dec 22, 2014 at 12:25:32PM +0100, Thomas Schwinge wrote: > > >> > On Wed, 22 Oct 2014 22:57:01 +0400, Ilya Verbin wrote: > > >> > > --- /dev/null > > >> > > +++ b/gcc/config/i386/intelmic-mkoffload.c > > >> > > @@ -0,0 +1,541 @@ > > >> > > +/* Offload image generation tool for Intel MIC devices. > > >> > > > >> > > +/* Shows if we should compile binaries for i386 instead of x86-64. */ > > >> > > +bool target_ilp32 = false; > > Once the following refactoring to use gcc/coretypes.h:enum offload_abi in > mkoffloads gets approved... > > > Should we also handle x32? > > ..., that should be more easy to do. OK for trunk, once testing > succeeds? > > commit de4d7cbcf979edc095a48dff5b38d12846bdab6f > Author: Thomas Schwinge > Date: Tue Aug 4 13:12:36 2015 +0200 > > Use gcc/coretypes.h:enum offload_abi in mkoffloads That one included unfortunate yet popular ;-) strcmp "typos": > +#define STR "-foffload-abi=" > + if (strncmp (argv[i], STR, strlen (STR)) == 0) > + { > + if (strcmp (argv[i] + strlen (STR), "lp64")) > + offload_abi = OFFLOAD_ABI_LP64; > + else if (strcmp (argv[i] + strlen (STR), "ilp32")) > + offload_abi = OFFLOAD_ABI_ILP32; ..., so with these fixed up: Grüße, Thomas --- gcc/config/i386/intelmic-mkoffload.c +++ gcc/config/i386/intelmic-mkoffload.c @@ -544,9 +544,9 @@ main (int argc, char **argv) #define STR "-foffload-abi=" if (strncmp (argv[i], STR, strlen (STR)) == 0) { - if (strcmp (argv[i] + strlen (STR), "lp64")) + if (strcmp (argv[i] + strlen (STR), "lp64") == 0) offload_abi = OFFLOAD_ABI_LP64; - else if (strcmp (argv[i] + strlen (STR), "ilp32")) + else if (strcmp (argv[i] + strlen (STR), "ilp32") == 0) offload_abi = OFFLOAD_ABI_ILP32; else fatal_error (input_location, --- gcc/config/nvptx/mkoffload.c +++ gcc/config/nvptx/mkoffload.c @@ -1013,9 +1013,9 @@ main (int argc, char **argv) #define STR "-foffload-abi=" if (strncmp (argv[i], STR, strlen (STR)) == 0) { - if (strcmp (argv[i] + strlen (STR), "lp64")) + if (strcmp (argv[i] + strlen (STR), "lp64") == 0) offload_abi = OFFLOAD_ABI_LP64; - else if (strcmp (argv[i] + strlen (STR), "ilp32")) + else if (strcmp (argv[i] + strlen (STR), "ilp32") == 0) offload_abi = OFFLOAD_ABI_ILP32; else fatal_error (input_location, ..., I'll again propose the following patch for trunk: commit 9288882278239a9d346ebde99e616185a91fbfaf Author: Thomas Schwinge Date: Tue Aug 4 13:12:36 2015 +0200 Use gcc/coretypes.h:enum offload_abi in mkoffloads gcc/ * config/i386/intelmic-mkoffload.c (target_ilp32): Remove variable, replacing it with... (offload_abi): ... this new variable. Adjust all users. * config/nvptx/mkoffload.c (target_ilp32, offload_abi): Likewise. --- gcc/config/i386/intelmic-mkoffload.c | 90 +++++++++++++++++++++++----------- gcc/config/nvptx/mkoffload.c | 56 +++++++++++++++------ 2 files changed, 101 insertions(+), 45 deletions(-) diff --git gcc/config/i386/intelmic-mkoffload.c gcc/config/i386/intelmic-mkoffload.c index 4a7812c..8028584 100644 --- gcc/config/i386/intelmic-mkoffload.c +++ gcc/config/i386/intelmic-mkoffload.c @@ -42,8 +42,7 @@ int num_temps = 0; const int MAX_NUM_TEMPS = 10; const char *temp_files[MAX_NUM_TEMPS]; -/* Shows if we should compile binaries for i386 instead of x86-64. */ -bool target_ilp32 = false; +enum offload_abi offload_abi = OFFLOAD_ABI_UNSET; /* Delete tempfiles and exit function. */ void @@ -200,10 +199,17 @@ out: static void compile_for_target (struct obstack *argv_obstack) { - if (target_ilp32) - obstack_ptr_grow (argv_obstack, "-m32"); - else - obstack_ptr_grow (argv_obstack, "-m64"); + switch (offload_abi) + { + case OFFLOAD_ABI_LP64: + obstack_ptr_grow (argv_obstack, "-m64"); + break; + case OFFLOAD_ABI_ILP32: + obstack_ptr_grow (argv_obstack, "-m32"); + break; + default: + abort (); + } obstack_ptr_grow (argv_obstack, NULL); char **argv = XOBFINISH (argv_obstack, char **); @@ -379,10 +385,17 @@ generate_host_descr_file (const char *host_compiler) new_argv[new_argc++] = "-c"; new_argv[new_argc++] = "-fPIC"; new_argv[new_argc++] = "-shared"; - if (target_ilp32) - new_argv[new_argc++] = "-m32"; - else - new_argv[new_argc++] = "-m64"; + switch (offload_abi) + { + case OFFLOAD_ABI_LP64: + new_argv[new_argc++] = "-m64"; + break; + case OFFLOAD_ABI_ILP32: + new_argv[new_argc++] = "-m32"; + break; + default: + abort (); + } new_argv[new_argc++] = src_filename; new_argv[new_argc++] = "-o"; new_argv[new_argc++] = obj_filename; @@ -442,10 +455,17 @@ prepare_target_image (const char *target_compiler, int argc, char **argv) objcopy_argv[3] = "-I"; objcopy_argv[4] = "binary"; objcopy_argv[5] = "-O"; - if (target_ilp32) - objcopy_argv[6] = "elf32-i386"; - else - objcopy_argv[6] = "elf64-x86-64"; + switch (offload_abi) + { + case OFFLOAD_ABI_LP64: + objcopy_argv[6] = "elf64-x86-64"; + break; + case OFFLOAD_ABI_ILP32: + objcopy_argv[6] = "elf32-i386"; + break; + default: + abort (); + } objcopy_argv[7] = target_so_filename; objcopy_argv[8] = "--rename-section"; objcopy_argv[9] = rename_section_opt; @@ -518,17 +538,22 @@ main (int argc, char **argv) passed with @file. Expand them into argv before processing. */ expandargv (&argc, &argv); - /* Find out whether we should compile binaries for i386 or x86-64. */ - for (int i = argc - 1; i > 0; i--) - if (strncmp (argv[i], "-foffload-abi=", sizeof ("-foffload-abi=") - 1) == 0) - { - if (strstr (argv[i], "ilp32")) - target_ilp32 = true; - else if (!strstr (argv[i], "lp64")) - fatal_error (input_location, - "unrecognizable argument of option -foffload-abi"); - break; - } + /* Scan the argument vector. */ + for (int i = 1; i < argc; i++) + { +#define STR "-foffload-abi=" + if (strncmp (argv[i], STR, strlen (STR)) == 0) + { + if (strcmp (argv[i] + strlen (STR), "lp64") == 0) + offload_abi = OFFLOAD_ABI_LP64; + else if (strcmp (argv[i] + strlen (STR), "ilp32") == 0) + offload_abi = OFFLOAD_ABI_ILP32; + else + fatal_error (input_location, + "unrecognizable argument of option " STR); + } +#undef STR + } const char *target_so_filename = prepare_target_image (target_compiler, argc, argv); @@ -541,10 +566,17 @@ main (int argc, char **argv) const char *new_argv[9]; new_argv[new_argc++] = "ld"; new_argv[new_argc++] = "-m"; - if (target_ilp32) - new_argv[new_argc++] = "elf_i386"; - else - new_argv[new_argc++] = "elf_x86_64"; + switch (offload_abi) + { + case OFFLOAD_ABI_LP64: + new_argv[new_argc++] = "elf_x86_64"; + break; + case OFFLOAD_ABI_ILP32: + new_argv[new_argc++] = "elf_i386"; + break; + default: + abort (); + } new_argv[new_argc++] = "--relocatable"; new_argv[new_argc++] = host_descr_filename; new_argv[new_argc++] = target_so_filename; diff --git gcc/config/nvptx/mkoffload.c gcc/config/nvptx/mkoffload.c index ba0454e..78ac8fe 100644 --- gcc/config/nvptx/mkoffload.c +++ gcc/config/nvptx/mkoffload.c @@ -126,8 +126,7 @@ static id_map *var_ids, **vars_tail = &var_ids; static const char *ptx_name; static const char *ptx_cfile_name; -/* Shows if we should compile binaries for i386 instead of x86-64. */ -bool target_ilp32 = false; +enum offload_abi offload_abi = OFFLOAD_ABI_UNSET; /* Delete tempfiles. */ @@ -920,7 +919,17 @@ 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); - obstack_ptr_grow (&argv_obstack, target_ilp32 ? "-m32" : "-m64"); + switch (offload_abi) + { + case OFFLOAD_ABI_LP64: + obstack_ptr_grow (&argv_obstack, "-m64"); + break; + case OFFLOAD_ABI_ILP32: + obstack_ptr_grow (&argv_obstack, "-m32"); + break; + default: + abort (); + } obstack_ptr_grow (&argv_obstack, infile); obstack_ptr_grow (&argv_obstack, "-c"); obstack_ptr_grow (&argv_obstack, "-o"); @@ -998,23 +1007,38 @@ main (int argc, char **argv) passed with @file. Expand them into argv before processing. */ expandargv (&argc, &argv); - /* Find out whether we should compile binaries for i386 or x86-64. */ - for (int i = argc - 1; i > 0; i--) - if (strncmp (argv[i], "-foffload-abi=", sizeof ("-foffload-abi=") - 1) == 0) - { - if (strstr (argv[i], "ilp32")) - target_ilp32 = true; - else if (!strstr (argv[i], "lp64")) - fatal_error (input_location, - "unrecognizable argument of option -foffload-abi"); - break; - } + /* Scan the argument vector. */ + for (int i = 1; i < argc; i++) + { +#define STR "-foffload-abi=" + if (strncmp (argv[i], STR, strlen (STR)) == 0) + { + if (strcmp (argv[i] + strlen (STR), "lp64") == 0) + offload_abi = OFFLOAD_ABI_LP64; + else if (strcmp (argv[i] + strlen (STR), "ilp32") == 0) + offload_abi = OFFLOAD_ABI_ILP32; + else + fatal_error (input_location, + "unrecognizable argument of option " STR); + } +#undef STR + } struct obstack argv_obstack; obstack_init (&argv_obstack); obstack_ptr_grow (&argv_obstack, driver); obstack_ptr_grow (&argv_obstack, "-xlto"); - obstack_ptr_grow (&argv_obstack, target_ilp32 ? "-m32" : "-m64"); + switch (offload_abi) + { + case OFFLOAD_ABI_LP64: + obstack_ptr_grow (&argv_obstack, "-m64"); + break; + case OFFLOAD_ABI_ILP32: + obstack_ptr_grow (&argv_obstack, "-m32"); + break; + default: + abort (); + } obstack_ptr_grow (&argv_obstack, "-S"); for (int ix = 1; ix != argc; ix++) @@ -1033,7 +1057,7 @@ main (int argc, char **argv) /* PR libgomp/65099: Currently, we only support offloading in 64-bit configurations. */ - if (!target_ilp32) + if (offload_abi == OFFLOAD_ABI_LP64) { ptx_name = make_temp_file (".mkoffload"); obstack_ptr_grow (&argv_obstack, "-o");