CbC/CbC_gcc: gcc/tree-complex.c comparison

comparison gcc/tree-complex.c @ 111:04ced10e8804

gcc 7

author	kono
date	Fri, 27 Oct 2017 22:46:09 +0900
parents	f6334be47118
children	84e7813d76e9

comparison

equal deleted inserted replaced

-:561a7518be6b
+:04ced10e8804
 /* Lower complex number operations to scalar operations.
-Copyright (C) 2004, 2005, 2006, 2007, 2008, 2009, 2010
+Copyright (C) 2004-2017 Free Software Foundation, Inc.
-Free Software Foundation, Inc.
 This file is part of GCC.
 GCC is free software; you can redistribute it and/or modify it
 under the terms of the GNU General Public License as published by the
 <http://www.gnu.org/licenses/>.  */
 #include "config.h"
 #include "system.h"
 #include "coretypes.h"
-#include "tm.h"
+#include "backend.h"
+#include "rtl.h"
 #include "tree.h"
-#include "flags.h"
-#include "tree-flow.h"
 #include "gimple.h"
-#include "tree-iterator.h"
+#include "cfghooks.h"
 #include "tree-pass.h"
+#include "ssa.h"
+#include "fold-const.h"
+#include "stor-layout.h"
+#include "tree-eh.h"
+#include "gimplify.h"
+#include "gimple-iterator.h"
+#include "gimplify-me.h"
+#include "tree-cfg.h"
+#include "tree-dfa.h"
+#include "tree-ssa.h"
 #include "tree-ssa-propagate.h"
+#include "tree-hasher.h"
+#include "cfgloop.h"
+#include "cfganal.h"
 /* For each complex ssa name, a lattice value.  We're interested in finding
 out whether a complex number is degenerate in some way, having only real
 or only complex parts.  */
 constants.  */
 typedef int complex_lattice_t;
 #define PAIR(a, b)  ((a) << 2 | (b))
-DEF_VEC_I(complex_lattice_t);
-DEF_VEC_ALLOC_I(complex_lattice_t, heap);
+static vec<complex_lattice_t> complex_lattice_values;
-static VEC(complex_lattice_t, heap) *complex_lattice_values;
 /* For each complex variable, a pair of variables for the components exists in
 the hashtable.  */
-static htab_t complex_variable_components;
+static int_tree_htab_type *complex_variable_components;
 /* For each complex SSA_NAME, a pair of ssa names for the components.  */
-static VEC(tree, heap) *complex_ssa_name_components;
+static vec<tree> complex_ssa_name_components;
+/* Vector of PHI triplets (original complex PHI and corresponding real and
+imag PHIs if real and/or imag PHIs contain temporarily
+non-SSA_NAME/non-invariant args that need to be replaced by SSA_NAMEs.  */
+static vec<gphi *> phis_to_revisit;
 /* Lookup UID in the complex_variable_components hashtable and return the
 associated tree.  */
 static tree
 cvc_lookup (unsigned int uid)
 {
-struct int_tree_map *h, in;
+struct int_tree_map in;
 in.uid = uid;
-h = (struct int_tree_map *) htab_find_with_hash (complex_variable_components, &in, uid);
+return complex_variable_components->find_with_hash (in, uid).to;
-return h ? h->to : NULL;
 }
 /* Insert the pair UID, TO into the complex_variable_components hashtable.  */
 static void
 cvc_insert (unsigned int uid, tree to)
 {
-struct int_tree_map *h;
+int_tree_map h;
-void **loc;
+int_tree_map *loc;
-h = XNEW (struct int_tree_map);
+h.uid = uid;
-h->uid = uid;
+loc = complex_variable_components->find_slot_with_hash (h, uid, INSERT);
-h->to = to;
+loc->uid = uid;
-loc = htab_find_slot_with_hash (complex_variable_components, h,
+loc->to = to;
-				  uid, INSERT);
-*(struct int_tree_map **) loc = h;
 }
 /* Return true if T is not a zero constant.  In the case of real values,
 we're only interested in +0.0.  */
 /* Operations with real or imaginary part of a complex number zero
 cannot be treated the same as operations with a real or imaginary
 operand if we care about the signs of zeros in the result.  */
 if (TREE_CODE (t) == REAL_CST && !flag_signed_zeros)
