CbC/CbC_gcc: gcc/ifcvt.c comparison

comparison gcc/ifcvt.c @ 145:1830386684a0

gcc-9.2.0

author	anatofuz
date	Thu, 13 Feb 2020 11:34:05 +0900
parents	84e7813d76e9
children

comparison

equal deleted inserted replaced

-:84e7813d76e9
+:1830386684a0
 /* If-conversion support.
-Copyright (C) 2000-2018 Free Software Foundation, Inc.
+Copyright (C) 2000-2020 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
 #include "tree-pass.h"
 #include "dbgcnt.h"
 #include "shrink-wrap.h"
 #include "rtl-iter.h"
 #include "ifcvt.h"
-#include "params.h"
 #ifndef MAX_CONDITIONAL_EXECUTE
 #define MAX_CONDITIONAL_EXECUTE \
 (BRANCH_COST (optimize_function_for_speed_p (cfun), false) \
 + 1)
 test_expr = cond_exec_get_condition (BB_END (test_bb));
 if (! test_expr)
 return FALSE;
 /* If the conditional jump is more than just a conditional jump,
-then we can not do conditional execution conversion on this block.  */
+then we cannot do conditional execution conversion on this block.  */
 if (! onlyjump_p (BB_END (test_bb)))
 return FALSE;
 /* Collect the bounds of where we're to search, skipping any labels, jumps
 and notes at the beginning and end of the block.  Then count the total
 	      && ! cond_exec_process_insns (ce_info, start, end, false_expr,
 					    false_prob_val, FALSE))
 	    goto fail;
 	  /* If the conditional jump is more than just a conditional jump, then
-	     we can not do conditional execution conversion on this block.  */
+	     we cannot do conditional execution conversion on this block.  */
 	  if (! onlyjump_p (BB_END (bb)))
 	    goto fail;
 	  /* Find the conditional jump and isolate the test.  */
 	  t = cond_exec_get_condition (BB_END (bb));
 static bool
 bb_ok_for_noce_convert_multiple_sets (basic_block test_bb)
 {
 rtx_insn *insn;
 unsigned count = 0;
-unsigned param = PARAM_VALUE (PARAM_MAX_RTL_IF_CONVERSION_INSNS);
+unsigned param = param_max_rtl_if_conversion_insns;
 FOR_BB_INSNS (test_bb, insn)
 {
 /* Skip over notes etc.  */
 if (!active_insn_p (insn))
 this pass tries are better optimized and will be more appropriate.
 Some targets want to strictly limit the number of conditional moves
 that are emitted, they set this through PARAM, we need to respect
 that.  */
 return count > 1 && count <= param;
+}
+/* Compute average of two given costs weighted by relative probabilities
+of respective basic blocks in an IF-THEN-ELSE.  E is the IF-THEN edge.
+With P as the probability to take the IF-THEN branch, return
+P * THEN_COST + (1 - P) * ELSE_COST.  */
+static unsigned
+average_cost (unsigned then_cost, unsigned else_cost, edge e)
+{
+return else_cost + e->probability.apply ((signed) (then_cost - else_cost));
 }
 /* Given a simple IF-THEN-JOIN or IF-THEN-ELSE-JOIN block, attempt to convert
 it without using conditional execution.  Return TRUE if we were successful
 at converting the block.  */
 if (else_bb
 && !bb_valid_for_noce_process_p (else_bb, cond, &else_cost,
 				       &if_info->else_simple))
 return false;
-if (else_bb == NULL)
+if (speed_p)
-if_info->original_cost += then_cost;
+if_info->original_cost += average_cost (then_cost, else_cost,
-else if (speed_p)
+					    find_edge (test_bb, then_bb));
-if_info->original_cost += MIN (then_cost, else_cost);
 else
 if_info->original_cost += then_cost + else_cost;
 insn_a = last_active_insn (then_bb, FALSE);
 set_a = single_set (insn_a);
 int c;
 vec<rtx> then_regs = vNULL;
 vec<rtx> else_regs = vNULL;
 unsigned int i;
 int success_p = FALSE;
-int limit = PARAM_VALUE (PARAM_MAX_RTL_IF_CONVERSION_INSNS);
+int limit = param_max_rtl_if_conversion_insns;
 /* Build a mapping for each block to the value used for each
 register.  */
 hash_map<rtx, rtx> then_vals;
 hash_map<rtx, rtx> else_vals;
 fprintf (dump_file, ", join %d\n", join_bb->index);
 }
 /* If the conditional jump is more than just a conditional
-jump, then we can not do if-conversion on this block.  */
+jump, then we cannot do if-conversion on this block.  */
 jump = BB_END (test_bb);
 if (! onlyjump_p (jump))
 return FALSE;
 /* If this is not a standard conditional jump, we can't parse it.  */
 cond = noce_get_condition (jump, &cond_earliest, then_bb == trap_bb);
 if (! cond)
 return FALSE;
 /* If the conditional jump is more than just a conditional jump, then
-we can not do if-conversion on this block.  Give up for returnjump_p,
+we cannot do if-conversion on this block.  Give up for returnjump_p,
 changing a conditional return followed by unconditional trap for
 conditional trap followed by unconditional return is likely not
 beneficial and harder to handle.  */
 if (! onlyjump_p (jump) || returnjump_p (jump))
 return FALSE;
 /* If-conversion and CFG cleanup.  */
 static unsigned int
 rest_of_handle_if_conversion (void)
 {
+int flags = 0;
 if (flag_if_conversion)
 {
 if (dump_file)
 	{
 	  dump_reg_info (dump_file);
 	  dump_flow_info (dump_file, dump_flags);
 	}
 cleanup_cfg (CLEANUP_EXPENSIVE);
 if_convert (false);
-}
+if (num_updated_if_blocks)
+	/* Get rid of any dead CC-related instructions.  */
-cleanup_cfg (0);
+	flags |= CLEANUP_FORCE_FAST_DCE;
+}
+cleanup_cfg (flags);
 return 0;
 }
 namespace {

Mercurial > hg > CbC > CbC_gcc

comparison gcc/ifcvt.c @ 145:1830386684a0