From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 8620 invoked by alias); 3 Jul 2018 19:20:13 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Received: (qmail 8605 invoked by uid 89); 3 Jul 2018 19:20:12 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.4 required=5.0 tests=BAYES_00,GIT_PATCH_0,GIT_PATCH_1,GIT_PATCH_2,GIT_PATCH_3,KAM_NUMSUBJECT,SPF_PASS autolearn=ham version=3.3.2 spammy=recommendations, 69,10, 6910, meat X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 03 Jul 2018 19:20:10 +0000 Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 37D8CAD57; Tue, 3 Jul 2018 19:20:08 +0000 (UTC) Subject: Re: [PATCH 2/3] Temporary remove "at least 8 byte alignment" code from x86 To: Jeff Law , gcc-patches@gcc.gnu.org Cc: dvlasenk@redhat.com References: <485adeb2d68d918b8780592fff4c900c9327fc34.1527245880.git.mliska@suse.cz> <3c1a051c-e81f-9392-a710-a1e69d6c2e10@redhat.com> From: =?UTF-8?Q?Martin_Li=c5=a1ka?= Message-ID: <69289ded-7415-d4d0-bb2f-d694259936b5@suse.cz> Date: Tue, 03 Jul 2018 19:20:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <3c1a051c-e81f-9392-a710-a1e69d6c2e10@redhat.com> Content-Type: multipart/mixed; boundary="------------F0EDAC0007FD640231B5C35A" X-IsSubscribed: yes X-SW-Source: 2018-07/txt/msg00149.txt.bz2 This is a multi-part message in MIME format. --------------F0EDAC0007FD640231B5C35A Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: 7bit Content-length: 848 On 06/13/2018 04:02 AM, Jeff Law wrote: > On 05/21/2018 07:55 AM, marxin wrote: >> >> gcc/ChangeLog: >> >> 2017-04-18 Denys Vlasenko >> >> * config/i386/i386-common.c (ix86_handle_option): Remove support >> for obsolete -malign-loops, -malign-jumps and -malign-functions >> options. >> * config/i386/i386.opt: Likewise. > The ChangeLog doesn't seem match the actual changes. I think this patch > is more about using the additional info that's potentially provided by > the -falign options to drive backend decisions and dropping the > secondary alignment request. Hi. Exactly. > > The change seems to consistently do: > > (1<<(LOG)))-1) > > Which needs some horizontal whitespace. Fixed in updated version of the patch. Martin > > The meat of the changes seem fairly reasonable. > > jeff > --------------F0EDAC0007FD640231B5C35A Content-Type: text/x-patch; name="0001-Temporary-remove-at-least-8-byte-alignment-code-from.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename*0="0001-Temporary-remove-at-least-8-byte-alignment-code-from.pa"; filename*1="tch" Content-length: 12560 >From d4e3c9f6438dd665a5e1802c625dbbd7742cb52f Mon Sep 17 00:00:00 2001 From: marxin Date: Mon, 21 May 2018 15:55:09 +0200 Subject: [PATCH] Temporary remove "at least 8 byte alignment" code from x86 gcc/ChangeLog: 2017-04-18 Denys Vlasenko * config/i386/dragonfly.h: (ASM_OUTPUT_MAX_SKIP_ALIGN): Use a simpler align directive also if MAXSKIP = ALIGN-1. * config/i386/gas.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Likewise. * config/i386/lynx.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Likewise. * config/i386/netbsd-elf.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Likewise. * config/i386/i386.h (ASM_OUTPUT_MAX_SKIP_PAD): Likewise. * config/i386/freebsd.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Remove "If N is large, do at least 8 byte alignment" code. Add SUBALIGN_LOG define. Use a simpler align directive also if MAXSKIP = ALIGN-1. * config/i386/gnu-user.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Likewise. * config/i386/iamcu.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Likewise. * config/i386/openbsdelf.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Likewise. * config/i386/x86-64.h (ASM_OUTPUT_MAX_SKIP_ALIGN): Likewise. --- gcc/config/i386/dragonfly.h | 10 ++++++---- gcc/config/i386/freebsd.h | 16 +++++----------- gcc/config/i386/gas.h | 12 +++++++----- gcc/config/i386/gnu-user.h | 16 +++++----------- gcc/config/i386/i386.h | 2 +- gcc/config/i386/iamcu.h | 16 +++++----------- gcc/config/i386/lynx.h | 6 ++++-- gcc/config/i386/netbsd-elf.h | 6 ++++-- gcc/config/i386/openbsdelf.h | 16 +++++----------- gcc/config/i386/x86-64.h | 16 ++++++---------- 10 files changed, 48 insertions(+), 68 deletions(-) diff --git a/gcc/config/i386/dragonfly.h b/gcc/config/i386/dragonfly.h index a05b36435de..40774c0cf7a 100644 --- a/gcc/config/i386/dragonfly.h +++ b/gcc/config/i386/dragonfly.h @@ -69,10 +69,12 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see #ifdef HAVE_GAS_MAX_SKIP_P2ALIGN #undef ASM_OUTPUT_MAX_SKIP_ALIGN -#define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE, LOG, MAX_SKIP) \ - if ((LOG) != 0) { \ - if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ - else fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ +#define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE, LOG, MAX_SKIP) \ + if ((LOG) != 0) { \ + if ((MAX_SKIP) == 0 || (MAX_SKIP) >= (1 << (LOG)) - 1) \ + fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else \ + fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ } #endif diff --git a/gcc/config/i386/freebsd.h b/gcc/config/i386/freebsd.h index 0f38e6d859a..caac6b38575 100644 --- a/gcc/config/i386/freebsd.h +++ b/gcc/config/i386/freebsd.h @@ -92,25 +92,19 @@ along with GCC; see the file COPYING3. If not see /* A C statement to output to the stdio stream FILE an assembler command to advance the location counter to a multiple of 1<= (1 << (LOG)) - 1) \ + fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else \ fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ - /* Make sure that we have at least 8 byte alignment if > 8 byte \ - alignment is preferred. */ \ - if ((LOG) > 3 \ - && (1 << (LOG)) > ((MAX_SKIP) + 1) \ - && (MAX_SKIP) >= 7) \ - fputs ("\t.p2align 3\n", (FILE)); \ - } \ } \ } while (0) #endif diff --git a/gcc/config/i386/gas.h b/gcc/config/i386/gas.h index 25d5f7809b5..e149ab1360c 100644 --- a/gcc/config/i386/gas.h +++ b/gcc/config/i386/gas.h @@ -57,7 +57,7 @@ along with GCC; see the file COPYING3. If not see #ifdef HAVE_GAS_BALIGN_AND_P2ALIGN #undef ASM_OUTPUT_ALIGN #define ASM_OUTPUT_ALIGN(FILE,LOG) \ - if ((LOG)!=0) fprintf ((FILE), "\t.balign %d\n", 1<<(LOG)) + if ((LOG)!=0) fprintf ((FILE), "\t.balign %d\n", 1 << (LOG)) #endif /* A C statement to output to the stdio stream FILE an assembler @@ -68,10 +68,12 @@ along with GCC; see the file COPYING3. If not see #ifdef HAVE_GAS_MAX_SKIP_P2ALIGN # define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE,LOG,MAX_SKIP) \ - if ((LOG) != 0) {\ - if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ - else fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ - } + if ((LOG) != 0) { \ + if ((MAX_SKIP) == 0 || (MAX_SKIP) >= (1<<(LOG))-1) \ + fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else \ + fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ + } #endif /* A C statement or statements which output an assembler instruction diff --git a/gcc/config/i386/gnu-user.h b/gcc/config/i386/gnu-user.h index 56449a5439e..a922c9b93fa 100644 --- a/gcc/config/i386/gnu-user.h +++ b/gcc/config/i386/gnu-user.h @@ -95,24 +95,18 @@ along with GCC; see the file COPYING3. If not see /* A C statement to output to the stdio stream FILE an assembler command to advance the location counter to a multiple of 1<= (1 << (LOG)) - 1) \ + fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else \ fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ - /* Make sure that we have at least 8 byte alignment if > 8 byte \ - alignment is preferred. */ \ - if ((LOG) > 3 \ - && (1 << (LOG)) > ((MAX_SKIP) + 1) \ - && (MAX_SKIP) >= 7) \ - fputs ("\t.p2align 3\n", (FILE)); \ - } \ } \ } while (0) #endif diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index 049760efe34..fbba598ffd5 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -2201,7 +2201,7 @@ extern int const svr4_dbx_register_map[FIRST_PSEUDO_REGISTER]; #define ASM_OUTPUT_MAX_SKIP_PAD(FILE, LOG, MAX_SKIP) \ if ((LOG) != 0) \ { \ - if ((MAX_SKIP) == 0) \ + if ((MAX_SKIP) == 0 || (MAX_SKIP) >= (1 << (LOG)) - 1) \ fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ else \ fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ diff --git a/gcc/config/i386/iamcu.h b/gcc/config/i386/iamcu.h index b30132f377a..4e7c56967a5 100644 --- a/gcc/config/i386/iamcu.h +++ b/gcc/config/i386/iamcu.h @@ -62,23 +62,17 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see /* A C statement to output to the stdio stream FILE an assembler command to advance the location counter to a multiple of 1<= (1 << (LOG)) - 1) \ + fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else \ fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ - /* Make sure that we have at least 8 byte alignment if > 8 byte \ - alignment is preferred. */ \ - if ((LOG) > 3 \ - && (1 << (LOG)) > ((MAX_SKIP) + 1) \ - && (MAX_SKIP) >= 7) \ - fputs ("\t.p2align 3\n", (FILE)); \ - } \ } \ } while (0) diff --git a/gcc/config/i386/lynx.h b/gcc/config/i386/lynx.h index 404a25104f8..6f4013eb74b 100644 --- a/gcc/config/i386/lynx.h +++ b/gcc/config/i386/lynx.h @@ -61,8 +61,10 @@ along with GCC; see the file COPYING3. If not see #define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE,LOG,MAX_SKIP) \ do { \ if ((LOG) != 0) { \ - if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ - else fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ + if ((MAX_SKIP) == 0 || (MAX_SKIP) >= (1 << (LOG)) - 1) \ + fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else \ + fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ } \ } while (0) #endif diff --git a/gcc/config/i386/netbsd-elf.h b/gcc/config/i386/netbsd-elf.h index c1c1e0390bb..1aa96cd7c89 100644 --- a/gcc/config/i386/netbsd-elf.h +++ b/gcc/config/i386/netbsd-elf.h @@ -104,8 +104,10 @@ along with GCC; see the file COPYING3. If not see #ifdef HAVE_GAS_MAX_SKIP_P2ALIGN #define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE, LOG, MAX_SKIP) \ if ((LOG) != 0) { \ - if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ - else fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ + if ((MAX_SKIP) == 0 || (MAX_SKIP) >= (1 << (LOG)) - 1) \ + fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else \ + fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ } #endif diff --git a/gcc/config/i386/openbsdelf.h b/gcc/config/i386/openbsdelf.h index 8de1b99653b..705e904e9ab 100644 --- a/gcc/config/i386/openbsdelf.h +++ b/gcc/config/i386/openbsdelf.h @@ -63,24 +63,18 @@ along with GCC; see the file COPYING3. If not see /* A C statement to output to the stdio stream FILE an assembler command to advance the location counter to a multiple of 1<= (1 << (LOG)) - 1) \ + fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else \ fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ - /* Make sure that we have at least 8 byte alignment if > 8 byte \ - alignment is preferred. */ \ - if ((LOG) > 3 \ - && (1 << (LOG)) > ((MAX_SKIP) + 1) \ - && (MAX_SKIP) >= 7) \ - fputs ("\t.p2align 3\n", (FILE)); \ - } \ } \ } while (0) #endif diff --git a/gcc/config/i386/x86-64.h b/gcc/config/i386/x86-64.h index e2a8306c9fa..66bbd5edc59 100644 --- a/gcc/config/i386/x86-64.h +++ b/gcc/config/i386/x86-64.h @@ -61,27 +61,23 @@ see the files COPYING3 and COPYING.RUNTIME respectively. If not, see /* This is used to align code labels according to Intel recommendations. */ +#define SUBALIGN_LOG 3 + #ifdef HAVE_GAS_MAX_SKIP_P2ALIGN #define ASM_OUTPUT_MAX_SKIP_ALIGN(FILE,LOG,MAX_SKIP) \ do { \ if ((LOG) != 0) { \ - if ((MAX_SKIP) == 0) fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ - else { \ + if ((MAX_SKIP) == 0 || (MAX_SKIP) >= (1 << (LOG)) - 1) \ + fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ + else \ fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ - /* Make sure that we have at least 8 byte alignment if > 8 byte \ - alignment is preferred. */ \ - if ((LOG) > 3 \ - && (1 << (LOG)) > ((MAX_SKIP) + 1) \ - && (MAX_SKIP) >= 7) \ - fputs ("\t.p2align 3\n", (FILE)); \ - } \ } \ } while (0) #undef ASM_OUTPUT_MAX_SKIP_PAD #define ASM_OUTPUT_MAX_SKIP_PAD(FILE, LOG, MAX_SKIP) \ if ((LOG) != 0) \ { \ - if ((MAX_SKIP) == 0) \ + if ((MAX_SKIP) == 0 || (MAX_SKIP) >= (1<<(LOG))-1) \ fprintf ((FILE), "\t.p2align %d\n", (LOG)); \ else \ fprintf ((FILE), "\t.p2align %d,,%d\n", (LOG), (MAX_SKIP)); \ -- 2.18.0 --------------F0EDAC0007FD640231B5C35A--