Skip to content

R
riscv-gcc-1
Commit ce15c7d5 by Janis Johnson Committed by Janis Johnson
Options

profopt.exp: Make prof_option_list local to profopt-execute. 

	* lib/profopt.exp: Make prof_option_list local to profopt-execute.
	* g++.dg/tree-prof/tree-prof.exp (PROFOPT_OPTIONS): Define after
	including profopt.opt; save and restore existing value.
	* g++.dg/bprob/bprob.exp: Likewise.
	* gcc.dg/matrix/matrix.exp: Likewise.
	* gcc.dg/tree-prof/tree-prof.exp: Likewise.
	* gcc.misc-tests/bprob.exp: Likewise; also replace formerly-ignored
	PROFOPT_OPTIONS.

From-SVN: r188964
parent ef25bad4
Showing with 48 additions and 26 deletions
gcc/testsuite/ChangeLog
2012-06-25 Janis Johnson <janisjo@codesourcery.com>
* lib/profopt.exp: Make prof_option_list local to profopt-execute.
* g++.dg/tree-prof/tree-prof.exp (PROFOPT_OPTIONS): Define after
including profopt.opt; save and restore existing value.
* g++.dg/bprob/bprob.exp: Likewise.
* gcc.dg/matrix/matrix.exp: Likewise.
* gcc.dg/tree-prof/tree-prof.exp: Likewise.
* gcc.misc-tests/bprob.exp: Likewise; also replace formerly-ignored
PROFOPT_OPTIONS.
2012-06-25 Richard Henderson <rth@redhat.com> 2012-06-25 Richard Henderson <rth@redhat.com>
* gcc.dg/pr53749.c: New. * gcc.dg/pr53749.c: New.
......
gcc/testsuite/g++.dg/bprob/bprob.exp
...@@ -33,7 +33,11 @@ if $tracelevel then { ...@@ -33,7 +33,11 @@ if $tracelevel then {
strace $tracelevel strace $tracelevel
} }
# Override the list defined in profopt.exp. # Load support procs.
load_lib profopt.exp
# Save and override the default list defined in profopt.exp.
set bprob_save_profopt_options $PROFOPT_OPTIONS
set PROFOPT_OPTIONS [list \ set PROFOPT_OPTIONS [list \
{ -g } \ { -g } \
{ -O0 } \ { -O0 } \
...@@ -47,9 +51,6 @@ if $tracelevel then { ...@@ -47,9 +51,6 @@ if $tracelevel then {
strace $tracelevel strace $tracelevel
} }
# Load support procs.
load_lib profopt.exp
set profile_options "-fprofile-arcs" set profile_options "-fprofile-arcs"
set feedback_options "-fbranch-probabilities" set feedback_options "-fbranch-probabilities"
...@@ -63,3 +64,5 @@ foreach profile_option $profile_options feedback_option $feedback_options { ...@@ -63,3 +64,5 @@ foreach profile_option $profile_options feedback_option $feedback_options {
profopt-execute $src profopt-execute $src
} }
} }
set PROFOPT_OPTIONS $bprob_save_profopt_options
gcc/testsuite/g++.dg/tree-prof/tree-prof.exp
...@@ -29,9 +29,6 @@ if { ![check_profiling_available "-fprofile-generate"] } { ...@@ -29,9 +29,6 @@ if { ![check_profiling_available "-fprofile-generate"] } {
set tool g++ set tool g++
set prof_ext "gcda" set prof_ext "gcda"
# Override the list defined in profopt.exp.
set PROFOPT_OPTIONS [list {}]
if $tracelevel then { if $tracelevel then {
strace $tracelevel strace $tracelevel
} }
...@@ -39,6 +36,10 @@ if $tracelevel then { ...@@ -39,6 +36,10 @@ if $tracelevel then {
# Load support procs. # Load support procs.
load_lib profopt.exp load_lib profopt.exp
# Save and override the default list defined in profopt.exp.
set treeprof_save_profopt_options $PROFOPT_OPTIONS
set PROFOPT_OPTIONS [list {}]
# These are globals used by profopt-execute. The first is options # These are globals used by profopt-execute. The first is options
# needed to generate profile data, the second is options to use the # needed to generate profile data, the second is options to use the
# profile data. # profile data.
...@@ -52,3 +53,5 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.C]] { ...@@ -52,3 +53,5 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.C]] {
} }
profopt-execute $src profopt-execute $src
} }
set PROFOPT_OPTIONS $treeprof_save_profopt_options
gcc/testsuite/gcc.dg/matrix/matrix.exp
...@@ -39,9 +39,6 @@ if { ![check_profiling_available "-fprofile-generate"] } { ...@@ -39,9 +39,6 @@ if { ![check_profiling_available "-fprofile-generate"] } {
set tool gcc set tool gcc
set prof_ext "gcda" set prof_ext "gcda"
# Override the list defined in profopt.exp.
set PROFOPT_OPTIONS [list {}]
if $tracelevel then { if $tracelevel then {
strace $tracelevel strace $tracelevel
} }
...@@ -49,6 +46,10 @@ if $tracelevel then { ...@@ -49,6 +46,10 @@ if $tracelevel then {
# Load support procs. # Load support procs.
load_lib profopt.exp load_lib profopt.exp
# Save and override the default list defined in profopt.exp.
set matrix_save_profopt_options $PROFOPT_OPTIONS
set PROFOPT_OPTIONS [list {}]
# These are globals used by profopt-execute. The first is options # These are globals used by profopt-execute. The first is options
# needed to generate profile data, the second is options to use the # needed to generate profile data, the second is options to use the
# profile data. # profile data.
...@@ -63,3 +64,4 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/transpose-*.c]] { ...@@ -63,3 +64,4 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/transpose-*.c]] {
profopt-execute $src profopt-execute $src
} }
set PROFOPT_OPTIONS $matrix_save_profopt_options
gcc/testsuite/gcc.dg/tree-prof/tree-prof.exp
...@@ -29,9 +29,6 @@ if { ![check_profiling_available "-fprofile-generate"] } { ...@@ -29,9 +29,6 @@ if { ![check_profiling_available "-fprofile-generate"] } {
set tool gcc set tool gcc
set prof_ext "gcda" set prof_ext "gcda"
# Override the list defined in profopt.exp.
set PROFOPT_OPTIONS [list {}]
if $tracelevel then { if $tracelevel then {
strace $tracelevel strace $tracelevel
} }
...@@ -39,6 +36,10 @@ if $tracelevel then { ...@@ -39,6 +36,10 @@ if $tracelevel then {
# Load support procs. # Load support procs.
load_lib profopt.exp load_lib profopt.exp
# Save and override the default list defined in profopt.exp.
set treeprof_save_profopt_options $PROFOPT_OPTIONS
set PROFOPT_OPTIONS [list {}]
# These are globals used by profopt-execute. The first is options # These are globals used by profopt-execute. The first is options
# needed to generate profile data, the second is options to use the # needed to generate profile data, the second is options to use the
# profile data. # profile data.
...@@ -52,3 +53,5 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] { ...@@ -52,3 +53,5 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] {
} }
profopt-execute $src profopt-execute $src
} }
set PROFOPT_OPTIONS $treeprof_save_profopt_options
gcc/testsuite/gcc.misc-tests/bprob.exp
...@@ -30,16 +30,6 @@ set tool gcc ...@@ -30,16 +30,6 @@ set tool gcc
set prof_ext "gcda" set prof_ext "gcda"
set perf_ext tim set perf_ext tim
# Override the list defined in profopt.exp.
set PROFOPT_OPTIONS [list \
{ -g } \
{ -O0 } \
{ -O1 } \
{ -O2 -DPERFTIME } \
{ -O3 -DPERFTIME } \
{ -O3 -g -DPERFTIME } \
{ -Os } ]
if $tracelevel then { if $tracelevel then {
strace $tracelevel strace $tracelevel
} }
...@@ -47,6 +37,10 @@ if $tracelevel then { ...@@ -47,6 +37,10 @@ if $tracelevel then {
# Load support procs. # Load support procs.
load_lib profopt.exp load_lib profopt.exp
# Save and override the default list defined in profopt.exp.
set bprob_save_profopt_options $PROFOPT_OPTIONS
set PROFOPT_OPTIONS [list { -O2 } { -O3 }]
set profile_options "-fprofile-arcs" set profile_options "-fprofile-arcs"
set feedback_options "-fbranch-probabilities" set feedback_options "-fbranch-probabilities"
...@@ -59,3 +53,5 @@ foreach profile_option $profile_options feedback_option $feedback_options { ...@@ -59,3 +53,5 @@ foreach profile_option $profile_options feedback_option $feedback_options {
profopt-execute $src profopt-execute $src
} }
} }
set PROFOPT_OPTIONS $bprob_save_profopt_options
gcc/testsuite/lib/profopt.exp
...@@ -64,8 +64,6 @@ if ![info exists PROFOPT_OPTIONS] { ...@@ -64,8 +64,6 @@ if ![info exists PROFOPT_OPTIONS] {
{ -Os } ] { -Os } ]
} }
set prof_option_list $PROFOPT_OPTIONS
# #
# profopt-cleanup -- remove profiling or performance results files. # profopt-cleanup -- remove profiling or performance results files.
# #
...@@ -215,7 +213,7 @@ proc profopt-get-options { src } { ...@@ -215,7 +213,7 @@ proc profopt-get-options { src } {
# #
proc profopt-execute { src } { proc profopt-execute { src } {
global srcdir tmpdir global srcdir tmpdir
global prof_option_list global PROFOPT_OPTIONS
global tool profile_option feedback_option prof_ext perf_ext perf_delta global tool profile_option feedback_option prof_ext perf_ext perf_delta
global generate_final_code use_final_code global generate_final_code use_final_code
global verbose global verbose
...@@ -227,6 +225,12 @@ proc profopt-execute { src } { ...@@ -227,6 +225,12 @@ proc profopt-execute { src } {
error "No feedback option specified for second compile." error "No feedback option specified for second compile."
} }
# Use the default option list or one defined for a set of tests.
if ![info exists PROFOPT_OPTIONS] {
error "PROFOPT_OPTIONS is not defined"
}
set prof_option_list $PROFOPT_OPTIONS
regsub "(?q)$srcdir/" $src "" testcase regsub "(?q)$srcdir/" $src "" testcase
# If we couldn't rip $srcdir out of `src' then just do the best we can. # If we couldn't rip $srcdir out of `src' then just do the best we can.
# The point is to reduce the unnecessary noise in the logs. Don't strip # The point is to reduce the unnecessary noise in the logs. Don't strip
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment