From patchwork Wed May 2 20:07:21 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tom de Vries X-Patchwork-Id: 907685 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-477141-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=mentor.com Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="sdgFRJAt"; 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 40bq7x3YGMz9s4q for ; Thu, 3 May 2018 06:07: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 :subject:from:to:cc:references:message-id:date:mime-version :in-reply-to:content-type; q=dns; s=default; b=YNbbw0qOBsggb0EKX l6Eaig25c/Ak+Aj3iyVjnlfS4gHZfKCmROn3CurLu39WO/aEdKpr4AfWP34ODCkz AbUpQdZ5jXUi/tHdA6fIlOeXttL011hWduDJUSlaTpKeQZ3Gm6+pRwdAQTT2AeTl miChOnAs02p3oCiU6VKAVDhigk= 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 :subject:from:to:cc:references:message-id:date:mime-version :in-reply-to:content-type; s=default; bh=VdLRV7enu/96NIgzZX2FfMe k0eI=; b=sdgFRJAtv0jN+31R+nWGolHRVoi3XYSVoaofEjm0KWvY8hw/32mgrKV YpWIDVq9G8WtSz0naItzK5hN1slnsyrmfVY5iQ+tDLu9uVL7PLnX9GOzXNvHiUc/ ZZpjrC5jXU2ASEkbVZhTDySFugzf4C324N2TFBllE1VNp6RqKUXs= Received: (qmail 92147 invoked by alias); 2 May 2018 20:07:32 -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 92119 invoked by uid 89); 2 May 2018 20:07:31 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-24.9 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, RCVD_IN_DNSWL_NONE, SPF_PASS, URIBL_RED autolearn=ham version=3.3.2 spammy= X-HELO: relay1.mentorg.com Received: from relay1.mentorg.com (HELO relay1.mentorg.com) (192.94.38.131) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 02 May 2018 20:07:29 +0000 Received: from nat-ies.mentorg.com ([192.94.31.2] helo=SVR-IES-MBX-04.mgc.mentorg.com) by relay1.mentorg.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-SHA384:256) id 1fDy2A-0003SH-Jo from Tom_deVries@mentor.com ; Wed, 02 May 2018 13:07:26 -0700 Received: from [172.30.73.40] (137.202.0.87) by SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) with Microsoft SMTP Server (TLS) id 15.0.1320.4; Wed, 2 May 2018 21:07:22 +0100 Subject: [testsuite] Add scan-offload-tree-dump From: Tom de Vries To: Jakub Jelinek CC: Richard Biener , GCC Patches References: <577d48e8-0290-fb54-eca1-e9f845114e1e@mentor.com> Message-ID: Date: Wed, 2 May 2018 22:07:21 +0200 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.7.0 MIME-Version: 1.0 In-Reply-To: <577d48e8-0290-fb54-eca1-e9f845114e1e@mentor.com> X-ClientProxiedBy: svr-ies-mbx-01.mgc.mentorg.com (139.181.222.1) To SVR-IES-MBX-04.mgc.mentorg.com (139.181.222.4) [ was: [PATCH, 0/2] Add scan-ltrans-tree-dump and scan-wpa-ipa-dump ] Likewise, this patch adds scan-offload-tree-dump, and uses it in testsuite/libgomp.oacc-c/vec.c, fixing the todo there. [ The discussion on how to address to todo started here ( https://gcc.gnu.org/ml/gcc-patches/2017-06/msg00319.html ). ] OK for trunk? Thanks, - Tom [testsuite] Add scan-offload-tree-dump 2018-03-28 Tom de Vries PR testsuite/85106 * lib/scanoffloadtree.exp: New file. * testsuite/lib/libgomp-dg.exp (libgomp-dg-test): Add save-temps to extra_tool_flags if it contains an -foffload=-fdump-* flag. * testsuite/lib/libgomp.exp: Include scanoffloadtree.exp. * testsuite/libgomp.oacc-c/vec.c: Use scan-offload-tree-dump. * doc/sourcebuild.texi (Commands for use in dg-final, Scan optimization dump files): Add offload-tree. --- gcc/doc/sourcebuild.texi | 2 +- gcc/testsuite/lib/scanoffloadtree.exp | 147 +++++++++++++++++++++++++++++++++ libgomp/testsuite/lib/libgomp-dg.exp | 8 ++ libgomp/testsuite/lib/libgomp.exp | 1 + libgomp/testsuite/libgomp.oacc-c/vec.c | 6 +- 5 files changed, 159 insertions(+), 5 deletions(-) diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index 16164ae..4605a49 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -2589,7 +2589,7 @@ assembly output. @subsubsection Scan optimization dump files These commands are available for @var{kind} of @code{tree}, @code{ltrans-tree}, -@code{rtl}, @code{ipa}, and @code{wpa-ipa}. +@code{offload-tree}, @code{rtl}, @code{ipa}, and @code{wpa-ipa}. @table @code @item scan-@var{kind}-dump @var{regex} @var{suffix} [@{ target/xfail @var{selector} @}] diff --git a/gcc/testsuite/lib/scanoffloadtree.exp b/gcc/testsuite/lib/scanoffloadtree.exp new file mode 100644 index 0000000..ee92c2b --- /dev/null +++ b/gcc/testsuite/lib/scanoffloadtree.exp @@ -0,0 +1,147 @@ +# Copyright (C) 2018 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with GCC; see the file COPYING3. If not see +# . + +# Various utilities for scanning offloading tree dump output, used by +# libgomp.exp. + +load_lib scandump.exp + +# Utility for scanning compiler result, invoked via dg-final. +# Call pass if pattern is present, otherwise fail. +# +# Argument 0 is the regexp to match +# Argument 1 is the name of the dumped tree pass +# Argument 2 handles expected failures and the like +proc scan-offload-tree-dump { args } { + + if { [llength $args] < 2 } { + error "scan-offload-tree-dump: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-offload-tree-dump: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump "offload-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]t.[lindex $args 1]" ".o" \ + [lindex $args 2] + } else { + scan-dump "offload-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]t.[lindex $args 1]" ".o" + } +} + +# Call pass if pattern is present given number of times, otherwise fail. +# Argument 0 is the regexp to match +# Argument 1 is number of times the regexp must be found +# Argument 2 is the name of the dumped tree pass +# Argument 3 handles expected failures and the like +proc scan-offload-tree-dump-times { args } { + + if { [llength $args] < 3 } { + error "scan-offload-tree-dump-times: too few arguments" + return + } + if { [llength $args] > 4 } { + error "scan-offload-tree-dump-times: too many arguments" + return + } + if { [llength $args] >= 4 } { + scan-dump-times "offload-tree" [lindex $args 0] [lindex $args 1] \ + "\[0-9\]\[0-9\]\[0-9]t.[lindex $args 2]" ".o" \ + [lindex $args 3] + } else { + scan-dump-times "offload-tree" [lindex $args 0] [lindex $args 1] \ + "\[0-9\]\[0-9\]\[0-9]t.[lindex $args 2]" ".o" + } +} + +# Call pass if pattern is not present, otherwise fail. +# +# Argument 0 is the regexp to match +# Argument 1 is the name of the dumped tree pass +# Argument 2 handles expected failures and the like +proc scan-offload-tree-dump-not { args } { + + if { [llength $args] < 2 } { + error "scan-offload-tree-dump-not: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-offload-tree-dump-not: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump-not "offload-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]t.[lindex $args 1]" ".o" \ + [lindex $args 2] + } else { + scan-dump-not "offload-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]t.[lindex $args 1]" ".o" + } +} + +# Utility for scanning demangled compiler result, invoked via dg-final. +# Call pass if pattern is present, otherwise fail. +# +# Argument 0 is the regexp to match +# Argument 1 is the name of the dumped tree pass +# Argument 2 handles expected failures and the like +proc scan-offload-tree-dump-dem { args } { + + if { [llength $args] < 2 } { + error "scan-offload-tree-dump-dem: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-offload-tree-dump-dem: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump-dem "offload-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]t.[lindex $args 1]" ".o" \ + [lindex $args 2] + } else { + scan-dump-dem "offload-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]t.[lindex $args 1]" ".o" + } +} + +# Call pass if demangled pattern is not present, otherwise fail. +# +# Argument 0 is the regexp to match +# Argument 1 is the name of the dumped tree pass +# Argument 2 handles expected failures and the like +proc scan-offload-tree-dump-dem-not { args } { + + if { [llength $args] < 2 } { + error "scan-offload-tree-dump-dem-not: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-offload-tree-dump-dem-not: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump-dem-not "offload-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]t.[lindex $args 1]" ".o" \ + [lindex $args 2] + } else { + scan-dump-dem-not "offload-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]t.[lindex $args 1]" ".o" + } +} diff --git a/libgomp/testsuite/lib/libgomp-dg.exp b/libgomp/testsuite/lib/libgomp-dg.exp index ebf78e1..726b924 100644 --- a/libgomp/testsuite/lib/libgomp-dg.exp +++ b/libgomp/testsuite/lib/libgomp-dg.exp @@ -1,4 +1,12 @@ proc libgomp-dg-test { prog do_what extra_tool_flags } { + # Force the dumpbase for test.c to test.o, such that scan-offload-*-dump + # will work. + foreach opt $extra_tool_flags { + if { [regexp ^-foffload=-fdump- $opt] } { + lappend extra_tool_flags "-save-temps" + } + } + return [gcc-dg-test-1 libgomp_target_compile $prog $do_what $extra_tool_flags] } diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index c694f17..8ac2446 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -30,6 +30,7 @@ load_gcc_lib scanlang.exp load_gcc_lib scanrtl.exp load_gcc_lib scantree.exp load_gcc_lib scanltranstree.exp +load_gcc_lib scanoffloadtree.exp load_gcc_lib scanipa.exp load_gcc_lib scanwpaipa.exp load_gcc_lib timeout-dg.exp diff --git a/libgomp/testsuite/libgomp.oacc-c/vec.c b/libgomp/testsuite/libgomp.oacc-c/vec.c index 79c1c17..608538f 100644 --- a/libgomp/testsuite/libgomp.oacc-c/vec.c +++ b/libgomp/testsuite/libgomp.oacc-c/vec.c @@ -1,6 +1,6 @@ /* { dg-skip-if "" { *-*-* } { "-O0" } { "" } } */ /* { dg-skip-if "" { *-*-* } { "*" } { "-DACC_MEM_SHARED=0" } } */ -/* { dg-additional-options "-std=c99 -ftree-slp-vectorize -foffload=-ftree-slp-vectorize -foffload=-fdump-tree-slp1 -foffload=-save-temps -save-temps" } */ +/* { dg-additional-options "-std=c99 -ftree-slp-vectorize -foffload=-fdump-tree-slp1" } */ #include #include @@ -43,6 +43,4 @@ main (void) return 0; } -/* Todo: make a scan-tree-dump variant that scans vec.o instead. */ -/* { dg-final { file copy -force [glob vec.o.*] [regsub \.o\. [glob vec.o.*] \.c\.] } } */ -/* { dg-final { scan-tree-dump "vector\\(2\\) long long unsigned int" "slp1" } } */ +/* { dg-final { scan-offload-tree-dump "vector\\(2\\) long long unsigned int" "slp1" } } */