From 78cf0a232ee4314a9d668aab9b4b54f86b308111 Mon Sep 17 00:00:00 2001
From: Sebastian Pop <s.pop@samsung.com>
Date: Thu, 27 Aug 2015 17:11:21 -0500
Subject: port revision 219584 from linaro/gcc-4_9-branch

gcc/
2015-01-14  Yvan Roux  <yvan.roux@linaro.org>

	Backport from trunk r218451.
	2014-12-06  James Greenhalgh  <james.greenhalgh@arm.com>
                    Sebastian Pop  <s.pop@samsung.com>
                    Brian Rzycki  <b.rzycki@samsung.com>

	PR tree-optimization/54742
	* params.def (max-fsm-thread-path-insns, max-fsm-thread-length,
	max-fsm-thread-paths): New.

	* doc/invoke.texi (max-fsm-thread-path-insns, max-fsm-thread-length,
	max-fsm-thread-paths): Documented.

	* tree-cfg.c (split_edge_bb_loc): Export.
	* tree-cfg.h (split_edge_bb_loc): Declared extern.

	* tree-ssa-threadedge.c (simplify_control_stmt_condition): Restore the
	original value of cond when simplification fails.
	(fsm_find_thread_path): New.
	(fsm_find_control_statement_thread_paths): New.
	(thread_through_normal_block): Call find_control_statement_thread_paths.

	* tree-ssa-threadupdate.c (dump_jump_thread_path): Pretty print
	EDGE_FSM_THREAD.
	(verify_seme): New.
	(duplicate_seme_region): New.
	(thread_through_all_blocks): Generate code for EDGE_FSM_THREAD edges
	calling duplicate_seme_region.

	* tree-ssa-threadupdate.h (jump_thread_edge_type): Add EDGE_FSM_THREAD.

gcc/testsuite/
2015-01-14  Yvan Roux  <yvan.roux@linaro.org>

	Backport from trunk r218451.
            2014-12-06  James Greenhalgh  <james.greenhalgh@arm.com>
                        Sebastian Pop  <s.pop@samsung.com>
                        Brian Rzycki  <b.rzycki@samsung.com>

	PR tree-optimization/54742
	* gcc.dg/tree-ssa/ssa-dom-thread-6.c: New test.
	* gcc.dg/tree-ssa/ssa-dom-thread-7.c: New test.
---
 gcc-4.9/gcc/params.def | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

(limited to 'gcc-4.9/gcc/params.def')

diff --git a/gcc-4.9/gcc/params.def b/gcc-4.9/gcc/params.def
index 3d2c913fd..518d379ed 100644
--- a/gcc-4.9/gcc/params.def
+++ b/gcc-4.9/gcc/params.def
@@ -1389,6 +1389,21 @@ DEFPARAM (PARAM_UNINIT_CONTROL_DEP_ATTEMPTS,
 	  "during uninitialized variable analysis",
 	  1000, 1, 0)
 
+DEFPARAM (PARAM_MAX_FSM_THREAD_PATH_INSNS,
+	  "max-fsm-thread-path-insns",
+	  "Maximum number of instructions to copy when duplicating blocks on a finite state automaton jump thread path",
+	  100, 1, 999999)
+
+DEFPARAM (PARAM_MAX_FSM_THREAD_LENGTH,
+	  "max-fsm-thread-length",
+	  "Maximum number of basic blocks on a finite state automaton jump thread path",
+	  10, 1, 999999)
+
+DEFPARAM (PARAM_MAX_FSM_THREAD_PATHS,
+	  "max-fsm-thread-paths",
+	  "Maximum number of new jump thread paths to create for a finite state automaton",
+	  50, 1, 999999)
+
 /* Fraction of adjusting fp setting cost in framepointer shrinkwrapping.  */
 DEFPARAM (PARAM_FPSET_COST_FRACTION,
 	  "fpset-cost-fraction",
-- 
cgit v1.2.3

