Committed, tested on x86_64-unknown-linux-gnu. Richard.
2012-04-25 Richard Guenther <rguent...@suse.de> * gcc.target/i386/l_fma_float_5.c: Adjust. * gcc.target/i386/l_fma_double_4.c: Likewise. * gcc.target/i386/l_fma_float_2.c: Likewise. * gcc.target/i386/l_fma_float_6.c: Likewise. * gcc.target/i386/l_fma_double_1.c: Likewise. * gcc.target/i386/l_fma_double_5.c: Likewise. * gcc.target/i386/l_fma_float_3.c: Likewise. * gcc.target/i386/l_fma_double_2.c: Likewise. * gcc.target/i386/l_fma_double_6.c: Likewise. * gcc.target/i386/l_fma_float_4.c: Likewise. * gcc.target/i386/l_fma_double_3.c: Likewise. * gcc.target/i386/l_fma_float_1.c: Likewise. Index: gcc/testsuite/gcc.target/i386/l_fma_float_5.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_float_5.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_float_5.c (working copy) @@ -12,7 +12,7 @@ /* { dg-final { scan-assembler-times "vfmsub132ps" 8 } } */ /* { dg-final { scan-assembler-times "vfnmadd132ps" 8 } } */ /* { dg-final { scan-assembler-times "vfnmsub132ps" 8 } } */ -/* { dg-final { scan-assembler-times "vfmadd132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfmsub132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfmsub132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132ss" 16 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_double_4.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_double_4.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_double_4.c (working copy) @@ -12,7 +12,7 @@ /* { dg-final { scan-assembler-times "vfmsub132pd" 8 } } */ /* { dg-final { scan-assembler-times "vfnmadd132pd" 8 } } */ /* { dg-final { scan-assembler-times "vfnmsub132pd" 8 } } */ -/* { dg-final { scan-assembler-times "vfmadd132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfmsub132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfmsub132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132sd" 16 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_float_2.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_float_2.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_float_2.c (working copy) @@ -12,7 +12,7 @@ /* { dg-final { scan-assembler-times "vfmsub132ps" 8 } } */ /* { dg-final { scan-assembler-times "vfnmadd132ps" 8 } } */ /* { dg-final { scan-assembler-times "vfnmsub132ps" 8 } } */ -/* { dg-final { scan-assembler-times "vfmadd132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfmsub132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfmsub132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132ss" 16 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_float_6.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_float_6.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_float_6.c (working copy) @@ -12,7 +12,7 @@ /* { dg-final { scan-assembler-times "vfmsub132ps" 8 } } */ /* { dg-final { scan-assembler-times "vfnmadd132ps" 8 } } */ /* { dg-final { scan-assembler-times "vfnmsub132ps" 8 } } */ -/* { dg-final { scan-assembler-times "vfmadd132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfmsub132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfmsub132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132ss" 16 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_double_1.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_double_1.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_double_1.c (working copy) @@ -16,11 +16,11 @@ /* { dg-final { scan-assembler-times "vfnmadd231pd" 4 } } */ /* { dg-final { scan-assembler-times "vfnmsub132pd" 4 } } */ /* { dg-final { scan-assembler-times "vfnmsub231pd" 4 } } */ -/* { dg-final { scan-assembler-times "vfmadd132sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfmadd213sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfmsub132sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfmsub213sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmadd213sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmsub213sd" 4 } } */ +/* { dg-final { scan-assembler-times "vfmadd132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd213sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfmsub132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfmsub213sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmadd213sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmsub213sd" 8 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_double_5.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_double_5.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_double_5.c (working copy) @@ -12,7 +12,7 @@ /* { dg-final { scan-assembler-times "vfmsub132pd" 8 } } */ /* { dg-final { scan-assembler-times "vfnmadd132pd" 8 } } */ /* { dg-final { scan-assembler-times "vfnmsub132pd" 8 } } */ -/* { dg-final { scan-assembler-times "vfmadd132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfmsub132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfmsub132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132sd" 16 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_float_3.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_float_3.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_float_3.c (working copy) @@ -16,11 +16,11 @@ /* { dg-final { scan-assembler-times "vfnmadd231ps" 4 } } */ /* { dg-final { scan-assembler-times "vfnmsub132ps" 4 } } */ /* { dg-final { scan-assembler-times "vfnmsub231ps" 4 } } */ -/* { dg-final { scan-assembler-times "vfmadd132ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfmadd213ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfmsub132ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfmsub213ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmadd213ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmsub213ss" 4 } } */ +/* { dg-final { scan-assembler-times "vfmadd132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd213ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfmsub132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfmsub213ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmadd213ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmsub213ss" 8 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_double_2.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_double_2.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_double_2.c (working copy) @@ -12,7 +12,7 @@ /* { dg-final { scan-assembler-times "vfmsub132pd" 8 } } */ /* { dg-final { scan-assembler-times "vfnmadd132pd" 8 } } */ /* { dg-final { scan-assembler-times "vfnmsub132pd" 8 } } */ -/* { dg-final { scan-assembler-times "vfmadd132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfmsub132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfmsub132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132sd" 16 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_double_6.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_double_6.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_double_6.c (working copy) @@ -12,7 +12,7 @@ /* { dg-final { scan-assembler-times "vfmsub132pd" 8 } } */ /* { dg-final { scan-assembler-times "vfnmadd132pd" 8 } } */ /* { dg-final { scan-assembler-times "vfnmsub132pd" 8 } } */ -/* { dg-final { scan-assembler-times "vfmadd132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfmsub132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132sd" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfmsub132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132sd" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132sd" 16 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_float_4.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_float_4.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_float_4.c (working copy) @@ -12,7 +12,7 @@ /* { dg-final { scan-assembler-times "vfmsub132ps" 8 } } */ /* { dg-final { scan-assembler-times "vfnmadd132ps" 8 } } */ /* { dg-final { scan-assembler-times "vfnmsub132ps" 8 } } */ -/* { dg-final { scan-assembler-times "vfmadd132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfmsub132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132ss" 8 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfmsub132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132ss" 16 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132ss" 16 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_double_3.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_double_3.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_double_3.c (working copy) @@ -16,11 +16,11 @@ /* { dg-final { scan-assembler-times "vfnmadd231pd" 4 } } */ /* { dg-final { scan-assembler-times "vfnmsub132pd" 4 } } */ /* { dg-final { scan-assembler-times "vfnmsub231pd" 4 } } */ -/* { dg-final { scan-assembler-times "vfmadd132sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfmadd213sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfmsub132sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfmsub213sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmadd213sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132sd" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmsub213sd" 4 } } */ +/* { dg-final { scan-assembler-times "vfmadd132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd213sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfmsub132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfmsub213sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmadd213sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132sd" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmsub213sd" 8 } } */ Index: gcc/testsuite/gcc.target/i386/l_fma_float_1.c =================================================================== --- gcc/testsuite/gcc.target/i386/l_fma_float_1.c (revision 186812) +++ gcc/testsuite/gcc.target/i386/l_fma_float_1.c (working copy) @@ -16,11 +16,11 @@ /* { dg-final { scan-assembler-times "vfnmadd231ps" 4 } } */ /* { dg-final { scan-assembler-times "vfnmsub132ps" 4 } } */ /* { dg-final { scan-assembler-times "vfnmsub231ps" 4 } } */ -/* { dg-final { scan-assembler-times "vfmadd132ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfmadd213ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfmsub132ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfmsub213ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmadd132ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmadd213ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmsub132ss" 4 } } */ -/* { dg-final { scan-assembler-times "vfnmsub213ss" 4 } } */ +/* { dg-final { scan-assembler-times "vfmadd132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfmadd213ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfmsub132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfmsub213ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmadd132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmadd213ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmsub132ss" 8 } } */ +/* { dg-final { scan-assembler-times "vfnmsub213ss" 8 } } */