* config/i386/i386.c (ix86_expand_round_sse4): New function.

	* config/i386/i386-protos.h (ix86_expand_round_sse4): New prototype.
	* config/i386/i386.md (round<mode>2): Use ix86_expand_round_sse4
	for TARGET_ROUND.

	(rint<mode>2): Simplify TARGET_ROUND check.
	(floor<mode>2): Ditto.
	(ceil<mode>2): Ditto.
	(btrunc<mode>2): Ditto.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@177751 138bc75d-0d04-0410-961f-82ee72b054a4

4 files changed, 165 insertions, 106 deletions

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index c13819a0ce0..82e79b06944 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,10 +1,22 @@
+2011-08-14  Uros Bizjak  <ubizjak@gmail.com>
+
+	* config/i386/i386.c (ix86_expand_round_sse4): New function.
+	* config/i386/i386-protos.h (ix86_expand_round_sse4): New prototype.
+	* config/i386/i386.md (round<mode>2): Use ix86_expand_round_sse4
+	for TARGET_ROUND.
+
+	(rint<mode>2): Simplify TARGET_ROUND check.
+	(floor<mode>2): Ditto.
+	(ceil<mode>2): Ditto.
+	(btrunc<mode>2): Ditto.
+
 2011-08-14  Anatoly Sokolov  <aesok@post.ru>
 
 	* config/mmix/mmix.c (TARGET_PREFERRED_OUTPUT_RELOAD_CLASS): Redefine
 	as mmix_preferred_output_reload_class.
 
 2011-08-14  Georg-Johann Lay  <avr@gjlay.de>
-	
+
 	* PR target/49903
 	* config/avr/avr.md (UNSPEC_IDENTITY): New c_enum.
 	(branch_unspec): New insn.
@@ -38,98 +50,97 @@
 2011-08-12   Diego Novillo  <dnovillo@google.com>
 
 	* data-streamer.h (streamer_write_zero): Rename from output_zero.
