pr45416.c: Allow bextr on x86.

	* gcc.dg/pr45416.c: Allow bextr on x86.
	* gcc.target/i386/fma4-builtin.c, gcc.target/i386/fma4-fma-2.c,
	gcc.target/i386/fma4-fma.c, gcc.target/i386/fma4-vector-2.c,
	gcc.target/i386/fma4-vector.c: Use -mno-fma.
	* gcc.target/i386/l_fma_double_1.c,
	gcc.target/i386/l_fma_double_2.c,
	gcc.target/i386/l_fma_double_3.c,
	gcc.target/i386/l_fma_double_4.c,
	gcc.target/i386/l_fma_double_5.c,
	gcc.target/i386/l_fma_double_6.c, gcc.target/i386/l_fma_float_1.c,
	gcc.target/i386/l_fma_float_2.c, gcc.target/i386/l_fma_float_3.c,
	gcc.target/i386/l_fma_float_4.c, gcc.target/i386/l_fma_float_5.c,
	gcc.target/i386/l_fma_float_6.c: Use -mno-fma4.
	* gcc.target/i386/pr27971.c: Use -mno-tbm.
	* gcc.target/i386/pr42542-4a.c: Use -mno-avx.
	* gcc.target/i386/pr59390.c: Use -mno-fma -mno-fma4.

From-SVN: r208939

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 3a73109176bea3cfc7a408a08a28a3f021208b75..e2031db8d33155ed993912f331070d26cc42892e 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,22 @@
+2014-03-29  Joseph Myers  <joseph@codesourcery.com>
+
+       * gcc.dg/pr45416.c: Allow bextr on x86.
+       * gcc.target/i386/fma4-builtin.c, gcc.target/i386/fma4-fma-2.c,
+       gcc.target/i386/fma4-fma.c, gcc.target/i386/fma4-vector-2.c,
+       gcc.target/i386/fma4-vector.c: Use -mno-fma.
+       * gcc.target/i386/l_fma_double_1.c,
+       gcc.target/i386/l_fma_double_2.c,
+       gcc.target/i386/l_fma_double_3.c,
+       gcc.target/i386/l_fma_double_4.c,
+       gcc.target/i386/l_fma_double_5.c,
+       gcc.target/i386/l_fma_double_6.c, gcc.target/i386/l_fma_float_1.c,
+       gcc.target/i386/l_fma_float_2.c, gcc.target/i386/l_fma_float_3.c,
+       gcc.target/i386/l_fma_float_4.c, gcc.target/i386/l_fma_float_5.c,
+       gcc.target/i386/l_fma_float_6.c: Use -mno-fma4.
+       * gcc.target/i386/pr27971.c: Use -mno-tbm.
+       * gcc.target/i386/pr42542-4a.c: Use -mno-avx.
+       * gcc.target/i386/pr59390.c: Use -mno-fma -mno-fma4.
+
 2014-03-29  Jakub Jelinek  <jakub@redhat.com>
 
        PR target/60648

diff --git a/gcc/testsuite/gcc.dg/pr45416.c b/gcc/testsuite/gcc.dg/pr45416.c
index 2f013ccd610ef49c2dc46e37f18c6d5923c0d077..57950344886f69f7df04126250833d98f43eb915 100644 (file)
--- a/gcc/testsuite/gcc.dg/pr45416.c
+++ b/gcc/testsuite/gcc.dg/pr45416.c
@@ -9,7 +9,7 @@ int foo(long long a)
    return 0;
 }
 
-/* { dg-final { scan-assembler "andl" { target i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } " */
+/* { dg-final { scan-assembler "andl|bextr" { target i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } } " */
 /* { dg-final { scan-assembler-not "setne" { target i?86-*-linux* i?86-*-gnu* x86_64-*-linux* } } }" */
 /* { dg-final { scan-assembler "and|ubfx"  { target arm*-*-* } } } */
 /* { dg-final { scan-assembler-not "moveq" { target arm*-*-* } } }" */

diff --git a/gcc/testsuite/gcc.target/i386/fma4-builtin.c b/gcc/testsuite/gcc.target/i386/fma4-builtin.c
index 7135cc93393cbf8d0ef05c3b34547078a7b5e399..3e59a7181ec61c9b2142305d9d4b0dc870ef1cbf 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/fma4-builtin.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-builtin.c
@@ -2,7 +2,7 @@
    and add instructions FMA4 systems.  */
 
 /* { dg-do compile { target { ! { ia32 } } } } */
-/* { dg-options "-O2 -mfma4" } */
+/* { dg-options "-O2 -mfma4 -mno-fma" } */
 
 #ifndef __FP_FAST_FMAF
 # error "__FP_FAST_FMAF should be defined"

diff --git a/gcc/testsuite/gcc.target/i386/fma4-fma-2.c b/gcc/testsuite/gcc.target/i386/fma4-fma-2.c
index c15be1edace91c81010137a26077212024f26c61..ae6ca8d6d7590fdb2932ddb055d8d56ef58ef1e4 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/fma4-fma-2.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-fma-2.c
@@ -3,7 +3,7 @@
    vfnmsubss on FMA4 systems.  */
 
 /* { dg-do compile { target { ! { ia32 } } } } */
-/* { dg-options "-O2 -funsafe-math-optimizations -mfma4" } */
+/* { dg-options "-O2 -funsafe-math-optimizations -mfma4 -mno-fma" } */
 
 extern void exit (int);
 

diff --git a/gcc/testsuite/gcc.target/i386/fma4-fma.c b/gcc/testsuite/gcc.target/i386/fma4-fma.c
index 63b35dc4bcb9a93c3a75487cabc8a9d46daa22f4..1b8fb849ddadf9f15022a50ed8b3c2cd63f72f95 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/fma4-fma.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-fma.c
@@ -3,7 +3,7 @@
    vfnmsubss on FMA4 systems.  */
 
 /* { dg-do compile { target { ! { ia32 } } } } */
-/* { dg-options "-O2 -mfma4" } */
+/* { dg-options "-O2 -mfma4 -mno-fma" } */
 
 extern void exit (int);
 

diff --git a/gcc/testsuite/gcc.target/i386/fma4-vector-2.c b/gcc/testsuite/gcc.target/i386/fma4-vector-2.c
index d8b0d0813bc6a85d18e34988e2abb52024e4145e..b518aa82827d82390de5977f14053c2270085fa1 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/fma4-vector-2.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-vector-2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile { target { ! { ia32 } } } } */
-/* { dg-options "-O2 -mfma4 -ftree-vectorize -mtune=generic" } */
+/* { dg-options "-O2 -mfma4 -ftree-vectorize -mtune=generic -mno-fma" } */
 
 float r[256], s[256];
 float x[256];

diff --git a/gcc/testsuite/gcc.target/i386/fma4-vector.c b/gcc/testsuite/gcc.target/i386/fma4-vector.c
index db5ffdd3391c88efb3893f14c998522e16bf71c4..cd5506344b3bdfb9ccd3812a70371278afd4972c 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/fma4-vector.c
+++ b/gcc/testsuite/gcc.target/i386/fma4-vector.c
@@ -2,7 +2,7 @@
    instructions vector into vfmaddps on FMA4 systems.  */
 
 /* { dg-do compile { target { ! { ia32 } } } } */