-zerop = REAL_VALUES_IDENTICAL (TREE_REAL_CST (t), dconst0);
+zerop = real_identical (&TREE_REAL_CST (t), &dconst0);
 else if (TREE_CODE (t) == FIXED_CST)
 zerop = fixed_zerop (t);
 else if (TREE_CODE (t) == INTEGER_CST)
 zerop = integer_zerop (t);
 tree real, imag;
 switch (TREE_CODE (t))
 {
 case SSA_NAME:
-return VEC_index (complex_lattice_t, complex_lattice_values,
+return complex_lattice_values[SSA_NAME_VERSION (t)];
-			SSA_NAME_VERSION (t));
 case COMPLEX_CST:
 real = TREE_REALPART (t);
 imag = TREE_IMAGPART (t);
 break;
 {
 tree parm, ssa_name;
 for (parm = DECL_ARGUMENTS (cfun->decl); parm ; parm = DECL_CHAIN (parm))
 if (is_complex_reg (parm)
-	&& var_ann (parm) != NULL
+	&& (ssa_name = ssa_default_def (cfun, parm)) != NULL_TREE)
-	&& (ssa_name = gimple_default_def (cfun, parm)) != NULL_TREE)
+complex_lattice_values[SSA_NAME_VERSION (ssa_name)] = VARYING;
-VEC_replace (complex_lattice_t, complex_lattice_values,
-		   SSA_NAME_VERSION (ssa_name), VARYING);
 }
 /* Initialize simulation state for each statement.  Return false if we
 found no statements we want to simulate, and thus there's nothing
 for the entire pass to do.  */
 static bool
 init_dont_simulate_again (void)
 {
 basic_block bb;
-gimple_stmt_iterator gsi;
-gimple phi;
 bool saw_a_complex_op = false;
-FOR_EACH_BB (bb)
+FOR_EACH_BB_FN (bb, cfun)
 {
-for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); gsi_next (&gsi))
+for (gphi_iterator gsi = gsi_start_phis (bb); !gsi_end_p (gsi);
+	   gsi_next (&gsi))
 	{
-	  phi = gsi_stmt (gsi);
+	  gphi *phi = gsi.phi ();
 	  prop_set_simulate_again (phi,
 				   is_complex_reg (gimple_phi_result (phi)));
 	}
