From patchwork Tue Sep 9 10:20:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alan Lawrence X-Patchwork-Id: 387243 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 09D2C14012A for ; Tue, 9 Sep 2014 20:20:25 +1000 (EST) 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:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=sF4GArUxyPjAalft3 oyMWvA6KVthdxtB3gGRblCuJolQBlFHZwGstfkYZUs4/yiGCY0HcsEsIf8lV0I0H NsxEGncwRpYgGwv8/Qk6s9sTLK/e8k5dFLu+zxRry5uQC5KSHAJxAFTYEQbBRtbk qZLbYwbFjUAqAG2jCAjvAt0TZ8= 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:cc:subject:references :in-reply-to:content-type; s=default; bh=zEZgdgLHHgBkK50ymIWfJsl u+F0=; b=HZkXM+/f/f3tI9V+QC/tCXzp+VQuCulpYHaOWzCHMN0rpmmjH7ISio4 tsl4EB6Sb+FPXIprayvMjlM758CRUBlaz7rhg85hrnwxUUSlwUrPM24ub+Fvxkdr LaLq6SR2sjdzqiYzNQaseRSLomyXx06JVMxxErT/1w1Mfo7i5rm4= Received: (qmail 17654 invoked by alias); 9 Sep 2014 10:20:12 -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 17558 invoked by uid 89); 9 Sep 2014 10:20:11 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL, BAYES_00, SPF_PASS autolearn=ham version=3.3.2 X-HELO: service87.mimecast.com Received: from service87.mimecast.com (HELO service87.mimecast.com) (91.220.42.44) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Tue, 09 Sep 2014 10:20:09 +0000 Received: from cam-owa1.Emea.Arm.com (fw-tnat.cambridge.arm.com [217.140.96.21]) by service87.mimecast.com; Tue, 09 Sep 2014 11:20:07 +0100 Received: from [10.1.209.51] ([10.1.255.212]) by cam-owa1.Emea.Arm.com with Microsoft SMTPSVC(6.0.3790.3959); Tue, 9 Sep 2014 11:20:06 +0100 Message-ID: <540ED455.7060402@arm.com> Date: Tue, 09 Sep 2014 11:20:05 +0100 From: Alan Lawrence User-Agent: Thunderbird 2.0.0.24 (X11/20101213) MIME-Version: 1.0 To: "gcc-patches@gcc.gnu.org" CC: Christophe Lyon Subject: [PATCH][AArch64 Testsuite]Fix scan-assembler test false alarm on aarch64-linux-gnu References: <53F32A86.4060109@arm.com> In-Reply-To: X-MC-Unique: 114090911200702501 X-IsSubscribed: yes The 'scan-assembler-not not' test in gcc.target/aarch64/simd/int_comparisons_1.c fails on aarch64-linux-gnu because the compiler adds a ".note" at the end of the .s file. This patch tightens the regex to only match a not with surrounding whitespace. (I've verified it still catches such if e.g. the changes to vcond_internal are reverted). Test now passing on aarch64-none-elf and aarch64-none-linux-gnu. gcc/testsuite/ChangeLog: * gcc.target/aarch64/simd/inc_comparisons_1.c: Tighten regexp. Christophe Lyon wrote: > Hi Alan, > > In my cross-testing I've noticed that your new test: > gcc.target/aarch64/simd/int_comparisons_1.c scan-assembler-not not > is PASS for targets aarch64-none-elf and aarch64_be-none-elf, but > FAIL for aarch64-none-linux-gnu. > > It seems this is not what you saw in your own validations? > > Christophe. > > > > On 2 September 2014 17:17, Marcus Shawcroft wrote: >> On 19 August 2014 11:44, Alan Lawrence wrote: >> >>> gcc/ChangeLog: >>> >>> * config/aarch64/aarch64-builtins.c (aarch64_types_cmtst_qualifiers, >>> TYPES_TST): Define. >>> (aarch64_fold_builtin): Update pattern for cmtst. >>> >>> * config/aarch64/aarch64-protos.h >>> (aarch64_const_vec_all_same_int_p): >>> Declare. >>> >>> * config/aarch64/aarch64-simd-builtins.def (cmtst): Update >>> qualifiers. >>> >>> * config/aarch64/aarch64-simd.md >>> (aarch64_vcond_internal): >>> Switch operands, separate out more cases, refactor. >>> >>> (aarch64_cmtst): Rewrite pattern to match (plus ... -1). >>> >>> * config/aarch64.c (aarch64_const_vec_all_same_int_p): Take single >>> argument; rename old version to... >>> (aarch64_const_vec_all_same_in_range_p): ...this. >>> (aarch64_print_operand, aarch64_simd_shift_imm_p): Follow renaming. >>> >>> * config/aarch64/predicates.md (aarch64_simd_imm_minus_one): Define. >>> >>> gcc/testsuite/ChangeLog: >>> >>> * gcc.target/aarch64/simd/int_comparisons.x: New file. >>> * gcc.target/aarch64/simd/int_comparisons_1.c: New test. >>> * gcc.target/aarch64/simd/int_comparisons_2.c: Ditto. >> OK /Marcus > diff --git a/gcc/testsuite/gcc.target/aarch64/simd/int_comparisons_1.c b/gcc/testsuite/gcc.target/aarch64/simd/int_comparisons_1.c index 86c6ed28538affcc4c3ef6cacd74d002e32b0931..cb0f4a04c0fb5f2c93064c47a141556f7fd0f89a 100644 --- a/gcc/testsuite/gcc.target/aarch64/simd/int_comparisons_1.c +++ b/gcc/testsuite/gcc.target/aarch64/simd/int_comparisons_1.c @@ -44,4 +44,4 @@ /* { dg-final { scan-assembler-times "\[ \t\](?:cmlt|sshr)\[ \t\]+d\[0-9\]+,\[ \t\]*d\[0-9\]+,\[ \t\]*#?(?:0|63)" 4 } } */ // All should have been compiled into single insns without inverting result: -/* { dg-final { scan-assembler-not "not" } } */ +/* { dg-final { scan-assembler-not "\[ \t\]not\[ \t\]" } } */