-/* { dg-options "-O2 -mfma4 -ftree-vectorize -mtune=generic" } */
+/* { dg-options "-O2 -mfma4 -ftree-vectorize -mtune=generic -mno-fma" } */
 
 extern void exit (int);
 

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_double_1.c b/gcc/testsuite/gcc.target/i386/l_fma_double_1.c
index 1d99b4caa5b0981419d997cf3d3a4981393cdf04..94e512b9602dbd4deaa6468a4307ae1c642675c9 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_double_1.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_double_1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_double_2.c b/gcc/testsuite/gcc.target/i386/l_fma_double_2.c
index e10110006f3afc13c626efc6199e960e43f32714..ffceab48f480444b7fd8a27fa75969ae3d4706bf 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_double_2.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_double_2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_double_3.c b/gcc/testsuite/gcc.target/i386/l_fma_double_3.c
index f099e25f8edb7f4ee79e740510a7e17761ca0f9e..cdb4d33bee44a5252fd1892ffe7a5da2c31b69d0 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_double_3.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_double_3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_double_4.c b/gcc/testsuite/gcc.target/i386/l_fma_double_4.c
index 969f31c7f3545d30733c36acf70922d1769ffee1..dda487e98045f6d9a107a3747cff94b882031bd7 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_double_4.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_double_4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_double_5.c b/gcc/testsuite/gcc.target/i386/l_fma_double_5.c
index 85ccdd0da44419f26f9f13c684dea24cda97fee2..98909aeeb84c098ba684ef79728b22af9f209dce 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_double_5.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_double_5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_double_6.c b/gcc/testsuite/gcc.target/i386/l_fma_double_6.c
index 019ed9ad0283e19f476d91f9d9885a58a109aaa4..538065a3102d88f5b7e55446e47f897cb7f0d85c 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_double_6.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_double_6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_float_1.c b/gcc/testsuite/gcc.target/i386/l_fma_float_1.c
index d1913d7683f78043c4e1ff8159b96f1451c3a74f..ff109817d5d8f2fe4bd8da4b0fdef115d1d7ed6a 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_float_1.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_float_1.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_float_2.c b/gcc/testsuite/gcc.target/i386/l_fma_float_2.c
index 5e0142545c8618baf177b8d1fc831cfe52ac9664..38c6b5283049024a160948b0c73a95f5543da168 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_float_2.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_float_2.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_float_3.c b/gcc/testsuite/gcc.target/i386/l_fma_float_3.c
index 7b9e3f54528353ec8b780b9f983ac4d4c006356b..177ba352262b9cf35b117734d65bfdec1c36822f 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_float_3.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_float_3.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_float_4.c b/gcc/testsuite/gcc.target/i386/l_fma_float_4.c
index cc675c14aae471915f354b1ba6136f48cd990d62..8ee68d1af1cc5d41f8a296ac63eec1ab992d47cf 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_float_4.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_float_4.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_float_5.c b/gcc/testsuite/gcc.target/i386/l_fma_float_5.c
index ac0b361475ad47e46fa57d06a593521088ef52f5..23288d0da8efadc3fa5f64392d1e18456a5cb747 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_float_5.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_float_5.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/l_fma_float_6.c b/gcc/testsuite/gcc.target/i386/l_fma_float_6.c
index c84ac1196b427e805d56a16e72d09bff26a08f4f..07a5fbae317dfd3068449a92d58d6c949010e89b 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/l_fma_float_6.c
+++ b/gcc/testsuite/gcc.target/i386/l_fma_float_6.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic" } */
+/* { dg-options "-O3 -Wno-attributes -mfpmath=sse -mfma -mtune=generic -mno-fma4" } */
 
 /* Test that the compiler properly optimizes floating point multiply
    and add instructions into FMA3 instructions.  */

diff --git a/gcc/testsuite/gcc.target/i386/pr27971.c b/gcc/testsuite/gcc.target/i386/pr27971.c
index 27888de6d2f50eb39eedcb2ee73917e56ca6b965..149bf2b8e556a55fca39a58433f9044e7ca596e9 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr27971.c
+++ b/gcc/testsuite/gcc.target/i386/pr27971.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O2" } */
+/* { dg-options "-O2 -mno-tbm" } */
 
 unsigned array[4];
 

diff --git a/gcc/testsuite/gcc.target/i386/pr42542-4a.c b/gcc/testsuite/gcc.target/i386/pr42542-4a.c
index bea6c1f5043568b77abf40ce9614e6cdb4910610..19e872a7e75c0bad5365b3d45674f816b240fb42 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr42542-4a.c
+++ b/gcc/testsuite/gcc.target/i386/pr42542-4a.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-O1 -msse4.2 -ftree-vectorize" } */
+/* { dg-options "-O1 -msse4.2 -ftree-vectorize -mno-avx" } */
 
 #include "pr42542-4.c"
 

diff --git a/gcc/testsuite/gcc.target/i386/pr59390.c b/gcc/testsuite/gcc.target/i386/pr59390.c
index 7dc925ae9fbbb6d4ae29c9bc9afe477e736fc0c2..749c61a58ff5210e6e51b0135155a6926b2c9e94 100644 (file)
--- a/gcc/testsuite/gcc.target/i386/pr59390.c
+++ b/gcc/testsuite/gcc.target/i386/pr59390.c
@@ -1,5 +1,5 @@
 /* { dg-do compile } */
-/* { dg-options "-std=c99 -O3" } */
+/* { dg-options "-std=c99 -O3 -mno-fma -mno-fma4" } */
 
 extern double fma (double, double, double);
 void fun() __attribute__((target("fma")));