-for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
+for (gimple_stmt_iterator gsi = gsi_start_bb (bb); !gsi_end_p (gsi);
+	   gsi_next (&gsi))
 	{
-	  gimple stmt;
+	  gimple *stmt;
 	  tree op0, op1;
 	  bool sim_again_p;
 	  stmt = gsi_stmt (gsi);
 	  op0 = op1 = NULL_TREE;
 /* Evaluate statement STMT against the complex lattice defined above.  */
 static enum ssa_prop_result
-complex_visit_stmt (gimple stmt, edge *taken_edge_p ATTRIBUTE_UNUSED,
+complex_visit_stmt (gimple *stmt, edge *taken_edge_p ATTRIBUTE_UNUSED,
 		    tree *result_p)
 {
 complex_lattice_t new_l, old_l, op1_l, op2_l;
 unsigned int ver;
 tree lhs;
 gcc_assert (TREE_CODE (lhs) == SSA_NAME);
 gcc_assert (TREE_CODE (TREE_TYPE (lhs)) == COMPLEX_TYPE);
 *result_p = lhs;
 ver = SSA_NAME_VERSION (lhs);
-old_l = VEC_index (complex_lattice_t, complex_lattice_values, ver);
+old_l = complex_lattice_values[ver];
 switch (gimple_expr_code (stmt))
 {
 case SSA_NAME:
 case COMPLEX_CST:
 /* If nothing changed this round, let the propagator know.  */
 if (new_l == old_l)
 return SSA_PROP_NOT_INTERESTING;
-VEC_replace (complex_lattice_t, complex_lattice_values, ver, new_l);
+complex_lattice_values[ver] = new_l;
 return new_l == VARYING ? SSA_PROP_VARYING : SSA_PROP_INTERESTING;
 }
 /* Evaluate a PHI node against the complex lattice defined above.  */
 static enum ssa_prop_result
-complex_visit_phi (gimple phi)
+complex_visit_phi (gphi *phi)
 {
 complex_lattice_t new_l, old_l;
 unsigned int ver;
 tree lhs;
 int i;
 new_l = UNINITIALIZED;
 for (i = gimple_phi_num_args (phi) - 1; i >= 0; --i)
 new_l |= find_lattice_value (gimple_phi_arg_def (phi, i));
 ver = SSA_NAME_VERSION (lhs);
-old_l = VEC_index (complex_lattice_t, complex_lattice_values, ver);
+old_l = complex_lattice_values[ver];
 if (new_l == old_l)
 return SSA_PROP_NOT_INTERESTING;
-VEC_replace (complex_lattice_t, complex_lattice_values, ver, new_l);
+complex_lattice_values[ver] = new_l;
 return new_l == VARYING ? SSA_PROP_VARYING : SSA_PROP_INTERESTING;
 }
 /* Create one backing variable for a complex component of ORIG.  */
 static tree
 create_one_component_var (tree type, tree orig, const char *prefix,
 			  const char *suffix, enum tree_code code)
 {
 tree r = create_tmp_var (type, prefix);
-add_referenced_var (r);
 DECL_SOURCE_LOCATION (r) = DECL_SOURCE_LOCATION (orig);
 DECL_ARTIFICIAL (r) = 1;
 if (DECL_NAME (orig) && !DECL_IGNORED_P (orig))
 {
 const char *name = IDENTIFIER_POINTER (DECL_NAME (orig));
+name = ACONCAT ((name, suffix, NULL));
-DECL_NAME (r) = get_identifier (ACONCAT ((name, suffix, NULL)));
+DECL_NAME (r) = get_identifier (name);
 SET_DECL_DEBUG_EXPR (r, build1 (code, type, orig));
-DECL_DEBUG_EXPR_IS_FROM (r) = 1;
+DECL_HAS_DEBUG_EXPR_P (r) = 1;
 DECL_IGNORED_P (r) = 0;
 TREE_NO_WARNING (r) = TREE_NO_WARNING (orig);
 }
 else
 {
 else
 	return build_int_cst (inner_type, 0);
 }
 ssa_name_index = SSA_NAME_VERSION (ssa_name) * 2 + imag_p;
-ret = VEC_index (tree, complex_ssa_name_components, ssa_name_index);
+ret = complex_ssa_name_components[ssa_name_index];
 if (ret == NULL)
 {
-ret = get_component_var (SSA_NAME_VAR (ssa_name), imag_p);
+if (SSA_NAME_VAR (ssa_name))
-ret = make_ssa_name (ret, NULL);
+	ret = get_component_var (SSA_NAME_VAR (ssa_name), imag_p);
+else
+	ret = TREE_TYPE (TREE_TYPE (ssa_name));
+ret = make_ssa_name (ret);
 /* Copy some properties from the original.  In particular, whether it
 	 is used in an abnormal phi, and whether it's uninitialized.  */
 SSA_NAME_OCCURS_IN_ABNORMAL_PHI (ret)
 	= SSA_NAME_OCCURS_IN_ABNORMAL_PHI (ssa_name);
-if (TREE_CODE (SSA_NAME_VAR (ssa_name)) == VAR_DECL
+if (SSA_NAME_IS_DEFAULT_DEF (ssa_name)
-	  && gimple_nop_p (SSA_NAME_DEF_STMT (ssa_name)))
+	  && TREE_CODE (SSA_NAME_VAR (ssa_name)) == VAR_DECL)
 	{
 	  SSA_NAME_DEF_STMT (ret) = SSA_NAME_DEF_STMT (ssa_name);
-	  set_default_def (SSA_NAME_VAR (ret), ret);
+	  set_ssa_default_def (cfun, SSA_NAME_VAR (ret), ret);
 	}
-VEC_replace (tree, complex_ssa_name_components, ssa_name_index, ret);
+complex_ssa_name_components[ssa_name_index] = ret;
 }
 return ret;
 }
 set_component_ssa_name (tree ssa_name, bool imag_p, tree value)
 {
 complex_lattice_t lattice = find_lattice_value (ssa_name);
 size_t ssa_name_index;
 tree comp;
-gimple last;
+gimple *last;
 gimple_seq list;
 /* We know the value must be zero, else there's a bug in our lattice
 analysis.  But the value may well be a variable known to contain
 zero.  We should be safe ignoring it.  */
 /* If we've already assigned an SSA_NAME to this component, then this
 means that our walk of the basic blocks found a use before the set.
 This is fine.  Now we should create an initialization for the value
 we created earlier.  */
 ssa_name_index = SSA_NAME_VERSION (ssa_name) * 2 + imag_p;
-comp = VEC_index (tree, complex_ssa_name_components, ssa_name_index);
+comp = complex_ssa_name_components[ssa_name_index];
 if (comp)
 ;
 /* If we've nothing assigned, and the value we're given is already stable,
 then install that as the value for this SSA_NAME.  This preemptively
 copy-propagates the value, which avoids unnecessary memory allocation.  */
 else if (is_gimple_min_invariant (value)
 	   && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (ssa_name))
 {
-VEC_replace (tree, complex_ssa_name_components, ssa_name_index, value);
+complex_ssa_name_components[ssa_name_index] = value;
 return NULL;
 }
 else if (TREE_CODE (value) == SSA_NAME
 	   && !SSA_NAME_OCCURS_IN_ABNORMAL_PHI (ssa_name))
 {
 /* Replace an anonymous base value with the variable from cvc_lookup.
 	 This should result in better debug info.  */
-if (DECL_IGNORED_P (SSA_NAME_VAR (value))
+if (SSA_NAME_VAR (ssa_name)
+	  && (!SSA_NAME_VAR (value) || DECL_IGNORED_P (SSA_NAME_VAR (value)))
 	  && !DECL_IGNORED_P (SSA_NAME_VAR (ssa_name)))
 	{
 	  comp = get_component_var (SSA_NAME_VAR (ssa_name), imag_p);
 	  replace_ssa_name_symbol (value, comp);
 	}
-VEC_replace (tree, complex_ssa_name_components, ssa_name_index, value);
+complex_ssa_name_components[ssa_name_index] = value;
 return NULL;
 }
 /* Finally, we need to stabilize the result by installing the value into
 a new ssa name.  */
 Make sure that it's a proper gimple_val and gimplify it if not.
 Emit any new code before gsi.  */
 static tree
 extract_component (gimple_stmt_iterator *gsi, tree t, bool imagpart_p,
-		   bool gimple_p)
+		   bool gimple_p, bool phiarg_p = false)
 {
 switch (TREE_CODE (t))
 {
 case COMPLEX_CST:
 return imagpart_p ? TREE_IMAGPART (t) : TREE_REALPART (t);
 case COMPLEX_EXPR:
 gcc_unreachable ();
+case BIT_FIELD_REF:
+{
+	tree inner_type = TREE_TYPE (TREE_TYPE (t));
+	t = unshare_expr (t);
+	TREE_TYPE (t) = inner_type;
+	TREE_OPERAND (t, 1) = TYPE_SIZE (inner_type);
+	if (imagpart_p)
+	  TREE_OPERAND (t, 2) = size_binop (PLUS_EXPR, TREE_OPERAND (t, 2),
+					    TYPE_SIZE (inner_type));
+	if (gimple_p)
+	  t = force_gimple_operand_gsi (gsi, t, true, NULL, true,
+					GSI_SAME_STMT);
+	return t;
+}
 case VAR_DECL:
 case RESULT_DECL:
 case PARM_DECL:
 case COMPONENT_REF:
 	return t;
 }
 case SSA_NAME:
-return get_component_ssa_name (t, imagpart_p);
+t = get_component_ssa_name (t, imagpart_p);
+if (TREE_CODE (t) == SSA_NAME && SSA_NAME_DEF_STMT (t) == NULL)
+	gcc_assert (phiarg_p);
+return t;
 default:
 gcc_unreachable ();
 }
 }
 /* Update the complex components of the ssa name on the lhs of STMT.  */
 static void
-update_complex_components (gimple_stmt_iterator *gsi, gimple stmt, tree r,
+update_complex_components (gimple_stmt_iterator *gsi, gimple *stmt, tree r,
 			   tree i)
 {
 tree lhs;
 gimple_seq list;
 /* Update an assignment to a complex variable in place.  */
 static void
 update_complex_assignment (gimple_stmt_iterator *gsi, tree r, tree i)
 {
-gimple_stmt_iterator orig_si = *gsi;
+gimple *stmt;
-gimple stmt;
+gimple_assign_set_rhs_with_ops (gsi, COMPLEX_EXPR, r, i);
-if (gimple_in_ssa_p (cfun))
+stmt = gsi_stmt (*gsi);
-update_complex_components (gsi, gsi_stmt (*gsi), r, i);
-gimple_assign_set_rhs_with_ops (&orig_si, COMPLEX_EXPR, r, i);
-stmt = gsi_stmt (orig_si);
 update_stmt (stmt);
 if (maybe_clean_eh_stmt (stmt))
 gimple_purge_dead_eh_edges (gimple_bb (stmt));
+if (gimple_in_ssa_p (cfun))
+update_complex_components (gsi, gsi_stmt (*gsi), r, i);
 }
 /* Generate code at the entry point of the function to initialize the
 component variables for a complex parameter.  */
 static void
 update_parameter_components (void)
 {
-edge entry_edge = single_succ_edge (ENTRY_BLOCK_PTR);
+edge entry_edge = single_succ_edge (ENTRY_BLOCK_PTR_FOR_FN (cfun));
 tree parm;
 for (parm = DECL_ARGUMENTS (cfun->decl); parm ; parm = DECL_CHAIN (parm))
 {
 tree type = TREE_TYPE (parm);
 if (TREE_CODE (type) != COMPLEX_TYPE || !is_gimple_reg (parm))
 	continue;
 type = TREE_TYPE (type);
-ssa_name = gimple_default_def (cfun, parm);
+ssa_name = ssa_default_def (cfun, parm);
 if (!ssa_name)
 	continue;
 r = build1 (REALPART_EXPR, type, ssa_name);
 i = build1 (IMAGPART_EXPR, type, ssa_name);
 to match the PHI statements in block BB.  */
 static void
 update_phi_components (basic_block bb)
 {
-gimple_stmt_iterator gsi;
+gphi_iterator gsi;
 for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); gsi_next (&gsi))
 {
-gimple phi = gsi_stmt (gsi);
+gphi *phi = gsi.phi ();
 if (is_complex_reg (gimple_phi_result (phi)))
 	{
-	  tree lr, li;
+	  gphi *p[2] = { NULL, NULL };
-	  gimple pr = NULL, pi = NULL;
+	  unsigned int i, j, n;
-	  unsigned int i, n;
+	  bool revisit_phi = false;
-	  lr = get_component_ssa_name (gimple_phi_result (phi), false);
+	  for (j = 0; j < 2; j++)
-	  if (TREE_CODE (lr) == SSA_NAME)
 	    {
-	      pr = create_phi_node (lr, bb);
+	      tree l = get_component_ssa_name (gimple_phi_result (phi), j > 0);
-	      SSA_NAME_DEF_STMT (lr) = pr;
+	      if (TREE_CODE (l) == SSA_NAME)
-	    }
+		p[j] = create_phi_node (l, bb);
-	  li = get_component_ssa_name (gimple_phi_result (phi), true);
-	  if (TREE_CODE (li) == SSA_NAME)
-	    {
-	      pi = create_phi_node (li, bb);
-	      SSA_NAME_DEF_STMT (li) = pi;
 	    }
 	  for (i = 0, n = gimple_phi_num_args (phi); i < n; ++i)
 	    {
 	      tree comp, arg = gimple_phi_arg_def (phi, i);
-	      if (pr)
+	      for (j = 0; j < 2; j++)
-		{
+		if (p[j])
-		  comp = extract_component (NULL, arg, false, false);
+		  {
-		  SET_PHI_ARG_DEF (pr, i, comp);
+		    comp = extract_component (NULL, arg, j > 0, false, true);
-		}
+		    if (TREE_CODE (comp) == SSA_NAME
-	      if (pi)
+			&& SSA_NAME_DEF_STMT (comp) == NULL)
-		{
+		      {
-		  comp = extract_component (NULL, arg, true, false);
+			/* For the benefit of any gimple simplification during
-		  SET_PHI_ARG_DEF (pi, i, comp);
+			   this pass that might walk SSA_NAME def stmts,
-		}
+			   don't add SSA_NAMEs without definitions into the
+			   PHI arguments, but put a decl in there instead
+			   temporarily, and revisit this PHI later on.  */
+			if (SSA_NAME_VAR (comp))
+			  comp = SSA_NAME_VAR (comp);
+			else
+			  comp = create_tmp_reg (TREE_TYPE (comp),
+						 get_name (comp));
+			revisit_phi = true;
+		      }
+		    SET_PHI_ARG_DEF (p[j], i, comp);
+		  }
+	    }
+	  if (revisit_phi)
+	    {
+	      phis_to_revisit.safe_push (phi);
+	      phis_to_revisit.safe_push (p[0]);
+	      phis_to_revisit.safe_push (p[1]);
 	    }
 	}
 }
 }
 static void
 expand_complex_move (gimple_stmt_iterator *gsi, tree type)
 {
 tree inner_type = TREE_TYPE (type);
 tree r, i, lhs, rhs;
-gimple stmt = gsi_stmt (*gsi);
+gimple *stmt = gsi_stmt (*gsi);
 if (is_gimple_assign (stmt))
 {
 lhs = gimple_assign_lhs (stmt);
 if (gimple_num_ops (stmt) == 2)
 	}
 }
 else if (rhs && TREE_CODE (rhs) == SSA_NAME && !TREE_SIDE_EFFECTS (lhs))
 {
 tree x;
-gimple t;
+gimple *t;
+location_t loc;
+loc = gimple_location (stmt);
 r = extract_component (gsi, rhs, 0, false);
 i = extract_component (gsi, rhs, 1, false);
 x = build1 (REALPART_EXPR, inner_type, unshare_expr (lhs));
 t = gimple_build_assign (x, r);
+gimple_set_location (t, loc);
 gsi_insert_before (gsi, t, GSI_SAME_STMT);
 if (stmt == gsi_stmt (*gsi))
 	{
 	  x = build1 (IMAGPART_EXPR, inner_type, unshare_expr (lhs));
 	}
 else
 	{
 	  x = build1 (IMAGPART_EXPR, inner_type, unshare_expr (lhs));
 	  t = gimple_build_assign (x, i);
+	  gimple_set_location (t, loc);
 	  gsi_insert_before (gsi, t, GSI_SAME_STMT);
 	  stmt = gsi_stmt (*gsi);
 	  gcc_assert (gimple_code (stmt) == GIMPLE_RETURN);
-	  gimple_return_set_retval (stmt, lhs);
+	  gimple_return_set_retval (as_a <greturn *> (stmt), lhs);
 	}
 update_stmt (stmt);
 }
 }
 static void
 expand_complex_libcall (gimple_stmt_iterator *gsi, tree ar, tree ai,
 			tree br, tree bi, enum tree_code code)
 {
-enum machine_mode mode;
+machine_mode mode;
 enum built_in_function bcode;
 tree fn, type, lhs;
-gimple old_stmt, stmt;
+gimple *old_stmt;
+gcall *stmt;
 old_stmt = gsi_stmt (*gsi);
 lhs = gimple_assign_lhs (old_stmt);
 type = TREE_TYPE (lhs);
 else if (code == RDIV_EXPR)
 bcode = ((enum built_in_function)
 	     (BUILT_IN_COMPLEX_DIV_MIN + mode - MIN_MODE_COMPLEX_FLOAT));
 else
 gcc_unreachable ();
-fn = built_in_decls[bcode];
+fn = builtin_decl_explicit (bcode);
 stmt = gimple_build_call (fn, 4, ar, ai, br, bi);
 gimple_call_set_lhs (stmt, lhs);
 update_stmt (stmt);
 gsi_replace (gsi, stmt, false);
 break;
 case PAIR (ONLY_IMAG, ONLY_REAL):
 rr = ar;
 if (TREE_CODE (ai) == REAL_CST
-	  && REAL_VALUES_IDENTICAL (TREE_REAL_CST (ai), dconst1))
+	  && real_identical (&TREE_REAL_CST (ai), &dconst1))
 	ri = br;
 else
 	ri = gimplify_build2 (gsi, MULT_EXPR, inner_type, ai, br);
 break;
 			 tree ar, tree ai, tree br, tree bi,
 			 enum tree_code code)
 {
 tree rr, ri, ratio, div, t1, t2, tr, ti, compare;
 basic_block bb_cond, bb_true, bb_false, bb_join;
-gimple stmt;
+gimple *stmt;
 /* Examine |br| < |bi|, and branch.  */
 t1 = gimplify_build1 (gsi, ABS_EXPR, inner_type, br);
 t2 = gimplify_build1 (gsi, ABS_EXPR, inner_type, bi);
 compare = fold_build2_loc (gimple_location (gsi_stmt (*gsi)),
 bb_cond = bb_true = bb_false = bb_join = NULL;
 rr = ri = tr = ti = NULL;
 if (TREE_CODE (compare) != INTEGER_CST)
 {
 edge e;
-gimple stmt;
+gimple *stmt;
 tree cond, tmp;
-tmp = create_tmp_var (boolean_type_node, NULL);
+tmp = create_tmp_var (boolean_type_node);
 stmt = gimple_build_assign (tmp, compare);
 if (gimple_in_ssa_p (cfun))
 	{
-	  tmp = make_ssa_name (tmp,  stmt);
+	  tmp = make_ssa_name (tmp, stmt);
 	  gimple_assign_set_lhs (stmt, tmp);
 	}
 gsi_insert_before (gsi, stmt, GSI_SAME_STMT);
 e = split_block (gsi_bb (*gsi), stmt);
 bb_cond = e->src;
 bb_join = e->dest;
 bb_true = create_empty_bb (bb_cond);
 bb_false = create_empty_bb (bb_true);
+bb_true->frequency = bb_false->frequency = bb_cond->frequency / 2;
+bb_true->count = bb_false->count
+	 = bb_cond->count.apply_probability (profile_probability::even ());
 /* Wire the blocks together.  */
 e->flags = EDGE_TRUE_VALUE;
+/* TODO: With value profile we could add an historgram to determine real
+	 branch outcome.  */
+e->probability = profile_probability::even ();
 redirect_edge_succ (e, bb_true);
-make_edge (bb_cond, bb_false, EDGE_FALSE_VALUE);
+edge e2 = make_edge (bb_cond, bb_false, EDGE_FALSE_VALUE);
-make_edge (bb_true, bb_join, EDGE_FALLTHRU);
+e2->probability = profile_probability::even ();
-make_edge (bb_false, bb_join, EDGE_FALLTHRU);
+make_single_succ_edge (bb_true, bb_join, EDGE_FALLTHRU);
+make_single_succ_edge (bb_false, bb_join, EDGE_FALLTHRU);
+add_bb_to_loop (bb_true, bb_cond->loop_father);
+add_bb_to_loop (bb_false, bb_cond->loop_father);
 /* Update dominance info.  Note that bb_join's data was
 updated by split_block.  */
 if (dom_info_available_p (CDI_DOMINATORS))
 {
 set_immediate_dominator (CDI_DOMINATORS, bb_true, bb_cond);
 set_immediate_dominator (CDI_DOMINATORS, bb_false, bb_cond);
 }
-rr = make_rename_temp (inner_type, NULL);
+rr = create_tmp_reg (inner_type);
-ri = make_rename_temp (inner_type, NULL);
+ri = create_tmp_reg (inner_type);
 }
 /* In the TRUE branch, we compute
 ratio = br/bi;
 div = (br * ratio) + bi;
 case PAIR (VARYING, ONLY_IMAG):
 rr = gimplify_build2 (gsi, code, inner_type, ai, bi);
 ri = gimplify_build2 (gsi, code, inner_type, ar, bi);
 ri = gimplify_build1 (gsi, NEGATE_EXPR, inner_type, ri);
+break;
 case PAIR (ONLY_REAL, VARYING):
 case PAIR (ONLY_IMAG, VARYING):
 case PAIR (VARYING, VARYING):
 switch (flag_complex_method)
 static void
 expand_complex_comparison (gimple_stmt_iterator *gsi, tree ar, tree ai,
 			   tree br, tree bi, enum tree_code code)
 {
 tree cr, ci, cc, type;
-gimple stmt;
+gimple *stmt;
 cr = gimplify_build2 (gsi, code, boolean_type_node, ar, br);
 ci = gimplify_build2 (gsi, code, boolean_type_node, ai, bi);
 cc = gimplify_build2 (gsi,
 			(code == EQ_EXPR ? TRUTH_AND_EXPR : TRUTH_OR_EXPR),
 stmt = gsi_stmt (*gsi);
 switch (gimple_code (stmt))
 {
 case GIMPLE_RETURN:
-type = TREE_TYPE (gimple_return_retval (stmt));
+{
-gimple_return_set_retval (stmt, fold_convert (type, cc));
+	greturn *return_stmt = as_a <greturn *> (stmt);
+	type = TREE_TYPE (gimple_return_retval (return_stmt));
+	gimple_return_set_retval (return_stmt, fold_convert (type, cc));
+}
 break;
 case GIMPLE_ASSIGN:
 type = TREE_TYPE (gimple_assign_lhs (stmt));
 gimple_assign_set_rhs_from_tree (gsi, fold_convert (type, cc));
 stmt = gsi_stmt (*gsi);
 break;
 case GIMPLE_COND:
-gimple_cond_set_code (stmt, EQ_EXPR);
+{
-gimple_cond_set_lhs (stmt, cc);
+	gcond *cond_stmt = as_a <gcond *> (stmt);
-gimple_cond_set_rhs (stmt, boolean_true_node);
+	gimple_cond_set_code (cond_stmt, EQ_EXPR);
+	gimple_cond_set_lhs (cond_stmt, cc);
+	gimple_cond_set_rhs (cond_stmt, boolean_true_node);
+}
 break;
 default:
 gcc_unreachable ();
 }
 update_stmt (stmt);
 }
+/* Expand inline asm that sets some complex SSA_NAMEs.  */
+static void
+expand_complex_asm (gimple_stmt_iterator *gsi)
+{
+gasm *stmt = as_a <gasm *> (gsi_stmt (*gsi));
+unsigned int i;
+for (i = 0; i < gimple_asm_noutputs (stmt); ++i)
+{
+tree link = gimple_asm_output_op (stmt, i);
+tree op = TREE_VALUE (link);
+if (TREE_CODE (op) == SSA_NAME
+	  && TREE_CODE (TREE_TYPE (op)) == COMPLEX_TYPE)
+	{
+	  tree type = TREE_TYPE (op);
+	  tree inner_type = TREE_TYPE (type);
+	  tree r = build1 (REALPART_EXPR, inner_type, op);
+	  tree i = build1 (IMAGPART_EXPR, inner_type, op);
+	  gimple_seq list = set_component_ssa_name (op, false, r);
+	  if (list)
+	    gsi_insert_seq_after (gsi, list, GSI_CONTINUE_LINKING);
+	  list = set_component_ssa_name (op, true, i);
+	  if (list)
+	    gsi_insert_seq_after (gsi, list, GSI_CONTINUE_LINKING);
+	}
+}
+}
 /* Process one statement.  If we identify a complex operation, expand it.  */
 static void
 expand_complex_operations_1 (gimple_stmt_iterator *gsi)
 {
-gimple stmt = gsi_stmt (*gsi);
+gimple *stmt = gsi_stmt (*gsi);
 tree type, inner_type, lhs;
 tree ac, ar, ai, bc, br, bi;
 complex_lattice_t al, bl;
 enum tree_code code;
+if (gimple_code (stmt) == GIMPLE_ASM)
+{
+expand_complex_asm (gsi);
+return;
+}
 lhs = gimple_get_lhs (stmt);
 if (!lhs && gimple_code (stmt) != GIMPLE_COND)
 return;
 break;
 case EQ_EXPR:
 case NE_EXPR:
 /* Note, both GIMPLE_ASSIGN and GIMPLE_COND may have an EQ_EXPR
-	 subocde, so we need to access the operands using gimple_op.  */
+	 subcode, so we need to access the operands using gimple_op.  */
 inner_type = TREE_TYPE (gimple_op (stmt, 1));
 if (TREE_CODE (inner_type) != COMPLEX_TYPE)
 	return;
 break;
 /* Entry point for complex operation lowering during optimization.  */
 static unsigned int
 tree_lower_complex (void)
 {
-int old_last_basic_block;
 gimple_stmt_iterator gsi;
 basic_block bb;
+int n_bbs, i;
+int *rpo;
 if (!init_dont_simulate_again ())
 return 0;
-complex_lattice_values = VEC_alloc (complex_lattice_t, heap, num_ssa_names);
+complex_lattice_values.create (num_ssa_names);
-VEC_safe_grow_cleared (complex_lattice_t, heap,
+complex_lattice_values.safe_grow_cleared (num_ssa_names);
-			 complex_lattice_values, num_ssa_names);
 init_parameter_lattice_values ();
 ssa_propagate (complex_visit_stmt, complex_visit_phi);
-complex_variable_components = htab_create (10,  int_tree_map_hash,
+complex_variable_components = new int_tree_htab_type (10);
-					     int_tree_map_eq, free);
+complex_ssa_name_components.create (2 * num_ssa_names);
-complex_ssa_name_components = VEC_alloc (tree, heap, 2*num_ssa_names);
+complex_ssa_name_components.safe_grow_cleared (2 * num_ssa_names);
-VEC_safe_grow_cleared (tree, heap, complex_ssa_name_components,
-			 2 * num_ssa_names);
 update_parameter_components ();
-/* ??? Ideally we'd traverse the blocks in breadth-first order.  */
+rpo = XNEWVEC (int, last_basic_block_for_fn (cfun));
-old_last_basic_block = last_basic_block;
+n_bbs = pre_and_rev_post_order_compute (NULL, rpo, false);
-FOR_EACH_BB (bb)
+for (i = 0; i < n_bbs; i++)
 {
-if (bb->index >= old_last_basic_block)
+bb = BASIC_BLOCK_FOR_FN (cfun, rpo[i]);
-	continue;
 update_phi_components (bb);
 for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
 	expand_complex_operations_1 (&gsi);
 }
+free (rpo);
+if (!phis_to_revisit.is_empty ())
+{
+unsigned int n = phis_to_revisit.length ();
+for (unsigned int j = 0; j < n; j += 3)
+	for (unsigned int k = 0; k < 2; k++)
+	  if (gphi *phi = phis_to_revisit[j + k + 1])
+	    {
+	      unsigned int m = gimple_phi_num_args (phi);
+	      for (unsigned int l = 0; l < m; ++l)
+		{
+		  tree op = gimple_phi_arg_def (phi, l);
+		  if (TREE_CODE (op) == SSA_NAME
+		      || is_gimple_min_invariant (op))
+		    continue;
+		  tree arg = gimple_phi_arg_def (phis_to_revisit[j], l);
+		  op = extract_component (NULL, arg, k > 0, false, false);
+		  SET_PHI_ARG_DEF (phi, l, op);
+		}
+	    }
+phis_to_revisit.release ();
+}
 gsi_commit_edge_inserts ();
-htab_delete (complex_variable_components);
+delete complex_variable_components;
-VEC_free (tree, heap, complex_ssa_name_components);
+complex_variable_components = NULL;
-VEC_free (complex_lattice_t, heap, complex_lattice_values);
+complex_ssa_name_components.release ();
+complex_lattice_values.release ();
 return 0;
 }
-struct gimple_opt_pass pass_lower_complex =
+namespace {
-{
-{
+const pass_data pass_data_lower_complex =
-GIMPLE_PASS,
+{
-"cplxlower",				/* name */
+GIMPLE_PASS, /* type */
-0,					/* gate */
+"cplxlower", /* name */
-tree_lower_complex,			/* execute */
+OPTGROUP_NONE, /* optinfo_flags */
-NULL,					/* sub */
+TV_NONE, /* tv_id */
-NULL,					/* next */
+PROP_ssa, /* properties_required */
-0,					/* static_pass_number */
+PROP_gimple_lcx, /* properties_provided */
-TV_NONE,				/* tv_id */
+0, /* properties_destroyed */
-PROP_ssa,				/* properties_required */
+0, /* todo_flags_start */
-PROP_gimple_lcx,			/* properties_provided */
+TODO_update_ssa, /* todo_flags_finish */
-0,                       		/* properties_destroyed */
-0,					/* todo_flags_start */
-TODO_dump_func
-| TODO_ggc_collect
-| TODO_update_ssa
-| TODO_verify_stmts	 		/* todo_flags_finish */
-}
 };
+class pass_lower_complex : public gimple_opt_pass
+{
+public:
+pass_lower_complex (gcc::context *ctxt)
+: gimple_opt_pass (pass_data_lower_complex, ctxt)
+{}
+/* opt_pass methods: */
+opt_pass * clone () { return new pass_lower_complex (m_ctxt); }
+virtual unsigned int execute (function *) { return tree_lower_complex (); }
+}; // class pass_lower_complex
+} // anon namespace
+gimple_opt_pass *
+make_pass_lower_complex (gcc::context *ctxt)
+{
+return new pass_lower_complex (ctxt);
+}
-static bool
+namespace {
-gate_no_optimization (void)
-{
+const pass_data pass_data_lower_complex_O0 =
-/* With errors, normal optimization passes are not run.  If we don't
+{
-lower complex operations at all, rtl expansion will abort.  */
+GIMPLE_PASS, /* type */
-return !(cfun->curr_properties & PROP_gimple_lcx);
+"cplxlower0", /* name */
-}
+OPTGROUP_NONE, /* optinfo_flags */
+TV_NONE, /* tv_id */
-struct gimple_opt_pass pass_lower_complex_O0 =
+PROP_cfg, /* properties_required */
-{
+PROP_gimple_lcx, /* properties_provided */
-{
+0, /* properties_destroyed */
-GIMPLE_PASS,
+0, /* todo_flags_start */
-"cplxlower0",				/* name */
+TODO_update_ssa, /* todo_flags_finish */
-gate_no_optimization,			/* gate */
-tree_lower_complex,			/* execute */
-NULL,					/* sub */
-NULL,					/* next */
-0,					/* static_pass_number */
-TV_NONE,				/* tv_id */
-PROP_cfg,				/* properties_required */
-PROP_gimple_lcx,			/* properties_provided */
-0,					/* properties_destroyed */
-0,					/* todo_flags_start */
-TODO_dump_func
-| TODO_ggc_collect
-| TODO_update_ssa
-| TODO_verify_stmts	 		/* todo_flags_finish */
-}
 };
+class pass_lower_complex_O0 : public gimple_opt_pass
+{
+public:
+pass_lower_complex_O0 (gcc::context *ctxt)
+: gimple_opt_pass (pass_data_lower_complex_O0, ctxt)
+{}
+/* opt_pass methods: */
+virtual bool gate (function *fun)
+{
+/* With errors, normal optimization passes are not run.  If we don't
+	 lower complex operations at all, rtl expansion will abort.  */
+return !(fun->curr_properties & PROP_gimple_lcx);
+}
+virtual unsigned int execute (function *) { return tree_lower_complex (); }
+}; // class pass_lower_complex_O0
+} // anon namespace
+gimple_opt_pass *
+make_pass_lower_complex_O0 (gcc::context *ctxt)
+{
+return new pass_lower_complex_O0 (ctxt);
+}

Mercurial > hg > CbC > CbC_gcc

comparison gcc/tree-complex.c @ 111:04ced10e8804