[committed][testsuite] Add scan-offload-rtl-dump
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 000..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
+# <http://www.gnu.org/licenses/>.
+
+# 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"
+ ret
Re: [testsuite] Add scan-offload-rtl-dump
On 05/03/2018 08:15 AM, Tom de Vries wrote: > Hi, > > I'm posting this patch for the record. > > I wrote it but haven't found a use for it yet. I find it easier to write > asm scans for nvptx than rtl ones. If you do find a use, then consider this pre-approved. jeff
[testsuite] Add scan-offload-rtl-dump
Hi,
I'm posting this patch for the record.
I wrote it but haven't found a use for it yet. I find it easier to write
asm scans for nvptx than rtl ones.
Thanks,
- Tom
[testsuite] Add scan-offload-rtl-dump
2018-03-28 Tom de Vries <t...@codesourcery.com>
* lib/scanoffloadrtl.exp: New file.
* doc/sourcebuild.texi (Commands for use in dg-final, Scan optimization
dump files): Add offload-rtl.
---
gcc/doc/sourcebuild.texi | 3 +-
gcc/testsuite/lib/scanoffloadrtl.exp | 147 +++
2 files changed, 149 insertions(+), 1 deletion(-)
diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi
index 4605a49..d748f8e 100644
--- a/gcc/doc/sourcebuild.texi
+++ b/gcc/doc/sourcebuild.texi
@@ -2589,7 +2589,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/lib/scanoffloadrtl.exp b/gcc/testsuite/lib/scanoffloadrtl.exp
new file mode 100644
index 000..e836f6d
--- /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
+# <http://www.gnu.org/licenses/>.
+
+# 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 f
