OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add offload target to testname for pass/fail message

Browse Source 
Offload tests that scan dump files may run multiple times, once per
offload target, but the test result messages do not mention the
offload target, so we may seem to have repeated results.  Fixed by
modifying the test name so that it contains the offload target name.


Co-Authored-By: Thomas Schwinge <thomas@codesourcery.com>
for  gcc/testsuite/ChangeLog

	* lib/scanoffload.exp (scoff-testname, scoff-adjust): New.
	(scoff): Call them.
This commit is contained in:
Alexandre Oliva 2020-07-24 15:38:42 -03:00 committed by Alexandre Oliva
parent 0e3ad7e4d0
commit 49341f3bd4
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gcc/testsuite/lib/scanoffload.exp
View File

@ -22,6 +22,19 @@ proc scoff-format { offtgt suffix } {
return ".x$offtgt.mkoffload$suffix"
}
# Adjust an offload dump TESTNAME for offload TARGET.
proc scoff-testname { target testname } {
return "$target-$testname"
}
# Adjust the arglist ARGS, so that argument IDX gets scoff-formatted,
# and argument 0 (the test name) gets scoff-testnamed.
proc scoff-adjust { args idx target } {
lset args $idx "[scoff-format $target [lindex $args $idx]]"
lset args 0 "[scoff-testname $target [lindex $args 0]]"
return $args
}
# Wrapper for scan procs.
# Argument 0 is the index of the argument to replace when calling
# argument 1 with the remaining arguments. Use end-1 or end or so.
@ -34,7 +47,7 @@ proc scoff { args } {
if [info exists offload_target] {
set target $offload_target
if { "$target" != "disable" } {
eval $prc [lreplace $args $idx $idx "[scoff-format $target [lindex $args $idx]]"]
eval $prc [scoff-adjust $args $idx $target]
}
} else {
global offload_targets
@ -42,7 +55,7 @@ proc scoff { args } {
# HSA offloading is doing things differently, doesn't use 'mkoffload'.
if { "$target" == "hsa" } continue
eval $prc [lreplace $args $idx $idx "[scoff-format $target [lindex $args $idx]]"]
eval $prc [scoff-adjust $args $idx $target]
}
}
}