From patchwork Fri Jun 11 20:46:43 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "H.J. Lu" X-Patchwork-Id: 1491159 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha256 header.s=default header.b=b4eencw8; dkim-atps=neutral Received: from sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 4G1tFd1WDXz9sPf for ; Sat, 12 Jun 2021 06:47:32 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 7EC6739A903D for ; Fri, 11 Jun 2021 20:47:30 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 7EC6739A903D DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1623444450; bh=RevCPIV2sf046k4qGcBTh99C9EtEpXy19v/wgm3JcCs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=b4eencw8u1491FB6C+qciJxvxxRAYVq6AkSWwmkE1a8ppJDwXRbqF1yQbHeWNrUGP rdr1Ld4iYz/6NduT7GujxWllthLhne+RKofz7Pdw1EFoKDRguo3JT2BbHO76wgjTbc QGch78QpuRGv4RpOCtLjgQlma372ESDIumhjfoZ8= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-pl1-x62e.google.com (mail-pl1-x62e.google.com [IPv6:2607:f8b0:4864:20::62e]) by sourceware.org (Postfix) with ESMTPS id 22D4A3861843 for ; Fri, 11 Jun 2021 20:46:47 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 22D4A3861843 Received: by mail-pl1-x62e.google.com with SMTP id x10so3425540plg.3 for ; Fri, 11 Jun 2021 13:46:47 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=RevCPIV2sf046k4qGcBTh99C9EtEpXy19v/wgm3JcCs=; b=PHBZ0NWvodlQDLWwyTaiCLVM31eBiL4KUP8cbAb5IuS2T8Ud6tpCavqPwFPE6siJ2M Z7kbGCgZi/TGQzfVttE7nNCoVD4uM+48NECnPKMA/jLfYgVIA/p5lUkpfGFxoV46lXx3 IXdTXKBbamzMf5z0L+nmtwjjZjyUjcIJ9ETAERJPdtIPcdHdzy0TMaSVC1fNuEiznhna zTiGoWNm4f8qfsi/aD4goBoClZ/y4wIOmwqDZx0aPtMr257A1hUb1X3M8Sq5IBtUDgeU 2md57/f4HuzywjaJ+P8HO5T3dqBw7M+LPz+Y00xxCpF4PiPGaJCWTwUBw4pGf3f79/Kb qTOQ== X-Gm-Message-State: AOAM531qL3g6dhWSfY6GICAHnkSSfo7RZUPeuSAOS5UiY+EIb80waUd0 3vH5z1HrtrRRcSEI1vWHFVa/Gfeud7A= X-Google-Smtp-Source: ABdhPJzj9xrYG1AGxAzvcMx+qJ3VLGEKM6LPi4C3fMU1z8Fkm94Xwxsa5+ZItfcud1ldhArpC8ZnGA== X-Received: by 2002:a17:90a:fa10:: with SMTP id cm16mr1823492pjb.175.1623444405654; Fri, 11 Jun 2021 13:46:45 -0700 (PDT) Received: from gnu-cfl-2.localdomain ([172.56.39.115]) by smtp.gmail.com with ESMTPSA id cl4sm5528093pjb.32.2021.06.11.13.46.45 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 11 Jun 2021 13:46:45 -0700 (PDT) Received: from gnu-cfl-2.. (localhost [IPv6:::1]) by gnu-cfl-2.localdomain (Postfix) with ESMTP id CBE94C0137; Fri, 11 Jun 2021 13:46:43 -0700 (PDT) To: gcc-patches@gcc.gnu.org Subject: [PATCH] x86: Replace ix86_red_zone_size with ix86_red_zone_used Date: Fri, 11 Jun 2021 13:46:43 -0700 Message-Id: <20210611204643.253863-1-hjl.tools@gmail.com> X-Mailer: git-send-email 2.31.1 MIME-Version: 1.0 X-Spam-Status: No, score=-3033.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, FREEMAIL_FROM, GIT_PATCH_0, RCVD_IN_BARRACUDACENTRAL, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: "H.J. Lu via Gcc-patches" From: "H.J. Lu" Reply-To: "H.J. Lu" Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org Sender: "Gcc-patches" Add red_zone_used to machine_function to track if red zone is used. When expanding function prologue, set red_zone_used to true if red zone is used. gcc/ PR target/pr101023 * config/i386/i386.c (ix86_expand_prologue): Set red_zone_used to true if red zone is used. (ix86_output_indirect_jmp): Replace ix86_red_zone_size with ix86_red_zone_used. * config/i386/i386.h (machine_function): Add red_zone_used. (ix86_red_zone_size): Removed. (ix86_red_zone_used): New. * config/i386/i386.md (peephole2 patterns): Replace ix86_red_zone_size with ix86_red_zone_used. gcc/testsuite/ PR target/pr101023 * g++.target/i386/pr101023a.C: New test. * g++.target/i386/pr101023b.C: Likewise. --- gcc/config/i386/i386.c | 6 ++- gcc/config/i386/i386.h | 5 +- gcc/config/i386/i386.md | 8 +-- gcc/testsuite/g++.target/i386/pr101023a.C | 62 +++++++++++++++++++++++ gcc/testsuite/g++.target/i386/pr101023b.C | 5 ++ 5 files changed, 80 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/g++.target/i386/pr101023a.C create mode 100644 gcc/testsuite/g++.target/i386/pr101023b.C diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 05b8dc806cd..a61255857ff 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -8401,10 +8401,14 @@ ix86_expand_prologue (void) || frame.stack_pointer_offset < CHECK_STACK_LIMIT)) { ix86_emit_save_regs_using_mov (frame.reg_save_offset); + cfun->machine->red_zone_used = true; int_registers_saved = true; } } + if (frame.red_zone_size != 0) + cfun->machine->red_zone_used = true; + if (stack_realign_fp) { int align_bytes = crtl->stack_alignment_needed / BITS_PER_UNIT; @@ -15915,7 +15919,7 @@ ix86_output_indirect_jmp (rtx call_op) { /* We can't have red-zone since "call" in the indirect thunk pushes the return address onto stack, destroying red-zone. */ - if (ix86_red_zone_size != 0) + if (ix86_red_zone_used) gcc_unreachable (); ix86_output_indirect_branch (call_op, "%0", true); diff --git a/gcc/config/i386/i386.h b/gcc/config/i386/i386.h index 919d0b2418a..182b3275991 100644 --- a/gcc/config/i386/i386.h +++ b/gcc/config/i386/i386.h @@ -2663,6 +2663,9 @@ struct GTY(()) machine_function { invalid calls. */ BOOL_BITFIELD silent_p : 1; + /* True if red zone is used. */ + BOOL_BITFIELD red_zone_used : 1; + /* The largest alignment, in bytes, of stack slot actually used. */ unsigned int max_used_stack_alignment; @@ -2693,7 +2696,7 @@ extern GTY(()) tree ms_va_list_type_node; #define ix86_current_function_calls_tls_descriptor \ (ix86_tls_descriptor_calls_expanded_in_cfun && df_regs_ever_live_p (SP_REG)) #define ix86_static_chain_on_stack (cfun->machine->static_chain_on_stack) -#define ix86_red_zone_size (cfun->machine->frame.red_zone_size) +#define ix86_red_zone_used (cfun->machine->red_zone_used) /* Control behavior of x86_file_start. */ #define X86_FILE_START_VERSION_DIRECTIVE false diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md index 7743c61ec86..6e4abf32e7c 100644 --- a/gcc/config/i386/i386.md +++ b/gcc/config/i386/i386.md @@ -20491,7 +20491,7 @@ (define_peephole2 (clobber (mem:BLK (scratch)))])] "(TARGET_SINGLE_PUSH || optimize_insn_for_size_p ()) && INTVAL (operands[0]) == -GET_MODE_SIZE (word_mode) - && ix86_red_zone_size == 0" + && !ix86_red_zone_used" [(clobber (match_dup 1)) (parallel [(set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1)) (clobber (mem:BLK (scratch)))])]) @@ -20505,7 +20505,7 @@ (define_peephole2 (clobber (mem:BLK (scratch)))])] "(TARGET_DOUBLE_PUSH || optimize_insn_for_size_p ()) && INTVAL (operands[0]) == -2*GET_MODE_SIZE (word_mode) - && ix86_red_zone_size == 0" + && !ix86_red_zone_used" [(clobber (match_dup 1)) (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1)) (parallel [(set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1)) @@ -20520,7 +20520,7 @@ (define_peephole2 (clobber (reg:CC FLAGS_REG))])] "(TARGET_SINGLE_PUSH || optimize_insn_for_size_p ()) && INTVAL (operands[0]) == -GET_MODE_SIZE (word_mode) - && ix86_red_zone_size == 0" + && !ix86_red_zone_used" [(clobber (match_dup 1)) (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1))]) @@ -20532,7 +20532,7 @@ (define_peephole2 (clobber (reg:CC FLAGS_REG))])] "(TARGET_DOUBLE_PUSH || optimize_insn_for_size_p ()) && INTVAL (operands[0]) == -2*GET_MODE_SIZE (word_mode) - && ix86_red_zone_size == 0" + && !ix86_red_zone_used" [(clobber (match_dup 1)) (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1)) (set (mem:W (pre_dec:P (reg:P SP_REG))) (match_dup 1))]) diff --git a/gcc/testsuite/g++.target/i386/pr101023a.C b/gcc/testsuite/g++.target/i386/pr101023a.C new file mode 100644 index 00000000000..fbcce68beef --- /dev/null +++ b/gcc/testsuite/g++.target/i386/pr101023a.C @@ -0,0 +1,62 @@ +// PR target/101023 +// { dg-do run { target { ! ia32 } } } +// { dg-options "-O2 -mtune=opteron -mstackrealign --param=hot-bb-frequency-fraction=1" } + +struct S { + __attribute__((noipa)) int m1 (); + __attribute__((noipa)) void m2 (); +}; +struct T { + __attribute__((noipa)) virtual S m3 (); +}; +struct U : T { + int u; + __attribute__((noipa)) U (int); +}; +int *a; +S *b; +int c; + +int +S::m1 () +{ + return 0; +} + +void +S::m2 () +{ +} + +S +T::m3 () +{ + return S (); +} + +U::U (int) : u (4) +{ +} + +__attribute__((noipa)) int +foo () +{ + if (a) + return 0; + U d(c); + S *e = b; + e->m2 (); + return e->m1(); +} + +int +main () +{ + register int r12 __asm ("r12") = 1; + register int rax __asm ("rax") = 2; + asm volatile ("" : "+r" (r12), "+r" (rax)); + foo (); + asm volatile ("" : "+r" (r12)); + if (r12 != 1) + __builtin_abort (); +} diff --git a/gcc/testsuite/g++.target/i386/pr101023b.C b/gcc/testsuite/g++.target/i386/pr101023b.C new file mode 100644 index 00000000000..b19791c8ffb --- /dev/null +++ b/gcc/testsuite/g++.target/i386/pr101023b.C @@ -0,0 +1,5 @@ +// PR target/101023 +// { dg-do run { target { ! ia32 } } } +// { dg-options "-O2 -mno-red-zone -mtune=opteron -mstackrealign --param=hot-bb-frequency-fraction=1" } + +#include "pr101023a.C"