From patchwork Mon May 25 14:13:18 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Martin Jambor X-Patchwork-Id: 1297361 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=8.43.85.97; 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.cz Received: from sourceware.org (server2.sourceware.org [8.43.85.97]) (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 49VzbC2hp4z9sSx for ; Tue, 26 May 2020 00:13:26 +1000 (AEST) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id E31CC3890426; Mon, 25 May 2020 14:13:23 +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 71B4D3890401 for ; Mon, 25 May 2020 14:13:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 71B4D3890401 Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=suse.cz Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=mjambor@suse.cz X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx2.suse.de (Postfix) with ESMTP id 067D0AF95; Mon, 25 May 2020 14:13:22 +0000 (UTC) From: Martin Jambor To: GCC Patches Subject: BRIG FE testsuite: Fix dump scan patterns in packed.hsail test User-Agent: Notmuch/0.29.3 (https://notmuchmail.org) Emacs/26.3 (x86_64-suse-linux-gnu) Date: Mon, 25 May 2020 16:13:18 +0200 Message-ID: MIME-Version: 1.0 X-Spam-Status: No, score=-3043.1 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_STATUS, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SCC_5_SHORT_WORD_LINES, 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: , Cc: Pekka =?utf-8?b?SsOkw6Rza2Vsw6RpbmVu?= Errors-To: gcc-patches-bounces@gcc.gnu.org Sender: "Gcc-patches" Hi, Starting with r11-165-eb72dc663e9 which converted DECL_GIMPLE_REG_P to DECL_NOT_GIMPLE_REG_P we have failing BRIG testcase: -PASS: packed.hsail.brig scan-tree-dump gimple "_[0-9]+ = q2 \\+ q3;" -PASS: packed.hsail.brig scan-tree-dump gimple "= VEC_PERM_EXPR ;" +FAIL: packed.hsail.brig scan-tree-dump gimple "_[0-9]+ = q2 \\+ q3;" +FAIL: packed.hsail.brig scan-tree-dump gimple "= VEC_PERM_EXPR ;" because the gimplifier is now smarter and generates nicer code, which however, does not match the regexp in the testsuite: --- before/packed.hsail.brig.005t.gimple 2020-05-12 17:59:26.434305513 +0200 +++ after/packed.hsail.brig.005t.gimple 2020-05-12 17:52:34.477055987 +0200 @@ -109,277 +109,267 @@ q2 = q1 + _24; _25 = VEC_PERM_EXPR ; q3 = q2 + _25; - _26 = q2 + q3; - new_output.11 = _26; - new_output.21_27 = new_output.11; - _28 = VEC_PERM_EXPR ; - s_output.12 = _28; + new_output.11 = q2 + q3; + s_output.12 = VEC_PERM_EXPR ; q4 = s_output.12; I have looked at the SSA dump and verified that the variable in question is a gimple register because it gets its SSA name. I have not looked into why the gimplifier previously thought it had to go through the additional temporaries though. Tested with make -k check-brig. Pushed to master. * brig.dg/test/gimple/packed.hsail: Fix scan dump patterns. --- gcc/testsuite/ChangeLog | 4 ++++ gcc/testsuite/brig.dg/test/gimple/packed.hsail | 4 ++-- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index dfb92ec5748..58521437e2d 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,7 @@ +2020-05-25 Martin Jambor + + * brig.dg/test/gimple/packed.hsail: Fix scan dump patterns. + 2020-05-25 Richard Biener PR tree-optimization/95308 diff --git a/gcc/testsuite/brig.dg/test/gimple/packed.hsail b/gcc/testsuite/brig.dg/test/gimple/packed.hsail index 9137490b2ab..1e2bb53de0d 100644 --- a/gcc/testsuite/brig.dg/test/gimple/packed.hsail +++ b/gcc/testsuite/brig.dg/test/gimple/packed.hsail @@ -61,10 +61,10 @@ prog kernel &Kernel(kernarg_u64 %input_ptr, kernarg_u64 %output_ptr) /* For the add_ss we assume performing the computation over the whole vector is cheaper than */ /* extracting the scalar and performing a scalar operation. This aims to stay in the vector /* datapath as long as possible. */ -/* { dg-final { scan-tree-dump "_\[0-9\]+ = q2 \\\+ q3;" "gimple" } } */ +/* { dg-final { scan-tree-dump "new_output.\[0-9\]+ = q2 \\\+ q3;" "gimple" } } */ /* Insert the lowest element of the result to the lowest element of the result register. */ -/* { dg-final { scan-tree-dump "= VEC_PERM_EXPR ;" "gimple" } } */ +/* { dg-final { scan-tree-dump "= VEC_PERM_EXPR ;" "gimple" } } */ /* FIXME */ /* { dg-final { scan-tree-dump "q4 = \(VIEW_CONVERT_EXPR\\\()?s_output.\[0-9\]+\(_\[0-9\]+\)*\\\)?;" "gimple" } } */ -- 2.26.2