From patchwork Thu Sep 24 10:43:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 1370602 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@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de 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 4Bxs8R1qdhz9sS8 for ; Thu, 24 Sep 2020 20:43:19 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 768B73894C3F; Thu, 24 Sep 2020 10:43:16 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mx2.suse.de (mx2.suse.de [195.135.220.15]) by sourceware.org (Postfix) with ESMTPS id B4E223850408 for ; Thu, 24 Sep 2020 10:43:14 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org B4E223850408 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=tdevries@suse.de X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.221.27]) by mx2.suse.de (Postfix) with ESMTP id 849AEAC7D for ; Thu, 24 Sep 2020 10:43:51 +0000 (UTC) Date: Thu, 24 Sep 2020 12:43:12 +0200 From: Tom de Vries To: gcc-patches@gcc.gnu.org Subject: [committed][testsuite, nvptx] Fix string matching in gcc.dg/pr87314-1.c Message-ID: <20200924104310.GA28255@delia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-Spam-Status: No, score=-10.8 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, 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: , Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, with nvptx we run into: ... FAIL: gcc.dg/pr87314-1.c scan-assembler hellooo ... The required string is part of the assembly, just in a different format than expected: ... .const .align 1 .u8 $LC0[12] = { 104, 101, 108, 108, 111, 111, 111, 111, 98, 121, 101, 0 }; ... Fix this by adding an nvptx-specific scan-assembler directive. Tested on nvptx and x86_64. Committed to trunk. Thanks, - Tom [testsuite, nvptx] Fix string matching in gcc.dg/pr87314-1.c gcc/testsuite/ChangeLog: 2020-09-24 Tom de Vries * gcc.dg/pr87314-1.c: Add nvptx-specific scan-assembler directive. --- gcc/testsuite/gcc.dg/pr87314-1.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/gcc/testsuite/gcc.dg/pr87314-1.c b/gcc/testsuite/gcc.dg/pr87314-1.c index 9bc905612b5..0cb9c07e32c 100644 --- a/gcc/testsuite/gcc.dg/pr87314-1.c +++ b/gcc/testsuite/gcc.dg/pr87314-1.c @@ -8,4 +8,6 @@ int h() { return "bye"=="helloooobye"+8; } /* { dg-final { scan-tree-dump-times "hello" 1 "original" } } */ /* The test in h() should be retained because the result depends on string merging. */ -/* { dg-final { scan-assembler "hellooo" } } */ +/* { dg-final { scan-assembler "hellooo" { target { ! nvptx*-*-* } } } } */ +/* { dg-final { scan-assembler "104, 101, 108, 108, 111, 111, 111" { target { nvptx*-*-* } } } } */ +