diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 1e19906d9d1..f823caf8410 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2011-06-07  H.J. Lu  <hongjiu.lu@intel.com>
+
+	* config/i386/i386.md (*movsf_internal): Optimize AVX check.
+
 2011-06-07  Sergey Grechanik  <mouseentity@ispras.ru>
 
 	* config/arm/arm.c (coproc_secondary_reload_class): Return NO_REGS for
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index 58de87b1752..3e18e7a2af1 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -3207,11 +3207,11 @@
     case 6:
       if (get_attr_mode (insn) == MODE_V4SF)
 	return "%vmovaps\t{%1, %0|%0, %1}";
+      if (TARGET_AVX)
+	return "vmovss\t{%1, %0, %0|%0, %0, %1}";
 
     case 7:
     case 8:
-      if (TARGET_AVX && REG_P (operands[0]) && REG_P (operands[1]))
-	return "vmovss\t{%1, %0, %0|%0, %0, %1}";
       return "%vmovss\t{%1, %0|%0, %1}";
 
     case 9: