[testsuite] Add scan-offload-tree-dump

2018-05-03  Tom de Vries  <tom@codesourcery.com>

	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.

From-SVN: r259892

gcc/ChangeLog

@@ -1,3 +1,9 @@
+2018-05-03  Tom de Vries  <tom@codesourcery.com>
+
+	PR testsuite/85106
+	* doc/sourcebuild.texi (Commands for use in dg-final, Scan optimization
+	dump files): Add offload-tree.
+
 2018-05-03  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/85615

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} @}]

gcc/testsuite/ChangeLog

@@ -1,3 +1,8 @@
+2018-05-03  Tom de Vries  <tom@codesourcery.com>
+
+	PR testsuite/85106
+	* lib/scanoffloadtree.exp: New file.
+
 2018-05-03  Richard Biener  <rguenther@suse.de>
 
 	PR tree-optimization/85615

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
+# <http://www.gnu.org/licenses/>.
+
+# 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"
+    }
+}

libgomp/ChangeLog

@@ -1,3 +1,11 @@
+2018-05-03  Tom de Vries  <tom@codesourcery.com>
+
+	PR testsuite/85106
+	* 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.
+
 2018-05-02  Tom de Vries  <tom@codesourcery.com>
 
 	PR libgomp/85411

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]
 }
 

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

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 <stdio.h>
 #include <sys/time.h>
@@ -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" } } */