From e4d3e7f9add34216f4baffd3124bcb22a82c39bf Mon Sep 17 00:00:00 2001 From: Alex Coplan Date: Wed, 28 Aug 2024 14:53:11 +0100 Subject: testsuite: Rename scanltranstree.exp -> scanltrans.exp Since r15-3254-g3f51f0dc88ec21c1ec79df694200f10ef85915f4 added scan-ltrans-rtl* variants to scanltranstree.exp, it no longer makes sense to have "tree" in the name. This renames the file accordingly and updates users. libatomic/ChangeLog: * testsuite/lib/libatomic.exp: Load scanltrans.exp instead of scanltranstree.exp. libgomp/ChangeLog: * testsuite/lib/libgomp.exp: Load scanltrans.exp instead of scanltranstree.exp. libitm/ChangeLog: * testsuite/lib/libitm.exp: Load scanltrans.exp instead of scanltranstree.exp. libphobos/ChangeLog: * testsuite/lib/libphobos-dg.exp: Load scanltrans.exp instead of scanltranstree.exp. libvtv/ChangeLog: * testsuite/lib/libvtv.exp: Load scanltrans.exp instead of scanltranstree.exp. gcc/testsuite/ChangeLog: * gcc.dg-selftests/dg-final.exp: Load scanltrans.exp instead of scanltranstree.exp. * lib/gcc-dg.exp: Likewise. * lib/scanltranstree.exp: Rename to ... * lib/scanltrans.exp: ... this. --- gcc/testsuite/gcc.dg-selftests/dg-final.exp | 2 +- gcc/testsuite/lib/gcc-dg.exp | 2 +- gcc/testsuite/lib/scanltrans.exp | 80 +++++++++++++++++++++++++++++ gcc/testsuite/lib/scanltranstree.exp | 80 ----------------------------- 4 files changed, 82 insertions(+), 82 deletions(-) create mode 100644 gcc/testsuite/lib/scanltrans.exp delete mode 100644 gcc/testsuite/lib/scanltranstree.exp (limited to 'gcc') diff --git a/gcc/testsuite/gcc.dg-selftests/dg-final.exp b/gcc/testsuite/gcc.dg-selftests/dg-final.exp index 6b6f32e..5503b0c 100644 --- a/gcc/testsuite/gcc.dg-selftests/dg-final.exp +++ b/gcc/testsuite/gcc.dg-selftests/dg-final.exp @@ -23,7 +23,7 @@ load_lib "scanlang.exp" load_lib "lto.exp" load_lib "scanasm.exp" load_lib "scanwpaipa.exp" -load_lib "scanltranstree.exp" +load_lib "scanltrans.exp" load_lib "scanoffloadtree.exp" load_lib "scanoffloadrtl.exp" load_lib "gcc-dg.exp" diff --git a/gcc/testsuite/lib/gcc-dg.exp b/gcc/testsuite/lib/gcc-dg.exp index 9920621..d9513e2 100644 --- a/gcc/testsuite/lib/gcc-dg.exp +++ b/gcc/testsuite/lib/gcc-dg.exp @@ -21,7 +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 scanltrans.exp load_lib scanipa.exp load_lib scanwpaipa.exp load_lib scanlang.exp diff --git a/gcc/testsuite/lib/scanltrans.exp b/gcc/testsuite/lib/scanltrans.exp new file mode 100644 index 0000000..3d85813 --- /dev/null +++ b/gcc/testsuite/lib/scanltrans.exp @@ -0,0 +1,80 @@ +# Copyright (C) 2000-2024 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 + +# Define scan-ltrans-{tree,rtl}-dump{,-not,-dem,-dem-not}. These are LTO +# variants of the corresponding functions without -ltrans in the name. +foreach ir { tree rtl } { + foreach modifier { {} -not -dem -dem-not } { + eval [string map [list @NAME@ scan-ltrans-$ir-dump$modifier \ + @SCAN@ scan-dump$modifier \ + @TYPE@ ltrans-$ir \ + @SUFFIX@ [string index $ir 0]] { + proc @NAME@ { args } { + if { [llength $args] < 2 } { + error "@NAME@: too few arguments" + return + } + if { [llength $args] > 3 } { + error "@NAME@: too many arguments" + return + } + if { [llength $args] >= 3 } { + @SCAN@ @TYPE@ [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 1]" \ + ".ltrans0.ltrans" \ + [lindex $args 2] + } else { + @SCAN@ @TYPE@ [lindex $args 0] \ + "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 1]" \ + ".ltrans0.ltrans" + } + } + }] + } +} + +# Define scan-ltrans-{tree,rtl}-dump-times. These are LTO variants of the +# corresponding functions without -ltrans in the name. +foreach ir { tree rtl } { + eval [string map [list @NAME@ scan-ltrans-$ir-dump-times \ + @TYPE@ ltrans-$ir \ + @SUFFIX@ [string index $ir 0]] { + proc @NAME@ { args } { + if { [llength $args] < 3 } { + error "@NAME@: too few arguments" + return + } + if { [llength $args] > 4 } { + error "@NAME@: too many arguments" + return + } + if { [llength $args] >= 4 } { + scan-dump-times "@TYPE@" [lindex $args 0] [lindex $args 1] \ + "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 2]" \ + ".ltrans0.ltrans" [lindex $args 3] + } else { + scan-dump-times "@TYPE@" [lindex $args 0] [lindex $args 1] \ + "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 2]" \ + ".ltrans0.ltrans" + } + } + }] +} diff --git a/gcc/testsuite/lib/scanltranstree.exp b/gcc/testsuite/lib/scanltranstree.exp deleted file mode 100644 index 3d85813..0000000 --- a/gcc/testsuite/lib/scanltranstree.exp +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright (C) 2000-2024 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 - -# Define scan-ltrans-{tree,rtl}-dump{,-not,-dem,-dem-not}. These are LTO -# variants of the corresponding functions without -ltrans in the name. -foreach ir { tree rtl } { - foreach modifier { {} -not -dem -dem-not } { - eval [string map [list @NAME@ scan-ltrans-$ir-dump$modifier \ - @SCAN@ scan-dump$modifier \ - @TYPE@ ltrans-$ir \ - @SUFFIX@ [string index $ir 0]] { - proc @NAME@ { args } { - if { [llength $args] < 2 } { - error "@NAME@: too few arguments" - return - } - if { [llength $args] > 3 } { - error "@NAME@: too many arguments" - return - } - if { [llength $args] >= 3 } { - @SCAN@ @TYPE@ [lindex $args 0] \ - "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 1]" \ - ".ltrans0.ltrans" \ - [lindex $args 2] - } else { - @SCAN@ @TYPE@ [lindex $args 0] \ - "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 1]" \ - ".ltrans0.ltrans" - } - } - }] - } -} - -# Define scan-ltrans-{tree,rtl}-dump-times. These are LTO variants of the -# corresponding functions without -ltrans in the name. -foreach ir { tree rtl } { - eval [string map [list @NAME@ scan-ltrans-$ir-dump-times \ - @TYPE@ ltrans-$ir \ - @SUFFIX@ [string index $ir 0]] { - proc @NAME@ { args } { - if { [llength $args] < 3 } { - error "@NAME@: too few arguments" - return - } - if { [llength $args] > 4 } { - error "@NAME@: too many arguments" - return - } - if { [llength $args] >= 4 } { - scan-dump-times "@TYPE@" [lindex $args 0] [lindex $args 1] \ - "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 2]" \ - ".ltrans0.ltrans" [lindex $args 3] - } else { - scan-dump-times "@TYPE@" [lindex $args 0] [lindex $args 1] \ - "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 2]" \ - ".ltrans0.ltrans" - } - } - }] -} -- cgit v1.1