Skip to content
Snippets Groups Projects
Commit 71059d26 authored by Richard Sandiford's avatar Richard Sandiford
Browse files

testsuite: Reduce cut-&-paste in scanltranstree.exp

scanltranstree.exp defines some LTO wrappers around standard
non-LTO scanners.  Four of them are cut-&-paste variants of
one another, so this patch generates them from a single template.
It also does the same for scan-ltrans-tree-dump-times, so that
other *-times scanners can be added easily in future.

The scanners seem to be lightly used.  gcc.dg/ipa/ipa-icf-38.c uses
scan-ltrans-tree-dump{,-not} and libgomp.c/declare-variant-1.c
uses scan-ltrans-tree-dump-{not,times}.  Nothing currently seems
to use scan-ltrans-tree-dump-dem*.

gcc/testsuite/
	* lib/scanltranstree.exp: Redefine the routines using two
	templates.
parent 661acde6
No related branches found
No related tags found
No related merge requests found
...@@ -19,130 +19,68 @@ ...@@ -19,130 +19,68 @@
load_lib scandump.exp load_lib scandump.exp
# Utility for scanning compiler result, invoked via dg-final. # The first item in the list is an LTO equivalent of the second item
# Call pass if pattern is present, otherwise fail. # in the list; see the documentation of the second item for details.
# foreach { name scan type suffix } {
# Argument 0 is the regexp to match scan-ltrans-tree-dump scan-dump ltrans-tree t
# Argument 1 is the name of the dumped tree pass scan-ltrans-tree-dump-not scan-dump-not ltrans-tree t
# Argument 2 handles expected failures and the like scan-ltrans-tree-dump-dem scan-dump-dem ltrans-tree t
proc scan-ltrans-tree-dump { args } { scan-ltrans-tree-dump-dem-not scan-dump-dem-not ltrans-tree t
} {
if { [llength $args] < 2 } { eval [string map [list @NAME@ $name \
error "scan-ltrans-tree-dump: too few arguments" @SCAN@ $scan \
return @TYPE@ $type \
} @SUFFIX@ $suffix] {
if { [llength $args] > 3 } { proc @NAME@ { args } {
error "scan-ltrans-tree-dump: too many arguments" if { [llength $args] < 2 } {
return error "@NAME@: too few arguments"
} return
if { [llength $args] >= 3 } { }
scan-dump "ltrans-tree" [lindex $args 0] \ if { [llength $args] > 3 } {
"\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".ltrans0.ltrans" \ error "@NAME@: too many arguments"
[lindex $args 2] return
} else { }
scan-dump "ltrans-tree" [lindex $args 0] \ if { [llength $args] >= 3 } {
"\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".ltrans0.ltrans" @SCAN@ @TYPE@ [lindex $args 0] \
} "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 1]" \
} ".ltrans0.ltrans" \
[lindex $args 2]
# Call pass if pattern is present given number of times, otherwise fail. } else {
# Argument 0 is the regexp to match @SCAN@ @TYPE@ [lindex $args 0] \
# Argument 1 is number of times the regexp must be found "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 1]" \
# Argument 2 is the name of the dumped tree pass ".ltrans0.ltrans"
# 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]" \
".ltrans0.ltrans" [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]" ".ltrans0.ltrans"
}
} }
# Call pass if pattern is not present, otherwise fail. # The first item in the list is an LTO equivalent of the second item
# # in the list; see the documentation of the second item for details.
# Argument 0 is the regexp to match foreach { name scan type suffix } {
# Argument 1 is the name of the dumped tree pass scan-ltrans-tree-dump-times scan-dump-times ltrans-tree t
# Argument 2 handles expected failures and the like } {
proc scan-ltrans-tree-dump-not { args } { eval [string map [list @NAME@ $name \
@SCAN@ $scan \
if { [llength $args] < 2 } { @TYPE@ $type \
error "scan-ltrans-tree-dump-not: too few arguments" @SUFFIX@ $suffix] {
return proc @NAME@ { args } {
} if { [llength $args] < 3 } {
if { [llength $args] > 3 } { error "@NAME@: too few arguments"
error "scan-ltrans-tree-dump-not: too many arguments" return
return }
} if { [llength $args] > 4 } {
if { [llength $args] >= 3 } { error "@NAME@: too many arguments"
scan-dump-not "ltrans-tree" [lindex $args 0] \ return
"\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".ltrans0.ltrans" \ }
[lindex $args 2] if { [llength $args] >= 4 } {
} else { @SCAN@ "@TYPE@" [lindex $args 0] [lindex $args 1] \
scan-dump-not "ltrans-tree" [lindex $args 0] \ "\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 2]" \
"\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".ltrans0.ltrans" ".ltrans0.ltrans" [lindex $args 3]
} } else {
} @SCAN@ "@TYPE@" [lindex $args 0] [lindex $args 1] \
"\[0-9\]\[0-9\]\[0-9\]@SUFFIX@.[lindex $args 2]" \
# Utility for scanning demangled compiler result, invoked via dg-final. ".ltrans0.ltrans"
# 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]" ".ltrans0.ltrans" \
[lindex $args 2]
} else {
scan-dump-dem "ltrans-tree" [lindex $args 0] \
"\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" ".ltrans0.ltrans"
}
}
# 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]" \
".ltrans0.ltrans" [lindex $args 2]
} else {
scan-dump-dem-not "ltrans-tree" [lindex $args 0] \
"\[0-9\]\[0-9\]\[0-9\]t.[lindex $args 1]" \
".ltrans0.ltrans"
}
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment