From patchwork Fri Sep 14 16:03:51 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kyrill Tkachov X-Patchwork-Id: 969959 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-485653-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=foss.arm.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="jW58MSh2"; dkim-atps=neutral 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 42BgMF4VTdz9s3l for ; Sat, 15 Sep 2018 02:04:40 +1000 (AEST) 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:content-type; q= dns; s=default; b=nhstcBu/Y8mqkvBRMHb+IhD9qSWgL0IVJ+CG9NIRo68B8Q sGQDz6dfFe1REaGMbjHOAvIpbWTGQTt2/NyjclzNEVNVsSCnbyyuc4ivUc6WwZh5 iFV2CKtMOTgnLbvL7psEDxWnR2wgMbLOj22Yauj5+oLofxIImBPEzntsdZtuk= 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:content-type; s= default; bh=RfO5adTdby9oHtztUDCCsSD9bKs=; b=jW58MSh2TxJKcYE9l8Sz L4V2XkqOFpcel29qWlL8N0i9sHsoxqF9nDgZu4EaRACr3i8DgF3M0Onu/+XEUc6m K6ENRXnuotZ5PvqQNOBYz3/g/dV4xaQK4wHSetQ/rbHZ72jQHwnTeiOy3WcEDisu B82m7kmF4wrKyK7JeDQwQIw= Received: (qmail 39083 invoked by alias); 14 Sep 2018 16:03:57 -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 39036 invoked by uid 89); 14 Sep 2018 16:03:57 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-25.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 spammy= 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; Fri, 14 Sep 2018 16:03:55 +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 8493C80D for ; Fri, 14 Sep 2018 09:03:53 -0700 (PDT) Received: from [10.2.207.77] (e100706-lin.cambridge.arm.com [10.2.207.77]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 300CE3F557 for ; Fri, 14 Sep 2018 09:03:53 -0700 (PDT) Message-ID: <5B9BDBE7.6080101@foss.arm.com> Date: Fri, 14 Sep 2018 17:03:51 +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: "gcc-patches@gcc.gnu.org" Subject: [PATCH][AArch64][committed] Fix gcc.target/aarch64/combine_bfi_1.c Hi all, This test started failing because some of the functions in the combine dump that it scans uses a different pattern to match the same instruction: insv_regsi rather than aarch64_bfi. The code generation is still the same. The patch changes the scan to look for the actual instruction we want in the assembly. This fixes the test. Committing to trunk as obvious. Thanks, Kyrill 2018-09-14 Kyrylo Tkachov * gcc.target/aarch64/combine_bfi_1.c: Scan for bfi instruction rather than pattern name in combine dump. diff --git a/gcc/testsuite/gcc.target/aarch64/combine_bfi_1.c b/gcc/testsuite/gcc.target/aarch64/combine_bfi_1.c index 9cc3bdb3ddfc286bfb6c079aaba27fb5edb1806c..cee42ccafcce0e0524f30fa6857abd902ca5779a 100644 --- a/gcc/testsuite/gcc.target/aarch64/combine_bfi_1.c +++ b/gcc/testsuite/gcc.target/aarch64/combine_bfi_1.c @@ -1,5 +1,5 @@ /* { dg-do compile } */ -/* { dg-options "-O2 -fdump-rtl-combine" } */ +/* { dg-options "-O2" } */ int f1 (int x, int y) @@ -31,4 +31,4 @@ f5 (long long x, long long y) return (x & ~0xffffffffull) | (y & 0xffffffff); } -/* { dg-final { scan-rtl-dump-times "\\*aarch64_bfi" 5 "combine" } } */ +/* { dg-final { scan-assembler-times {\tbfi\t} 5 } } */