From: Tom de Vries Date: Wed, 2 May 2018 12:16:32 +0000 (+0000) Subject: [testsuite] Add scan-ltrans-tree-dump X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=9220b5116d0f4e880c073409f3854dec7d065eb5;p=gcc.git [testsuite] Add scan-ltrans-tree-dump 2018-05-02 Tom de Vries PR testsuite/85106 * gcc.dg/ipa/ipa-icf-38.c: Use scan-ltrans-tree-dump. * lib/scanltranstree.exp: New file. * lib/target-supports.exp (scan-ltrans-tree-dump_required_options) (scan-ltrans-tree-dump-times_required_options) (scan-ltrans-tree-dump-not_required_options) (scan-ltrans-tree-dump-dem_required_options) (scan-ltrans-tree-dump-dem-not_required_options): New proc. * lib/gcc-dg.exp: Include scanltranstree.exp. * testsuite/lib/libatomic.exp: Include scanltranstree.exp. * testsuite/lib/libgomp.exp: Include scanltranstree.exp. * testsuite/lib/libitm.exp: Include scanltranstree.exp. * testsuite/lib/libvtv.exp: Include scanltranstree.exp. * doc/sourcebuild.texi (Commands for use in dg-final, Scan optimization dump files): Add ltrans-tree. From-SVN: r259838 --- diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 3abedbe019d..1c50825790b 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2018-05-02 Tom de Vries + + PR testsuite/85106 + * doc/sourcebuild.texi (Commands for use in dg-final, Scan optimization + dump files): Add ltrans-tree. + 2018-05-02 Tom de Vries PR testsuite/85106 diff --git a/gcc/doc/sourcebuild.texi b/gcc/doc/sourcebuild.texi index ad4f446721d..16164ae2cf3 100644 --- a/gcc/doc/sourcebuild.texi +++ b/gcc/doc/sourcebuild.texi @@ -2588,8 +2588,8 @@ assembly output. @subsubsection Scan optimization dump files -These commands are available for @var{kind} of @code{tree}, @code{rtl}, -@code{ipa}, and @code{wpa-ipa}. +These commands are available for @var{kind} of @code{tree}, @code{ltrans-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/ChangeLog b/gcc/testsuite/ChangeLog index 80b6d373d0e..e6ee793567a 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,15 @@ +2018-05-02 Tom de Vries + + PR testsuite/85106 + * gcc.dg/ipa/ipa-icf-38.c: Use scan-ltrans-tree-dump. + * lib/scanltranstree.exp: New file. + * lib/target-supports.exp (scan-ltrans-tree-dump_required_options) + (scan-ltrans-tree-dump-times_required_options) + (scan-ltrans-tree-dump-not_required_options) + (scan-ltrans-tree-dump-dem_required_options) + (scan-ltrans-tree-dump-dem-not_required_options): New proc. + * lib/gcc-dg.exp: Include scanltranstree.exp. + 2018-05-02 Tom de Vries PR testsuite/85106 diff --git a/gcc/testsuite/gcc.dg/ipa/ipa-icf-38.c b/gcc/testsuite/gcc.dg/ipa/ipa-icf-38.c index 6e7936a6a68..85531ab1cf3 100644 --- a/gcc/testsuite/gcc.dg/ipa/ipa-icf-38.c +++ b/gcc/testsuite/gcc.dg/ipa/ipa-icf-38.c @@ -1,5 +1,5 @@ /* { dg-do link } */ -/* { dg-options "-O2 -fdump-ipa-icf -flto" } */ +/* { dg-options "-O2 -fdump-ipa-icf -flto -fdump-tree-fixup_cfg4" } */ /* { dg-require-effective-target lto } */ /* { dg-additional-sources "ipa-icf-38a.c" }*/ @@ -29,3 +29,5 @@ int main() /* { dg-final { scan-wpa-ipa-dump "Semantic equality hit:foo->bar" "icf" } } */ /* { dg-final { scan-wpa-ipa-dump "Equal symbols: 1" "icf" } } */ +/* { dg-final { scan-ltrans-tree-dump "Function foo" "fixup_cfg4" } } */ +/* { dg-final { scan-ltrans-tree-dump-not "Function bar" "fixup_cfg4" } } */ diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 2fca9e87afc..a15c5d5e2a6 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -21,6 +21,7 @@ load_lib target-supports-dg.exp load_lib scanasm.exp load_lib scanrtl.exp load_lib scantree.exp +load_lib scanltranstree.exp load_lib scanipa.exp load_lib scanwpaipa.exp load_lib scanlang.exp diff --git a/gcc/testsuite/lib/scanltranstree.exp b/gcc/testsuite/lib/scanltranstree.exp new file mode 100644 index 00000000000..f536f848551 --- /dev/null +++ b/gcc/testsuite/lib/scanltranstree.exp @@ -0,0 +1,148 @@ +# Copyright (C) 2000-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 ltrans tree dump output, used by gcc-dg.exp and +# g++-dg.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-ltrans-tree-dump { args } { + + if { [llength $args] < 2 } { + error "scan-ltrans-tree-dump: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-ltrans-tree-dump: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump "ltrans-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".exe.ltrans0" \ + [lindex $args 2] + } else { + scan-dump "ltrans-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".exe.ltrans0" + } +} + +# 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-ltrans-tree-dump-times { args } { + + if { [llength $args] < 3 } { + error "scan-ltrans-tree-dump-times: too few arguments" + return + } + if { [llength $args] > 4 } { + error "scan-ltrans-tree-dump-times: too many arguments" + return + } + if { [llength $args] >= 4 } { + scan-dump-times "ltrans-tree" [lindex $args 0] [lindex $args 1] \ + "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 2]" \ + ".exe.ltrans0" [lindex $args 3] + } else { + scan-dump-times "ltrans-tree" [lindex $args 0] [lindex $args 1] \ + "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 2]" ".exe.ltrans0" + } +} + +# 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-ltrans-tree-dump-not { args } { + + if { [llength $args] < 2 } { + error "scan-ltrans-tree-dump-not: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-ltrans-tree-dump-not: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump-not "ltrans-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".exe.ltrans0" \ + [lindex $args 2] + } else { + scan-dump-not "ltrans-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".exe.ltrans0" + } +} + +# 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-ltrans-tree-dump-dem { args } { + + if { [llength $args] < 2 } { + error "scan-ltrans-tree-dump-dem: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-ltrans-tree-dump-dem: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump-dem "ltrans-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".exe.ltrans0" \ + [lindex $args 2] + } else { + scan-dump-dem "ltrans-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".exe.ltrans0" + } +} + +# 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-ltrans-tree-dump-dem-not { args } { + + if { [llength $args] < 2 } { + error "scan-ltrans-tree-dump-dem-not: too few arguments" + return + } + if { [llength $args] > 3 } { + error "scan-ltrans-tree-dump-dem-not: too many arguments" + return + } + if { [llength $args] >= 3 } { + scan-dump-dem-not "ltrans-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" \ + ".exe.ltrans0" [lindex $args 2] + } else { + scan-dump-dem-not "ltrans-tree" [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" \ + ".exe.ltrans0" + } +} diff --git a/gcc/testsuite/lib/target-supports.exp b/gcc/testsuite/lib/target-supports.exp index 590b62c28e6..cfc22a22975 100644 --- a/gcc/testsuite/lib/target-supports.exp +++ b/gcc/testsuite/lib/target-supports.exp @@ -8809,6 +8809,26 @@ proc force_conventional_output_for { test } { } } +# Record that dg-final test scan-ltrans-tree-dump* requires -flto-partition=one +# in order to force a single partition, allowing scan-ltrans-tree-dump* to scan +# a dump file *.exe.ltrans0.*. + +proc scan-ltrans-tree-dump_required_options {} { + return "-flto-partition=one" +} +proc scan-ltrans-tree-dump-times_required_options {} { + return "-flto-partition=one" +} +proc scan-ltrans-tree-dump-not_required_options {} { + return "-flto-partition=one" +} +proc scan-ltrans-tree-dump-dem_required_options {} { + return "-flto-partition=one" +} +proc scan-ltrans-tree-dump-dem-not_required_options {} { + return "-flto-partition=one" +} + # Return 1 if the x86-64 target supports PIE with copy reloc, 0 # otherwise. Cache the result. diff --git a/libatomic/ChangeLog b/libatomic/ChangeLog index 70761047cbc..82a2e040c6b 100644 --- a/libatomic/ChangeLog +++ b/libatomic/ChangeLog @@ -1,3 +1,8 @@ +2018-05-02 Tom de Vries + + PR testsuite/85106 + * testsuite/lib/libatomic.exp: Include scanltranstree.exp. + 2018-05-02 Tom de Vries PR testsuite/85106 diff --git a/libatomic/testsuite/lib/libatomic.exp b/libatomic/testsuite/lib/libatomic.exp index 9737758f549..38f3e5673e2 100644 --- a/libatomic/testsuite/lib/libatomic.exp +++ b/libatomic/testsuite/lib/libatomic.exp @@ -37,6 +37,7 @@ load_gcc_lib scandump.exp load_gcc_lib scanlang.exp load_gcc_lib scanrtl.exp load_gcc_lib scantree.exp +load_gcc_lib scanltranstree.exp load_gcc_lib scanipa.exp load_gcc_lib scanwpaipa.exp load_gcc_lib multiline.exp diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index e9799b132e0..958f92bc4c7 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,3 +1,8 @@ +2018-05-02 Tom de Vries + + PR testsuite/85106 + * testsuite/lib/libgomp.exp: Include scanltranstree.exp. + 2018-05-02 Tom de Vries PR testsuite/85106 diff --git a/libgomp/testsuite/lib/libgomp.exp b/libgomp/testsuite/lib/libgomp.exp index 15c459abe14..c694f17c62f 100644 --- a/libgomp/testsuite/lib/libgomp.exp +++ b/libgomp/testsuite/lib/libgomp.exp @@ -29,6 +29,7 @@ load_gcc_lib scandump.exp load_gcc_lib scanlang.exp load_gcc_lib scanrtl.exp load_gcc_lib scantree.exp +load_gcc_lib scanltranstree.exp load_gcc_lib scanipa.exp load_gcc_lib scanwpaipa.exp load_gcc_lib timeout-dg.exp diff --git a/libitm/ChangeLog b/libitm/ChangeLog index dc729709af7..1758b6a8f7f 100644 --- a/libitm/ChangeLog +++ b/libitm/ChangeLog @@ -1,3 +1,8 @@ +2018-05-02 Tom de Vries + + PR testsuite/85106 + * testsuite/lib/libitm.exp: Include scanltranstree.exp. + 2018-05-02 Tom de Vries PR testsuite/85106 diff --git a/libitm/testsuite/lib/libitm.exp b/libitm/testsuite/lib/libitm.exp index e9f5f48fd80..b3d247b9f98 100644 --- a/libitm/testsuite/lib/libitm.exp +++ b/libitm/testsuite/lib/libitm.exp @@ -43,6 +43,7 @@ load_gcc_lib scandump.exp load_gcc_lib scanlang.exp load_gcc_lib scanrtl.exp load_gcc_lib scantree.exp +load_gcc_lib scanltranstree.exp load_gcc_lib scanipa.exp load_gcc_lib scanwpaipa.exp load_gcc_lib timeout-dg.exp diff --git a/libvtv/ChangeLog b/libvtv/ChangeLog index b76651dcc79..cd1beb9004b 100644 --- a/libvtv/ChangeLog +++ b/libvtv/ChangeLog @@ -1,3 +1,8 @@ +2018-05-02 Tom de Vries + + PR testsuite/85106 + * testsuite/lib/libvtv.exp: Include scanltranstree.exp. + 2018-05-02 Tom de Vries PR testsuite/85106 diff --git a/libvtv/testsuite/lib/libvtv.exp b/libvtv/testsuite/lib/libvtv.exp index 540b8adde3b..4b71c9ce7bc 100644 --- a/libvtv/testsuite/lib/libvtv.exp +++ b/libvtv/testsuite/lib/libvtv.exp @@ -42,6 +42,7 @@ load_gcc_lib scanasm.exp load_gcc_lib scandump.exp load_gcc_lib scanrtl.exp load_gcc_lib scantree.exp +load_gcc_lib scanltranstree.exp load_gcc_lib scanipa.exp load_gcc_lib scanwpaipa.exp load_gcc_lib timeout-dg.exp