- 	(streamer_write_uhwi): Rename from lto_output_uleb128.
- 	(streamer_write_hwi): Rename from output_sleb128.
- 	(streamer_write_string): Rename from lto_output_string.
- 	(streamer_string_index): Rename from lto_string_index.
- 	(streamer_write_string_with_length): Rename from
- 	lto_output_string_with_length.
- 	(streamer_write_uhwi_stream): Rename from lto_output_uleb128_stream.
- 	(streamer_write_hwi_stream): Rename from lto_output_sleb128_stream.
- 	(streamer_read_string): Rename from lto_input_string.
- 	(streamer_read_indexed_string): Rename from input_string_internal.
- 	(streamer_read_uhwi): Rename from lto_input_uleb128.
- 	(streamer_read_hwi): Rename from lto_input_sleb128.
- 	(streamer_write_hwi_in_range): Rename from lto_output_int_in_range.
- 	(streamer_read_hwi_in_range): Rename from lto_input_int_in_range.
- 	(streamer_write_enum): Rename from lto_output_enum.
- 	(streamer_read_enum): Rename from lto_input_enum.
- 	(streamer_write_record_start): Rename from output_record_start.
- 	(streamer_read_record_start): Rename from input_record_start.
- 	(streamer_write_bitpack): Rename from lto_output_bitpack.
- 	(streamer_read_bitpack): Rename from lto_input_bitpack.
- 	(streamer_write_char_stream): Rename from lto_output_1_stream.
- 	(streamer_read_uchar): Rename from lto_input_1_unsigned.
- 	* tree-streamer.h (streamer_cache_d): Rename from lto_streamer_cache_d.
- 	(streamer_handle_as_builtin_p): Rename from lto_stream_as_builtin_p.
- 	(streamer_read_string_cst): Rename from input_string_cst.
- 	(streamer_read_chain): Rename from lto_input_chain.
- 	(streamer_alloc_tree): Rename from lto_materialize_tree.
- 	(streamer_read_tree_body): Rename from lto_input_tree_pointers.
- 	(streamer_get_pickled_tree): Rename from lto_get_pickled_tree.
- 	(streamer_get_builtin_tree): Rename from lto_get_builtin_tree.
- 	(streamer_read_integer_cst): Rename from lto_input_integer_cst.
- 	(streamer_read_tree_bitfields): Rename from tree_read_bitfields.
- 	(streamer_write_chain): Rename from lto_output_chain.
- 	(streamer_write_tree_header): Rename from lto_output_tree_header.
- 	(streamer_pack_tree_bitfields): Rename from pack_value_fields.
- 	(streamer_write_tree_body): Rename from lto_output_tree_pointers.
- 	(streamer_write_integer_cst): Rename from lto_output_integer_cst.
- 	(streamer_write_builtin): Rename from lto_output_builtin_tree.
- 	(streamer_check_handled_ts_structures): Rename from
- 	check_handled_ts_structures.
- 	(streamer_tree_cache_insert): Rename from lto_streamer_cache_insert.
- 	(streamer_tree_cache_insert_at): Rename from
- 	lto_streamer_cache_insert_at.
- 	(streamer_tree_cache_append): Rename from lto_streamer_cache_append.
- 	(streamer_tree_cache_lookup): Rename from lto_streamer_cache_lookup.
- 	(streamer_tree_cache_get): Rename from lto_streamer_cache_get.
- 	(streamer_tree_cache_create): Rename from lto_streamer_cache_create.
- 	(streamer_tree_cache_delete): Rename from lto_streamer_cache_delete.
- 	* tree-streamer-out.c (write_string_cst): Rename from output_string_cst.
- 	(write_identifier): Rename from output_identifier.
- 	(write_ts_common_tree_pointers): Rename from
- 	lto_output_ts_common_tree_pointers.
- 	(write_ts_vector_tree_pointers): Rename from
- 	lto_output_ts_vector_tree_pointers.
- 	(write_ts_complex_tree_pointers): Rename from
- 	lto_output_ts_complex_tree_pointers.
- 	(write_ts_decl_minimal_tree_pointers): Rename from
- 	lto_output_ts_decl_minimal_tree_pointers.
- 	(write_ts_decl_common_tree_pointers): Rename from
- 	lto_output_ts_decl_common_tree_pointers.
- 	(write_ts_decl_non_common_tree_pointers): Rename from
- 	lto_output_ts_decl_non_common_tree_pointers.
- 	(write_ts_decl_with_vis_tree_pointers): Rename from
- 	lto_output_ts_decl_with_vis_tree_pointers.
- 	(write_ts_field_decl_tree_pointers): Rename from
- 	lto_output_ts_field_decl_tree_pointers.
- 	(write_ts_function_decl_tree_pointers): Rename from
- 	lto_output_ts_function_decl_tree_pointers.
- 	(write_ts_type_common_tree_pointers): Rename from
- 	lto_output_ts_type_common_tree_pointers.
- 	(write_ts_type_non_common_tree_pointers): Rename from
- 	lto_output_ts_type_non_common_tree_pointers.
- 	(write_ts_list_tree_pointers): Rename from
- 	lto_output_ts_list_tree_pointers.
- 	(write_ts_vec_tree_pointers): Rename from
- 	lto_output_ts_vec_tree_pointers.
- 	(write_ts_exp_tree_pointers): Rename from
- 	lto_output_ts_exp_tree_pointers.
- 	(write_ts_block_tree_pointers): Rename from
- 	lto_output_ts_block_tree_pointers.
- 	(write_ts_binfo_tree_pointers): Rename from
- 	lto_output_ts_binfo_tree_pointers.
- 	(write_ts_constructor_tree_pointers): Rename from
- 	lto_output_ts_constructor_tree_pointers.
- 	(write_ts_target_option): Rename from
- 	lto_output_ts_target_option.
- 	(write_ts_translation_unit_decl_tree_pointers): Rename from
- 	lto_output_ts_translation_unit_decl_tree_pointers.
- 	* tree-streamer.c (streamer_tree_cache_add_to_node_array):
- 	Rename from lto_streamer_cache_add_to_node_array.
- 	(streamer_tree_cache_insert_1): Rename from lto_streamer_cache_insert_1.
- 	(record_common_node): Rename from lto_record_common_node.
+	(streamer_write_uhwi): Rename from lto_output_uleb128.
+	(streamer_write_hwi): Rename from output_sleb128.
+	(streamer_write_string): Rename from lto_output_string.
+	(streamer_string_index): Rename from lto_string_index.
+	(streamer_write_string_with_length): Rename from
+	lto_output_string_with_length.
+	(streamer_write_uhwi_stream): Rename from lto_output_uleb128_stream.
+	(streamer_write_hwi_stream): Rename from lto_output_sleb128_stream.
+	(streamer_read_string): Rename from lto_input_string.
+	(streamer_read_indexed_string): Rename from input_string_internal.
+	(streamer_read_uhwi): Rename from lto_input_uleb128.
+	(streamer_read_hwi): Rename from lto_input_sleb128.
+	(streamer_write_hwi_in_range): Rename from lto_output_int_in_range.
+	(streamer_read_hwi_in_range): Rename from lto_input_int_in_range.
+	(streamer_write_enum): Rename from lto_output_enum.
+	(streamer_read_enum): Rename from lto_input_enum.
+	(streamer_write_record_start): Rename from output_record_start.
+	(streamer_read_record_start): Rename from input_record_start.
+	(streamer_write_bitpack): Rename from lto_output_bitpack.
+	(streamer_read_bitpack): Rename from lto_input_bitpack.
+	(streamer_write_char_stream): Rename from lto_output_1_stream.
+	(streamer_read_uchar): Rename from lto_input_1_unsigned.
+	* tree-streamer.h (streamer_cache_d): Rename from lto_streamer_cache_d.
+	(streamer_handle_as_builtin_p): Rename from lto_stream_as_builtin_p.
+	(streamer_read_string_cst): Rename from input_string_cst.
+	(streamer_read_chain): Rename from lto_input_chain.
+	(streamer_alloc_tree): Rename from lto_materialize_tree.
+	(streamer_read_tree_body): Rename from lto_input_tree_pointers.
+	(streamer_get_pickled_tree): Rename from lto_get_pickled_tree.
+	(streamer_get_builtin_tree): Rename from lto_get_builtin_tree.
+	(streamer_read_integer_cst): Rename from lto_input_integer_cst.
+	(streamer_read_tree_bitfields): Rename from tree_read_bitfields.
+	(streamer_write_chain): Rename from lto_output_chain.
+	(streamer_write_tree_header): Rename from lto_output_tree_header.
+	(streamer_pack_tree_bitfields): Rename from pack_value_fields.
+	(streamer_write_tree_body): Rename from lto_output_tree_pointers.
+	(streamer_write_integer_cst): Rename from lto_output_integer_cst.
+	(streamer_write_builtin): Rename from lto_output_builtin_tree.
+	(streamer_check_handled_ts_structures): Rename from
+	check_handled_ts_structures.
+	(streamer_tree_cache_insert): Rename from lto_streamer_cache_insert.
+	(streamer_tree_cache_insert_at): Rename from
+	lto_streamer_cache_insert_at.
+	(streamer_tree_cache_append): Rename from lto_streamer_cache_append.
+	(streamer_tree_cache_lookup): Rename from lto_streamer_cache_lookup.
+	(streamer_tree_cache_get): Rename from lto_streamer_cache_get.
+	(streamer_tree_cache_create): Rename from lto_streamer_cache_create.
+	(streamer_tree_cache_delete): Rename from lto_streamer_cache_delete.
+	* tree-streamer-out.c (write_string_cst): Rename from output_string_cst.
+	(write_identifier): Rename from output_identifier.
+	(write_ts_common_tree_pointers): Rename from
+	lto_output_ts_common_tree_pointers.
+	(write_ts_vector_tree_pointers): Rename from
+	lto_output_ts_vector_tree_pointers.
+	(write_ts_complex_tree_pointers): Rename from
+	lto_output_ts_complex_tree_pointers.
+	(write_ts_decl_minimal_tree_pointers): Rename from
+	lto_output_ts_decl_minimal_tree_pointers.
+	(write_ts_decl_common_tree_pointers): Rename from
+	lto_output_ts_decl_common_tree_pointers.
+	(write_ts_decl_non_common_tree_pointers): Rename from
+	lto_output_ts_decl_non_common_tree_pointers.
+	(write_ts_decl_with_vis_tree_pointers): Rename from
+	lto_output_ts_decl_with_vis_tree_pointers.
+	(write_ts_field_decl_tree_pointers): Rename from
+	lto_output_ts_field_decl_tree_pointers.
+	(write_ts_function_decl_tree_pointers): Rename from
+	lto_output_ts_function_decl_tree_pointers.
+	(write_ts_type_common_tree_pointers): Rename from
+	lto_output_ts_type_common_tree_pointers.
+	(write_ts_type_non_common_tree_pointers): Rename from
+	lto_output_ts_type_non_common_tree_pointers.
+	(write_ts_list_tree_pointers): Rename from
+	lto_output_ts_list_tree_pointers.
+	(write_ts_vec_tree_pointers): Rename from
+	lto_output_ts_vec_tree_pointers.
+	(write_ts_exp_tree_pointers): Rename from
+	lto_output_ts_exp_tree_pointers.
+	(write_ts_block_tree_pointers): Rename from
+	lto_output_ts_block_tree_pointers.
+	(write_ts_binfo_tree_pointers): Rename from
+	lto_output_ts_binfo_tree_pointers.
+	(write_ts_constructor_tree_pointers): Rename from
+	lto_output_ts_constructor_tree_pointers.
+	(write_ts_target_option): Rename from lto_output_ts_target_option.
+	(write_ts_translation_unit_decl_tree_pointers): Rename from
+	lto_output_ts_translation_unit_decl_tree_pointers.
+	* tree-streamer.c (streamer_tree_cache_add_to_node_array):
+	Rename from lto_streamer_cache_add_to_node_array.
+	(streamer_tree_cache_insert_1): Rename from lto_streamer_cache_insert_1.
+	(record_common_node): Rename from lto_record_common_node.
 
 	* streamer-hooks.h (bitpack_d, lto_streamer_cache_d): Remove forward
 	declarations.
