From patchwork Wed Dec 19 14:26:57 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: 1016073 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-492814-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=suse.de Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="tRrmxfuW"; 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 43Kcf40b0wz9s55 for ; Thu, 20 Dec 2018 01:26:51 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:mime-version:content-type; q=dns; s=default; b=EKnyhsEyLFTuv0AA/2U7jD12tF3TCdCphzTnbBKF5ghcGWUIKz tJ+vGPVHfy8Ss2arql95LKvzCSNKje0FAo4bDaXCZFP1G8UhGehc3ukKrxgWWgfK i37r5JIiQCrufotODVXeFoXjTxwEU+qaXCOyq2zPMyC9uIWBfTFiOHmnI= 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:date :from:to:cc:subject:message-id:mime-version:content-type; s= default; bh=LOK3RiOYpgOXf95l50cJ1rJGtTs=; b=tRrmxfuWC3iXgJP99jiT y5lcUZcQoSl1rSyBhN+2oXNFzdrwIOT5mNumddc9Eil14deyy+4+RJmxoGPp1CAV RJ8MYrnRyeLPTKa2Ob0J0G9qW1qrM0alfSK5IG6+qFTpkUBC0d8/w2knlb8vJypu GsRkFj14lBWZUPLK0H9noTU= Received: (qmail 34267 invoked by alias); 19 Dec 2018 14:26:43 -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 34256 invoked by uid 89); 19 Dec 2018 14:26:42 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-26.9 required=5.0 tests=BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_SHORT, SPF_PASS autolearn=ham version=3.3.2 spammy=offloading, Various, sk:tom@cod, sk:tomcod X-HELO: mx1.suse.de Received: from mx2.suse.de (HELO mx1.suse.de) (195.135.220.15) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 19 Dec 2018 14:26:38 +0000 Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 7B3FFAE83; Wed, 19 Dec 2018 14:26:36 +0000 (UTC) Date: Wed, 19 Dec 2018 15:26:57 +0100 From: Tom de Vries To: gcc-patches@gcc.gnu.org Cc: Jeff Law , Mike Stump , Rainer Orth Subject: [committed][testsuite] Add scan-offload-rtl-dump Message-ID: <20181219142655.GA5159@delia> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) X-IsSubscribed: yes Hi, This patch adds scan-offload-rtl-dump, similar to scan-offload-tree-dump. Build and reg-tested on x86_64 with nvptx accelerator. Pre-approved here ( https://gcc.gnu.org/ml/gcc-patches/2018-05/msg01089.html ). Committed to trunk. Thanks, - Tom [testsuite] Add scan-offload-rtl-dump 2018-03-28 Tom de Vries * lib/scanoffloadrtl.exp: New file. * gcc.dg-selftests/dg-final.exp (dg_final_directive_check_num_args): Add offload-rtl. * doc/sourcebuild.texi (Commands for use in dg-final, Scan optimization dump files): Add offload-rtl. --- gcc/doc/sourcebuild.texi | 3 +- gcc/testsuite/gcc.dg-selftests/dg-final.exp | 4 +- gcc/testsuite/lib/scanoffloadrtl.exp | 147 ++++++++++++++++++++++++++++ 3 files changed, 152 insertions(+), 2 deletions(-) diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index 224ab89921a..46ef388e109 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -2644,7 +2644,8 @@ assembly output. @subsubsection Scan optimization dump files These commands are available for @var{kind} of @code{tree}, @code{ltrans-tree}, -@code{offload-tree}, @code{rtl}, @code{ipa}, and @code{wpa-ipa}. +@code{offload-tree}, @code{rtl}, @code{offload-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/gcc.dg-selftests/dg-final.exp b/gcc/testsuite/gcc.dg-selftests/dg-final.exp index 1d98666e137..90a6e894abd 100644 --- a/gcc/testsuite/gcc.dg-selftests/dg-final.exp +++ b/gcc/testsuite/gcc.dg-selftests/dg-final.exp @@ -25,6 +25,7 @@ load_lib "scanasm.exp" load_lib "scanwpaipa.exp" load_lib "scanltranstree.exp" load_lib "scanoffloadtree.exp" +load_lib "scanoffloadrtl.exp" load_lib "gcc-dg.exp" proc verify_call_1 { args } { @@ -82,7 +83,8 @@ proc dg_final_directive_check_num_args {} { verify_call $proc_name $too_few "too few arguments" } - foreach kind [list "tree" "rtl" "ipa" "ltrans-tree" "wpa-ipa" "offload-tree"] { + foreach kind [list "tree" "rtl" "ipa" "ltrans-tree" "wpa-ipa" \ + "offload-tree" "offload-rtl"] { verify_args scan-$kind-dump 2 3 verify_args scan-$kind-dump-times 3 4 verify_args scan-$kind-dump-not 2 3 diff --git a/gcc/testsuite/lib/scanoffloadrtl.exp b/gcc/testsuite/lib/scanoffloadrtl.exp new file mode 100644 index 00000000000..e836f6d27bb --- /dev/null +++ b/gcc/testsuite/lib/scanoffloadrtl.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 rtl 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 rtl pass +# Argument 2 handles expected failures and the like +proc scan-offload-rtl-dump { args } { + + if { [llength $args] < 2 } { + error "scan-offload-rtl-dump: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-offload-rtl-dump: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump "offload-rtl" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]r.[lindex $args 1]" ".o" \ + [lindex $args 2] + } else { + scan-dump "offload-rtl" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]r.[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 rtl pass +# Argument 3 handles expected failures and the like +proc scan-offload-rtl-dump-times { args } { + + if { [llength $args] < 3 } { + error "scan-offload-rtl-dump-times: too few arguments" + return + } + if { [llength $args] > 4 } { + error "scan-offload-rtl-dump-times: too many arguments" + return + } + if { [llength $args] >= 4 } { + scan-dump-times "offload-rtl" [lindex $args 0] [lindex $args 1] \ + "\[0-9\]\[0-9\]\[0-9]r.[lindex $args 2]" ".o" \ + [lindex $args 3] + } else { + scan-dump-times "offload-rtl" [lindex $args 0] [lindex $args 1] \ + "\[0-9\]\[0-9\]\[0-9]r.[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 rtl pass +# Argument 2 handles expected failures and the like +proc scan-offload-rtl-dump-not { args } { + + if { [llength $args] < 2 } { + error "scan-offload-rtl-dump-not: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-offload-rtl-dump-not: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump-not "offload-rtl" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]r.[lindex $args 1]" ".o" \ + [lindex $args 2] + } else { + scan-dump-not "offload-rtl" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]r.[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 rtl pass +# Argument 2 handles expected failures and the like +proc scan-offload-rtl-dump-dem { args } { + + if { [llength $args] < 2 } { + error "scan-offload-rtl-dump-dem: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-offload-rtl-dump-dem: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump-dem "offload-rtl" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]r.[lindex $args 1]" ".o" \ + [lindex $args 2] + } else { + scan-dump-dem "offload-rtl" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]r.[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 rtl pass +# Argument 2 handles expected failures and the like +proc scan-offload-rtl-dump-dem-not { args } { + + if { [llength $args] < 2 } { + error "scan-offload-rtl-dump-dem-not: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-offload-rtl-dump-dem-not: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump-dem-not "offload-rtl" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]r.[lindex $args 1]" ".o" \ + [lindex $args 2] + } else { + scan-dump-dem-not "offload-rtl" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9]r.[lindex $args 1]" ".o" + } +}