| Message ID | 55684402.4010307@arm.com |
|---|---|
| State | New |
| Headers | show |
On 29 May 2015 at 12:48, Alan Lawrence <alan.lawrence@arm.com> wrote: > Christophe Lyon wrote: >> >> >> This looks OK, but why can't you also drop the other torture-related >> lines as you did in your previous patch? >> I mean: >> load_lib c-torture.exp >> load_lib torture-options.exp >> etc... > > > We need c-torture.exp in order to set-torture-options; we need to > set-torture-options to get the right list of variants, as otherwise we lose > "-Og -g" (as I did in my original patch 13/14 for float16). However, I think > we can drop the rest - here's v2, which I've cross-tested on > aarch64-none-elf, aarch64_be-none-elf and arm-none-eabi: > It makes sense, thanks for the clarification. Christophe. > diff --git > a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/advsimd-intrins > index 583832a..4679a73 100644 > --- > a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/advsimd-intrinsics.exp > +++ > b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/advsimd-intrinsics.exp > @@ -27,8 +27,6 @@ load_lib gcc-dg.exp > > # Initialize `dg'. > load_lib c-torture.exp > -load_lib target-supports.exp > -load_lib torture-options.exp > > dg-init > > @@ -48,29 +46,15 @@ if {[istarget arm*-*-*]} then { > } > } > > -torture-init > set-torture-options $C_TORTURE_OPTIONS {{}} $LTO_TORTURE_OPTIONS > > # Make sure Neon flags are provided, if necessary. > > set additional_flags [add_options_for_arm_neon ""] > > # Main loop. > -foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] { > - # If we're only testing specific files and this isn't one of them, skip > it. > - if ![runtest_file_p $runtests $src] then { > - continue > - } > - > - # runtest_file_p is already run above, and the code below can run > - # runtest_file_p again, make sure everything for this test is > - # performed if the above runtest_file_p decided this runtest > - # instance should execute the test > - gcc_parallel_test_enable 0 > - gcc-dg-runtest $src "" $additional_flags > - gcc_parallel_test_enable 1 > -} > +gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] \ > + "" ${additional_flags} > > # All done. > set dg-do-what-default ${save-dg-do-what-default} > >
On Fri, May 29, 2015 at 11:48:34AM +0100, Alan Lawrence wrote: > Christophe Lyon wrote: > > > > This looks OK, but why can't you also drop the other torture-related > > lines as you did in your previous patch? > > I mean: > > load_lib c-torture.exp > > load_lib torture-options.exp > > etc... > > We need c-torture.exp in order to set-torture-options; we need to > set-torture-options to get the right list of variants, as otherwise we lose "-Og > -g" (as I did in my original patch 13/14 for float16). However, I think we can > drop the rest - here's v2, which I've cross-tested on aarch64-none-elf, > aarch64_be-none-elf and arm-none-eabi: This is fine, but please remember to write and install a suitable ChangeLog. Thanks, James > > diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/advsimd-intrins > index 583832a..4679a73 100644 > --- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/advsimd-intrinsics.exp > +++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/advsimd-intrinsics.exp > @@ -27,8 +27,6 @@ load_lib gcc-dg.exp > > # Initialize `dg'. > load_lib c-torture.exp > -load_lib target-supports.exp > -load_lib torture-options.exp > > dg-init > > @@ -48,29 +46,15 @@ if {[istarget arm*-*-*]} then { > } > } > > -torture-init > set-torture-options $C_TORTURE_OPTIONS {{}} $LTO_TORTURE_OPTIONS > > # Make sure Neon flags are provided, if necessary. > set additional_flags [add_options_for_arm_neon ""] > > # Main loop. > -foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] { > - # If we're only testing specific files and this isn't one of them, skip it. > - if ![runtest_file_p $runtests $src] then { > - continue > - } > - > - # runtest_file_p is already run above, and the code below can run > - # runtest_file_p again, make sure everything for this test is > - # performed if the above runtest_file_p decided this runtest > - # instance should execute the test > - gcc_parallel_test_enable 0 > - gcc-dg-runtest $src "" $additional_flags > - gcc_parallel_test_enable 1 > -} > +gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] \ > + "" ${additional_flags} > > # All done. > set dg-do-what-default ${save-dg-do-what-default} > >
diff --git a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/advsimd-intrins index 583832a..4679a73 100644 --- a/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/advsimd-intrinsics.exp +++ b/gcc/testsuite/gcc.target/aarch64/advsimd-intrinsics/advsimd-intrinsics.exp @@ -27,8 +27,6 @@ load_lib gcc-dg.exp # Initialize `dg'. load_lib c-torture.exp -load_lib target-supports.exp -load_lib torture-options.exp dg-init @@ -48,29 +46,15 @@ if {[istarget arm*-*-*]} then { } } -torture-init set-torture-options $C_TORTURE_OPTIONS {{}} $LTO_TORTURE_OPTIONS # Make sure Neon flags are provided, if necessary. set additional_flags [add_options_for_arm_neon ""] # Main loop. -foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c]] { - # If we're only testing specific files and this isn't one of them, skip it. - if ![runtest_file_p $runtests $src] then { - continue - } - - # runtest_file_p is already run above, and the code below can run - # runtest_file_p again, make sure everything for this test is - # performed if the above runtest_file_p decided this runtest - # instance should execute the test - gcc_parallel_test_enable 0 - gcc-dg-runtest $src "" $additional_flags - gcc_parallel_test_enable 1 -} +gcc-dg-runtest [lsort [glob -nocomplain $srcdir/$subdir/*.c]] \ + "" ${additional_flags} # All done. set dg-do-what-default ${save-dg-do-what-default}