From: David Malcolm Date: Mon, 1 Dec 2014 16:13:29 +0000 (+0000) Subject: PR jit/63854: Add support for running "make check-jit" under valgrind X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=d86dd9cb94c24ac761bdaa2110e72494f07c4df9;p=gcc.git PR jit/63854: Add support for running "make check-jit" under valgrind gcc/testsuite/ChangeLog: PR jit/63854 * jit.dg/jit.exp (report_leak): New. (parse_valgrind_logfile): New. (fixed_host_execute): Detect if RUN_UNDER_VALGRIND is present in the environment, and if so, run the executable under valgrind, capturing valgrind's output to a logfile. Parse the log file, generating PASSes and XFAILs for the summary of leaks. Use "wait" before "close": valgrind might not have finished writing the log out before we parse it, so we need to wait for the spawnee to finish. From-SVN: r218227 --- diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index d86e406ef3f..37b5d0b670c 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,16 @@ +2014-12-01 David Malcolm + + PR jit/63854 + * jit.dg/jit.exp (report_leak): New. + (parse_valgrind_logfile): New. + (fixed_host_execute): Detect if RUN_UNDER_VALGRIND is present + in the environment, and if so, run the executable under + valgrind, capturing valgrind's output to a logfile. Parse the + log file, generating PASSes and XFAILs for the summary of leaks. + Use "wait" before "close": valgrind might not have finished + writing the log out before we parse it, so we need to wait for + the spawnee to finish. + 2014-12-01 David Malcolm PR jit/63969 diff --git a/gcc/testsuite/jit.dg/jit.exp b/gcc/testsuite/jit.dg/jit.exp index 135dbad94ef..9179a155336 100644 --- a/gcc/testsuite/jit.dg/jit.exp +++ b/gcc/testsuite/jit.dg/jit.exp @@ -23,6 +23,48 @@ load_lib target-libpath.exp load_lib gcc.exp load_lib dejagnu.exp +# Look for lines of the form: +# definitely lost: 11,316 bytes in 235 blocks +# indirectly lost: 352 bytes in 4 blocks +# Ideally these would report zero bytes lost (which is a PASS); +# for now, report non-zero leaks as XFAILs. +proc report_leak {kind name logfile line} { + set match [regexp "$kind lost: .*" $line result] + if $match { + verbose "Saw \"$result\" within \"$line\"" 4 + # Extract bytes and blocks. + # These can contain commas as well as numerals, + # but we only care about whether we have zero. + regexp "$kind lost: (.+) bytes in (.+) blocks" \ + $result -> bytes blocks + verbose "bytes: '$bytes'" 4 + verbose "blocks: '$blocks'" 4 + if { $bytes == 0 } { + pass "$name: $logfile: $result" + } else { + xfail "$name: $logfile: $result" + } + } +} + +proc parse_valgrind_logfile {name logfile} { + verbose "parse_valgrind_logfile: $logfile" 2 + if [catch {set f [open $logfile]}] { + fail "$name: unable to read $logfile" + return + } + + while { [gets $f line] >= 0 } { + # Strip off the PID prefix e.g. ==7675== + set line [regsub "==\[0-9\]*== " $line ""] + verbose $line 2 + + report_leak "definitely" $name $logfile $line + report_leak "indirectly" $name $logfile $line + } + close $f +} + # This is host_execute from dejagnu.exp commit # 126a089777158a7891ff975473939f08c0e31a1c # with the following patch applied, and renaming to "fixed_host_execute". @@ -49,6 +91,7 @@ load_lib dejagnu.exp # if there was a problem. # proc fixed_host_execute {args} { + global env global text global spawn_id @@ -75,7 +118,28 @@ proc fixed_host_execute {args} { # spawn the executable and look for the DejaGnu output messages from the # test case. # spawn -noecho -open [open "|./${executable}" "r"] - spawn -noecho "./${executable}" ${params} + + # Run under valgrind if RUN_UNDER_VALGRIND is present in the environment. + # Note that it's best to configure gcc with --enable-valgrind-annotations + # when testing under valgrind. + set run_under_valgrind [info exists env(RUN_UNDER_VALGRIND)] + if $run_under_valgrind { + set valgrind_logfile "${executable}.valgrind.txt" + set valgrind_params {"valgrind"} + lappend valgrind_params "--leak-check=full" + lappend valgrind_params "--log-file=${valgrind_logfile}" + } else { + set valgrind_params {} + } + verbose "valgrind_params: $valgrind_params" 2 + + set args ${valgrind_params} + lappend args "./${executable}" + set args [concat $args ${params}] + verbose "args: $args" 2 + + eval spawn -noecho $args + expect_after full_buffer { error "got full_buffer" } set prefix "\[^\r\n\]*" @@ -144,6 +208,18 @@ proc fixed_host_execute {args} { } } + # Use "wait" before "close": valgrind might not have finished + # writing the log out before we parse it, so we need to wait for + # the spawnee to finish. + + catch wait wres + verbose "wres: $wres" 2 + + if $run_under_valgrind { + upvar 2 name name + parse_valgrind_logfile $name $valgrind_logfile + } + # force a close of the executable to be safe. catch close