Revert revision 181357.

gcc/

2011-11-24  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/51134
	* config/i386/i386.h (processor_costs): Revert revision 181357.
	* config/i386/i386.c (cost models): Likewise.
	(core_cost): Likewise.
	(promote_duplicated_reg): Likewise.
	(promote_duplicated_reg_to_size): Likewise.
	(processor_target): Likewise.
	(expand_set_or_movmem_via_loop_with_iter): Likewise.
	(expand_set_or_movmem_via_loop): Likewise.
	(emit_strset): Likewise.
	(expand_movmem_epilogue): Likewise.
	(expand_setmem_epilogue): Likewise.
	(expand_movmem_prologue): Likewise.
	(expand_setmem_prologue): Likewise.
	(expand_constant_movmem_prologue): Likewise.
	(expand_constant_setmem_prologue): Likewise.
	(decide_alg): Likewise.
	(decide_alignment): Likewise.
	(ix86_expand_movmem): Likewise.
	(ix86_expand_setmem): Likewise.
	(ix86_slow_unaligned_access): Likewise.
	* config/i386/i386.md (strset): Likewise.
	* config/i386/sse.md (vec_dupv4si): Likewise.
	(vec_dupv2di): Likewise.

gcc/testsuite/

2011-11-24  H.J. Lu  <hongjiu.lu@intel.com>

	PR target/51134
	* gcc.target/i386/sw-1.c: Revert revision 181357.

From-SVN: r181701

gcc/ChangeLog

+2011-11-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/51134
+	* config/i386/i386.h (processor_costs): Revert revision 181357.
+	* config/i386/i386.c (cost models): Likewise.
+	(core_cost): Likewise.
+	(promote_duplicated_reg): Likewise.
+	(promote_duplicated_reg_to_size): Likewise.
+	(processor_target): Likewise.
+	(expand_set_or_movmem_via_loop_with_iter): Likewise.
+	(expand_set_or_movmem_via_loop): Likewise.
+	(emit_strset): Likewise.
+	(expand_movmem_epilogue): Likewise.
+	(expand_setmem_epilogue): Likewise.
+	(expand_movmem_prologue): Likewise.
+	(expand_setmem_prologue): Likewise.
+	(expand_constant_movmem_prologue): Likewise.
+	(expand_constant_setmem_prologue): Likewise.
+	(decide_alg): Likewise.
+	(decide_alignment): Likewise.
+	(ix86_expand_movmem): Likewise.
+	(ix86_expand_setmem): Likewise.
+	(ix86_slow_unaligned_access): Likewise.
+	* config/i386/i386.md (strset): Likewise.
+	* config/i386/sse.md (vec_dupv4si): Likewise.
+	(vec_dupv2di): Likewise.
+
 2011-11-24  Georg-Johann Lay  <avr@gjlay.de>
 
 	* config/avr/avr.md (*rotlhi2.15): Set length to 4.

gcc/config/i386/i386-opts.h

@@ -37,8 +37,7 @@ enum stringop_alg
    rep_prefix_8_byte,
    loop_1_byte,
    loop,
-   unrolled_loop,
-   sse_loop
+   unrolled_loop
 };
 
 /* Available call abi.  */

gcc/config/i386/i386.h

@@ -159,12 +159,8 @@ struct processor_costs {
   const int fchs;		/* cost of FCHS instruction.  */
   const int fsqrt;		/* cost of FSQRT instruction.  */
 				/* Specify what algorithm
-				   to use for stringops on unknown size.
-				   First index is used to specify whether
-				   alignment is known or not.
-				   Second - to specify whether 32 or 64 bits
-				   are used.  */
-  struct stringop_algs memcpy[2][2], memset[2][2];
+				   to use for stringops on unknown size.  */
+  struct stringop_algs memcpy[2], memset[2];
   const int scalar_stmt_cost;   /* Cost of any scalar operation, excluding
 				   load and store.  */
   const int scalar_load_cost;   /* Cost of scalar load.  */

gcc/config/i386/i386.opt

@@ -324,9 +324,6 @@ Enum(stringop_alg) String(loop) Value(loop)
 EnumValue
 Enum(stringop_alg) String(unrolled_loop) Value(unrolled_loop)
 
-EnumValue
-Enum(stringop_alg) String(sse_loop) Value(sse_loop)
-
 mtls-dialect=
 Target RejectNegative Joined Var(ix86_tls_dialect) Enum(tls_dialect) Init(TLS_DIALECT_GNU)
 Use given thread-local storage dialect

gcc/config/i386/sse.md

@@ -7616,16 +7616,6 @@
    (set_attr "prefix" "maybe_vex,orig,vex,maybe_vex,orig,orig")
    (set_attr "mode" "V2SF,TI,TI,TI,V4SF,V2SF")])
 
-(define_expand "vec_dupv4si"
-  [(set (match_operand:V4SI 0 "register_operand" "")
-	(vec_duplicate:V4SI
-	  (match_operand:SI 1 "nonimmediate_operand" "")))]
-  "TARGET_SSE"
-{
-  if (!TARGET_AVX)
-    operands[1] = force_reg (V4SImode, operands[1]);
-})
-
 (define_insn "*vec_dupv4si"
   [(set (match_operand:V4SI 0 "register_operand"     "=x,x,x")
 	(vec_duplicate:V4SI
@@ -7642,16 +7632,6 @@
    (set_attr "prefix" "maybe_vex,vex,orig")
    (set_attr "mode" "TI,V4SF,V4SF")])
 
-(define_expand "vec_dupv2di"
-  [(set (match_operand:V2DI 0 "register_operand" "")
-	(vec_duplicate:V2DI
-	  (match_operand:DI 1 "nonimmediate_operand" "")))]
-  "TARGET_SSE"
-{
-  if (!TARGET_AVX)
-    operands[1] = force_reg (V2DImode, operands[1]);
-})
-
 (define_insn "*vec_dupv2di"
   [(set (match_operand:V2DI 0 "register_operand"     "=x,x,x,x")
 	(vec_duplicate:V2DI

gcc/testsuite/ChangeLog

+2011-11-24  H.J. Lu  <hongjiu.lu@intel.com>
+
+	PR target/51134
+	* gcc.target/i386/sw-1.c: Revert revision 181357.
+
 2011-11-24  Tobias Burnus  <burnus@net-b.de>
 
 	PR fortran/51218

gcc/testsuite/gcc.target/i386/sw-1.c

 /* { dg-do compile } */
-/* { dg-options "-O2 -fshrink-wrap -fdump-rtl-pro_and_epilogue -mstringop-strategy=rep_byte" } */
+/* { dg-options "-O2 -fshrink-wrap -fdump-rtl-pro_and_epilogue" } */
 
 #include <string.h>