From patchwork Wed Dec 8 02:00:31 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alexandre Oliva X-Patchwork-Id: 48618 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id F37493858407 for ; Wed, 8 Dec 2021 02:01:36 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org F37493858407 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1638928897; bh=9JDIpGPzRQZQK4J6aBP2a/ay3tiIq6daIu3zqpHv51c=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:Cc:From; b=PMqlG4VsvYlRcSRs+f0ClWdtQmt0Ck6wEgTngB2E0vuRbaiHY05AJRZisiLgi6ITf bJuZqS7YR1OK9ENCePA050Es0iltYBBaQiY7Ars2xxoDfrFwYGp6ypf5U5GJIVJpLP /alN4ZlDt05WW7vLbG3m/NfaVQcwYUDMCxLcVWJo= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from rock.gnat.com (rock.gnat.com [IPv6:2620:20:4000:0:a9e:1ff:fe9b:1d1]) by sourceware.org (Postfix) with ESMTPS id C47693858423 for ; Wed, 8 Dec 2021 02:00:55 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org C47693858423 Received: from localhost (localhost.localdomain [127.0.0.1]) by filtered-rock.gnat.com (Postfix) with ESMTP id 1EB92116EE2; Tue, 7 Dec 2021 21:00:55 -0500 (EST) X-Virus-Scanned: Debian amavisd-new at gnat.com X-Amavis-Alert: BAD HEADER SECTION, Duplicate header field: "Cc" Received: from rock.gnat.com ([127.0.0.1]) by localhost (rock.gnat.com [127.0.0.1]) (amavisd-new, port 10024) with LMTP id TBBgD6t6YQYx; Tue, 7 Dec 2021 21:00:55 -0500 (EST) Received: from free.home (tron.gnat.com [IPv6:2620:20:4000:0:46a8:42ff:fe0e:e294]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by rock.gnat.com (Postfix) with ESMTPS id 7E758116EE1; Tue, 7 Dec 2021 21:00:54 -0500 (EST) Received: from livre (livre.home [172.31.160.2]) by free.home (8.15.2/8.15.2) with ESMTPS id 1B820V0w912151 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384 bits=256 verify=NOT); Tue, 7 Dec 2021 23:00:31 -0300 To: gcc-patches@gcc.gnu.org Subject: [PR103097] tolerate reg-stack cross-block malformed asms Organization: Free thinker, does not speak for AdaCore Date: Tue, 07 Dec 2021 23:00:31 -0300 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/25.2 (gnu/linux) MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 X-Spam-Status: No, score=-12.2 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, KAM_SHORT, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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: Alexandre Oliva via Gcc-patches From: Alexandre Oliva Reply-To: Alexandre Oliva Cc: hubicka@ucw.cz, asolokha@gmx.com Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" The testcase shows malformed asms in one block confuse reg-stack logic in another block. Moving the resetting of any_malformed_asm to the end of the pass enables it to take effect throughout the affected function. Regstrapped on x86_64-linux-gnu. Ok to install? for gcc/ChangeLog PR target/103097 * reg-stack.c (convert_regs_1): Move any_malformed_asm resetting... (reg_to_stack): ... here. for gcc/testsuite/ChangeLog PR target/103097 * gcc.target/i386/pr103097.c: New. --- gcc/reg-stack.c | 3 +-- gcc/testsuite/gcc.target/i386/pr103097.c | 30 ++++++++++++++++++++++++++++++ 2 files changed, 31 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/gcc.target/i386/pr103097.c diff --git a/gcc/reg-stack.c b/gcc/reg-stack.c index 1d9ea035cf44f..a83ee253777af 100644 --- a/gcc/reg-stack.c +++ b/gcc/reg-stack.c @@ -3014,8 +3014,6 @@ convert_regs_1 (basic_block block) bool cfg_altered = false; int debug_insns_with_starting_stack = 0; - any_malformed_asm = false; - /* Choose an initial stack layout, if one hasn't already been chosen. */ if (bi->stack_in.top == -2) { @@ -3385,6 +3383,7 @@ reg_to_stack (void) 0, sizeof (char) * (max_uid + 1)); convert_regs (); + any_malformed_asm = false; free_aux_for_blocks (); return true; diff --git a/gcc/testsuite/gcc.target/i386/pr103097.c b/gcc/testsuite/gcc.target/i386/pr103097.c new file mode 100644 index 0000000000000..2b7a307deec9a --- /dev/null +++ b/gcc/testsuite/gcc.target/i386/pr103097.c @@ -0,0 +1,30 @@ +/* { dg-do compile } */ +/* { dg-options "-O1 -fharden-conditional-branches" } */ + +/* This is a slightly simplified version of + gcc.target/s390/vector/long-double-asm-earlyclobber.c. On x86, the f + constraints in asm statements imposes some requirements that the testcase + doesn't meet. What's unusual is that -fharden-conditional-branches extends + the effects of the malformed asm onto a different basic blocks, which + reg-stack did not expect. */ + +#include +#include + +void +f (void) +{ + long double res, x = 0; + asm("" : "=f"(res) /* { dg-error "must specify a single register" } */ + : "0"(x)); + assert (res == x); +} + +void +g (void) +{ + long double res, x = 0; + asm("" : "=g"(res) /* this is ok. */ + : "0"(x)); + assert (res == x); +}