@@ -144,8 +155,7 @@
 
 2011-08-12  Nick Clifton  <nickc@redhat.com>
 
-	* builtins.c (expand_builtin_memcmp): Do not use cmpstrnsi
-	pattern.
+	* builtins.c (expand_builtin_memcmp): Do not use cmpstrnsi pattern.
 	* doc/md.texi (cmpstrn): Note that the comparison stops if both
 	fetched bytes are zero.
 	(cmpstr): Likewise.
diff --git a/gcc/config/i386/i386-protos.h b/gcc/config/i386/i386-protos.h
index c3eb150fbb9..7deeae732ae 100644
--- a/gcc/config/i386/i386-protos.h
+++ b/gcc/config/i386/i386-protos.h
@@ -174,6 +174,7 @@ extern void ix86_expand_lfloorceil (rtx, rtx, bool);
 extern void ix86_expand_rint (rtx, rtx);
 extern void ix86_expand_floorceil (rtx, rtx, bool);
 extern void ix86_expand_floorceildf_32 (rtx, rtx, bool);
+extern void ix86_expand_round_sse4 (rtx, rtx);
 extern void ix86_expand_round (rtx, rtx);
 extern void ix86_expand_rounddf_32 (rtx, rtx);
 extern void ix86_expand_trunc (rtx, rtx);
diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c
index fedb2cacc71..fe6ccbeb59c 100644
--- a/gcc/config/i386/i386.c
+++ b/gcc/config/i386/i386.c
@@ -32676,6 +32676,52 @@ ix86_expand_round (rtx operand0, rtx operand1)
 
   emit_move_insn (operand0, res);
 }
+
+/* Expand SSE sequence for computing round
+   from OP1 storing into OP0 using sse4 round insn.  */
+void
+ix86_expand_round_sse4 (rtx op0, rtx op1)
+{
+  enum machine_mode mode = GET_MODE (op0);
+  rtx e1, e2, e3, res, half, mask;
+  const struct real_format *fmt;
+  REAL_VALUE_TYPE pred_half, half_minus_pred_half;
+  rtx (*gen_round) (rtx, rtx, rtx);
+
+  switch (mode)
+    {
+    case SFmode:
+      gen_round = gen_sse4_1_roundsf2;
+      break;
+    case DFmode:
+      gen_round = gen_sse4_1_rounddf2;
+      break;
+    default:
+      gcc_unreachable ();
+    }
+
+  /* e1 = fabs(op1) */
+  e1 = ix86_expand_sse_fabs (op1, &mask);
+
+  /* load nextafter (0.5, 0.0) */
+  fmt = REAL_MODE_FORMAT (mode);
+  real_2expN (&half_minus_pred_half, -(fmt->p) - 1, mode);
+  REAL_ARITHMETIC (pred_half, MINUS_EXPR, dconsthalf, half_minus_pred_half);
+
+  /* e2 = e1 + 0.5 */
+  half = force_reg (mode, const_double_from_real_value (pred_half, mode));
+  e2 = expand_simple_binop (mode, PLUS, e1, half, NULL_RTX, 0, OPTAB_DIRECT);
+
+  /* e3 = trunc(e2) */
+  e3 = gen_reg_rtx (mode);
+  emit_insn (gen_round (e3, e2, GEN_INT (ROUND_TRUNC)));
+
+  /* res = copysign (e3, op1) */
+  res = gen_reg_rtx (mode);
+  ix86_sse_copysign_to_positive (res, e3, op1, mask);
+
+  emit_move_insn (op0, res);
+}
 
 
 /* Table of valid machine attributes.  */
