Backport from mainline

	2012-01-21  Uros Bizjak  <ubizjak@gmail.com>

	* config/i386/i386.md (enabled): Do not disable fma4 for TARGET_FMA.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@195349 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8e28971734a8822a180bc2823979e905ad28dde0..98c886936ab07c3095d4c25660a294b1c8254770 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2012-01-21  Uros Bizjak  <ubizjak@gmail.com>
+
+       Backport from mainline
+       2012-01-21  Uros Bizjak  <ubizjak@gmail.com>
+
+       * config/i386/i386.md (enabled): Do not disable fma4 for TARGET_FMA.
+
 2012-01-21  Uros Bizjak  <ubizjak@gmail.com>
 
        PR rtl-optimization/56023

diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index affc5dd199af1bba56fac44ba61b3f6455e295e9..1e7bcad9b99b05cad1f684bf7489d3a9dc3bdf41 100644 (file)
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -629,7 +629,7 @@
 
 ;; Used to control the "enabled" attribute on a per-instruction basis.
 (define_attr "isa" "base,sse2,sse2_noavx,sse3,sse4,sse4_noavx,noavx,avx,
-                   bmi2,fma,fma4"
+                   bmi2,fma4,fma"
   (const_string "base"))
 
 (define_attr "enabled" ""
@@ -643,14 +643,8 @@
         (eq_attr "isa" "avx") (symbol_ref "TARGET_AVX")
         (eq_attr "isa" "noavx") (symbol_ref "!TARGET_AVX")
         (eq_attr "isa" "bmi2") (symbol_ref "TARGET_BMI2")
+        (eq_attr "isa" "fma4") (symbol_ref "TARGET_FMA4")
         (eq_attr "isa" "fma") (symbol_ref "TARGET_FMA")
-        ;; Fma instruction selection has to be done based on
-        ;; register pressure. For generating fma4, a cost model
-        ;; based on register pressure is required. Till then,
-        ;; fma4 instruction is disabled for targets that implement
-        ;; both fma and fma4 instruction sets.
-        (eq_attr "isa" "fma4")
-          (symbol_ref "TARGET_FMA4 && !TARGET_FMA")
        ]
        (const_int 1)))