From patchwork Wed May 4 08:43:14 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyrill Tkachov X-Patchwork-Id: 618321 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 3r0BQt40VDz9t5w for ; Wed, 4 May 2016 18:43:50 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=yHjoK8db; 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 :message-id:date:from:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding; q=dns; s= default; b=w2dALgmqFKimxr+JRSsW8waEfSW294p01uq8/yvdO6vIlLiDUW6MD L828gDRA85PbFdkJQ3l5V5t//WPCB1nzIBIkVQyBczm1Kj7C5xspFp0i5huPP5dj OyRTtqJjEpsY9QeztsDN/8CPJWDTjtC2ujPzksNVmmMiajffnRSN9k= 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 :message-id:date:from:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding; s=default; bh=khwTagF5an/eSiTfyYg49jit8g4=; b=yHjoK8dbwRisB3UI9MlLvKRJv2Dc QZTKFOyzFYeia1g4KNUgyt89yp8VOTw/PCFwa8FMHiYe302IkCJfWVlL8uYkBzS9 lMhS4jFos4rgK7Hef7SgRuHYa114F7PSdvIQAsTS6X+C2ejECjv7NN5ix2DLF8RU O8s1RtwKf+9QCPo= Received: (qmail 14885 invoked by alias); 4 May 2016 08:43:23 -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 14852 invoked by uid 89); 4 May 2016 08:43:20 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-3.0 required=5.0 tests=BAYES_00, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=Hx-languages-length:1591 X-HELO: foss.arm.com Received: from foss.arm.com (HELO foss.arm.com) (217.140.101.70) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 04 May 2016 08:43:18 +0000 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 155103A; Wed, 4 May 2016 01:43:23 -0700 (PDT) Received: from [10.2.206.43] (e100706-lin.cambridge.arm.com [10.2.206.43]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 4EF433F215; Wed, 4 May 2016 01:43:16 -0700 (PDT) Message-ID: <5729B622.1060001@foss.arm.com> Date: Wed, 04 May 2016 09:43:14 +0100 From: Kyrill Tkachov User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:31.0) Gecko/20100101 Thunderbird/31.2.0 MIME-Version: 1.0 To: Christophe Lyon , "gcc-patches@gcc.gnu.org" Subject: Re: [testuite,AArch64] Make scan for 'br' more robust References: In-Reply-To: Hi Christophe, On 02/05/16 12:50, Christophe Lyon wrote: > Hi, > > I've noticed a "regression" of AArch64's noplt_3.c in the gcc-6-branch > because my validation script adds the branch name to gcc/REVISION. > > As a result scan-assembler-times "br" also matched "gcc-6-branch", > hence the failure. > > The small attached patch replaces "br" by "br\t" to fix the problem. > > I've also made a similar change to tail_indirect_call_1 although the > problem did not happen for this test because it uses scan-assembler > instead of scan-assembler-times. I think it's better to make it more > robust too. > > OK? > > Christophe Kyrill diff --git a/gcc/testsuite/gcc.target/aarch64/noplt_3.c b/gcc/testsuite/gcc.target/aarch64/noplt_3.c index ef6e65d..a382618 100644 --- a/gcc/testsuite/gcc.target/aarch64/noplt_3.c +++ b/gcc/testsuite/gcc.target/aarch64/noplt_3.c @@ -16,5 +16,5 @@ cal_novalue (int a) dec (a); } -/* { dg-final { scan-assembler-times "br" 2 } } */ +/* { dg-final { scan-assembler-times "br\t" 2 } } */ /* { dg-final { scan-assembler-not "b\t" } } */ diff --git a/gcc/testsuite/gcc.target/aarch64/tail_indirect_call_1.c b/gcc/testsuite/gcc.target/aarch64/tail_indirect_call_1.c index 4759d20..e863323 100644 --- a/gcc/testsuite/gcc.target/aarch64/tail_indirect_call_1.c +++ b/gcc/testsuite/gcc.target/aarch64/tail_indirect_call_1.c @@ -3,7 +3,7 @@ typedef void FP (int); -/* { dg-final { scan-assembler "br" } } */ +/* { dg-final { scan-assembler "br\t" } } */ Did you mean to make this scan-assembler-times as well?