diff --git a/gcc/config/i386/i386.md b/gcc/config/i386/i386.md
index e61b0f4a03e..e7ae3970511 100644
--- a/gcc/config/i386/i386.md
+++ b/gcc/config/i386/i386.md
@@ -14394,11 +14394,11 @@
   if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
       && !flag_trapping_math)
     {
-      if (!TARGET_ROUND && optimize_insn_for_size_p ())
-	FAIL;
       if (TARGET_ROUND)
 	emit_insn (gen_sse4_1_round<mode>2
 		   (operands[0], operands[1], GEN_INT (ROUND_MXCSR)));
+      else if (optimize_insn_for_size_p ())
+        FAIL;
       else
 	ix86_expand_rint (operand0, operand1);
     }
@@ -14431,7 +14431,12 @@
   if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
       && !flag_trapping_math && !flag_rounding_math)
     {
-      if (TARGET_64BIT || (<MODE>mode != DFmode))
+      if (TARGET_ROUND)
+        {
+	  operands[1] = force_reg (<MODE>mode, operands[1]);
+	  ix86_expand_round_sse4 (operands[0], operands[1]);
+	}
+      else if (TARGET_64BIT || (<MODE>mode != DFmode))
 	ix86_expand_round (operands[0], operands[1]);
       else
 	ix86_expand_rounddf_32 (operands[0], operands[1]);
@@ -14663,14 +14668,13 @@
        && !flag_trapping_math)"
 {
   if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
-      && !flag_trapping_math
-      && (TARGET_ROUND || optimize_insn_for_speed_p ()))
+      && !flag_trapping_math)
     {
-      if (!TARGET_ROUND && optimize_insn_for_size_p ())
-	FAIL;
       if (TARGET_ROUND)
 	emit_insn (gen_sse4_1_round<mode>2
 		   (operands[0], operands[1], GEN_INT (ROUND_FLOOR)));
+      else if (optimize_insn_for_size_p ())
+        FAIL;
       else if (TARGET_64BIT || (<MODE>mode != DFmode))
 	ix86_expand_floorceil (operand0, operand1, true);
       else
@@ -14922,8 +14926,7 @@
        && !flag_trapping_math)"
 {
   if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
-      && !flag_trapping_math
-      && (TARGET_ROUND || optimize_insn_for_speed_p ()))
+      && !flag_trapping_math)
     {
       if (TARGET_ROUND)
 	emit_insn (gen_sse4_1_round<mode>2
@@ -15179,8 +15182,7 @@
        && !flag_trapping_math)"
 {
   if (SSE_FLOAT_MODE_P (<MODE>mode) && TARGET_SSE_MATH
-      && !flag_trapping_math
-      && (TARGET_ROUND || optimize_insn_for_speed_p ()))
+      && !flag_trapping_math)
     {
       if (TARGET_ROUND)
 	emit_insn (gen_sse4_1_round<mode>2