[PR66726] Fixe regression caused by Factor conversion out of COND_EXPR

Message ID	569DB2F9.30506@linaro.org
State	New
Headers	show Return-Path: <gcc-patches-return-419420-incoming=patchwork.ozlabs.org@gcc.gnu.org> DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to:cc :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=aRCzU6MqImm/W8TpTQIvLMDc+g2pMDYUm6Omu5VmP3fAkLFtev 84R87FYKKcNC2aul5iaoQRlt2410QGteI1TR7N3w5FzImREm0vUYV8aTIR8fGQbc RRbA4KerfkCCorqjSpaxfi7HgWYQMvEdU0Hkz26ow8Ss239/6fPyGtLk4= Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk Sender: gcc-patches-owner@gcc.gnu.org To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org> Cc: Jeff Law <law@redhat.com>, Jakub Jelinek <jakub@redhat.com> From: Kugan <kugan.vivekanandarajah@linaro.org> Subject: [PR66726] Fixe regression caused by Factor conversion out of COND_EXPR Message-ID: <569DB2F9.30506@linaro.org> Date: Tue, 19 Jan 2016 14:52:25 +1100 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:38.0) Gecko/20100101 Thunderbird/38.4.0 MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="------------050302030700020903030504"

diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c index e53cc56..d0a5cee 100644 --- a/gcc/tree-ssa-reassoc.c +++ b/gcc/tree-ssa-reassoc.c @@ -2687,18 +2687,33 @@ optimize_range_tests (enum tree_code opcode, # _345 = PHI <_123(N), 1(...), 1(...)> where _234 has bool type, _123 has single use and bb N has a single successor M. This is commonly used in + the last block of a range test. + + Also Return true if STMT is tcc_compare like: + <bb N>: + ... + _234 = a_2(D) == 2; + + <bb M>: + # _345 = PHI <_234(N), 1(...), 1(...)> + _346 = (int) _345; + where _234 has booltype, single use and + bb N has a single successor M. This is commonly used in the last block of a range test. */ static bool final_range_test_p (gimple *stmt) { - basic_block bb, rhs_bb; + basic_block bb, rhs_bb, lhs_bb; edge e; tree lhs, rhs; use_operand_p use_p; gimple *use_stmt; - if (!gimple_assign_cast_p (stmt)) + if (!gimple_assign_cast_p (stmt) + && (!is_gimple_assign (stmt) + || (TREE_CODE_CLASS (gimple_assign_rhs_code (stmt)) + != tcc_comparison))) return false; bb = gimple_bb (stmt); if (!single_succ_p (bb)) @@ -2709,11 +2724,16 @@ final_range_test_p (gimple *stmt) lhs = gimple_assign_lhs (stmt); rhs = gimple_assign_rhs1 (stmt); - if (!INTEGRAL_TYPE_P (TREE_TYPE (lhs)) - || TREE_CODE (rhs) != SSA_NAME - || TREE_CODE (TREE_TYPE (rhs)) != BOOLEAN_TYPE) + if (gimple_assign_cast_p (stmt) + && (!INTEGRAL_TYPE_P (TREE_TYPE (lhs)) + || TREE_CODE (rhs) != SSA_NAME + || TREE_CODE (TREE_TYPE (rhs)) != BOOLEAN_TYPE)) return false; + if (!gimple_assign_cast_p (stmt) + && (TREE_CODE (TREE_TYPE (lhs)) != BOOLEAN_TYPE)) + return false; + /* Test whether lhs is consumed only by a PHI in the only successor bb. */ if (!single_imm_use (lhs, &use_p, &use_stmt)) return false; @@ -2723,10 +2743,20 @@ final_range_test_p (gimple *stmt) return false; /* And that the rhs is defined in the same loop. */ - rhs_bb = gimple_bb (SSA_NAME_DEF_STMT (rhs)); - if (rhs_bb == NULL - || !flow_bb_inside_loop_p (loop_containing_stmt (stmt), rhs_bb)) - return false; + if (gimple_assign_cast_p (stmt)) + { + if (TREE_CODE (rhs) != SSA_NAME + || !(rhs_bb = gimple_bb (SSA_NAME_DEF_STMT (rhs))) + || !flow_bb_inside_loop_p (loop_containing_stmt (stmt), rhs_bb)) + return false; + } + else + { + if (TREE_CODE (lhs) != SSA_NAME + || !(lhs_bb = gimple_bb (SSA_NAME_DEF_STMT (lhs))) + || !flow_bb_inside_loop_p (loop_containing_stmt (stmt), lhs_bb)) + return false; + } return true; } @@ -3119,6 +3149,8 @@ maybe_optimize_range_tests (gimple *stmt) /* stmt is _123 = (int) _234; + OR + _234 = a_2(D) == 2; followed by: <bb M>: @@ -3148,6 +3180,8 @@ maybe_optimize_range_tests (gimple *stmt) of the bitwise or resp. and, recursively. */ if (!get_ops (rhs, code, &ops, loop_containing_stmt (stmt)) + && (TREE_CODE_CLASS (gimple_assign_rhs_code (stmt)) + != tcc_comparison) && has_single_use (rhs)) { /* Otherwise, push the _234 range test itself. */ @@ -3160,6 +3194,23 @@ maybe_optimize_range_tests (gimple *stmt) ops.safe_push (oe); bb_ent.last_idx++; } + else if (!get_ops (lhs, code, &ops, + loop_containing_stmt (stmt)) + && TREE_CODE (lhs) == SSA_NAME + && INTEGRAL_TYPE_P (TREE_TYPE (lhs)) + && is_gimple_assign (stmt) + && (TREE_CODE_CLASS (gimple_assign_rhs_code (stmt)) + == tcc_comparison) + && has_single_use (lhs)) + { + operand_entry *oe = operand_entry_pool.allocate (); + oe->op = lhs; + oe->rank = code; + oe->id = 0; + oe->count = 1; + ops.safe_push (oe); + bb_ent.last_idx++; + } else bb_ent.last_idx = ops.length (); bb_ent.op = rhs; @@ -3243,26 +3294,60 @@ maybe_optimize_range_tests (gimple *stmt) { imm_use_iterator iter; use_operand_p use_p; - gimple *use_stmt, *cast_stmt = NULL; + gimple *use_stmt, *cast_or_tcc_cmp_stmt = NULL; FOR_EACH_IMM_USE_STMT (use_stmt, iter, bbinfo[idx].op) - if (is_gimple_debug (use_stmt)) + if (is_gimple_debug (use_stmt) + || (TREE_CODE (new_op) == SSA_NAME + && !reassoc_stmt_dominates_stmt_p + (SSA_NAME_DEF_STMT (new_op), use_stmt))) continue; - else if (gimple_code (use_stmt) == GIMPLE_COND - || gimple_code (use_stmt) == GIMPLE_PHI) - FOR_EACH_IMM_USE_ON_STMT (use_p, iter) - SET_USE (use_p, new_op); + else if (gimple_code (use_stmt) == GIMPLE_PHI) + FOR_EACH_IMM_USE_ON_STMT (use_p, iter) + SET_USE (use_p, new_op); + else if (gimple_code (use_stmt) == GIMPLE_COND) + { + tree new_type, new_lhs; + gassign *g; + gcond *cond_stmt = as_a <gcond *> (use_stmt); + new_type = TREE_TYPE (gimple_cond_lhs (cond_stmt)); + if (!types_compatible_p (new_type, TREE_TYPE (new_op))) + { + new_lhs = make_ssa_name (new_type); + if (is_gimple_min_invariant (new_op)) + { + new_op = fold_convert (new_type, new_op); + g = gimple_build_assign (new_lhs, new_op); + } + else + g = gimple_build_assign (new_lhs, + CONVERT_EXPR, new_op); + gimple_stmt_iterator gsi = gsi_for_stmt (use_stmt); + gimple_set_uid (g, gimple_uid (use_stmt)); + gimple_set_visited (g, true); + gsi_insert_before (&gsi, g, GSI_SAME_STMT); + } + else + new_lhs = new_op; + FOR_EACH_IMM_USE_ON_STMT (use_p, iter) + SET_USE (use_p, new_lhs); + } + else if ((is_gimple_assign (use_stmt) + && (TREE_CODE_CLASS (gimple_assign_rhs_code (use_stmt)) == tcc_comparison))) + { + cast_or_tcc_cmp_stmt = use_stmt; + } else if (gimple_assign_cast_p (use_stmt)) - cast_stmt = use_stmt; - else - gcc_unreachable (); - if (cast_stmt) + cast_or_tcc_cmp_stmt = use_stmt; + + if (cast_or_tcc_cmp_stmt) { gcc_assert (bb == last_bb); - tree lhs = gimple_assign_lhs (cast_stmt); + tree lhs = gimple_assign_lhs (cast_or_tcc_cmp_stmt); tree new_lhs = make_ssa_name (TREE_TYPE (lhs)); enum tree_code rhs_code - = gimple_assign_rhs_code (cast_stmt); + = gimple_assign_cast_p (cast_or_tcc_cmp_stmt) ? + gimple_assign_rhs_code (cast_or_tcc_cmp_stmt) : CONVERT_EXPR; gassign *g; if (is_gimple_min_invariant (new_op)) { @@ -3271,13 +3356,14 @@ maybe_optimize_range_tests (gimple *stmt) } else g = gimple_build_assign (new_lhs, rhs_code, new_op); - gimple_stmt_iterator gsi = gsi_for_stmt (cast_stmt); - gimple_set_uid (g, gimple_uid (cast_stmt)); + gimple_stmt_iterator gsi = gsi_for_stmt (cast_or_tcc_cmp_stmt); + gimple_set_uid (g, gimple_uid (cast_or_tcc_cmp_stmt)); gimple_set_visited (g, true); - gsi_insert_before (&gsi, g, GSI_SAME_STMT); + gsi_insert_after (&gsi, g, GSI_SAME_STMT); FOR_EACH_IMM_USE_STMT (use_stmt, iter, lhs) if (is_gimple_debug (use_stmt)) continue; + else if (is_gimple_assign (use_stmt)); else if (gimple_code (use_stmt) == GIMPLE_COND || gimple_code (use_stmt) == GIMPLE_PHI) FOR_EACH_IMM_USE_ON_STMT (use_p, iter)

[PR66726] Fixe regression caused by Factor conversion out of COND_EXPR

Commit Message

Comments

Patch