From patchwork Sat May 21 06:08:00 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Kugan Vivekanandarajah X-Patchwork-Id: 624714 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3rBZ9h6nbGz9t3s for ; Sat, 21 May 2016 16:08:22 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=BIPm+Ggk; dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; q=dns; s=default; b=EFcX72MzCn/9j46gCB Mgj1N6O5smtU6jhpghL2O5APGcjM1wHmflp5ScCeigutqP1OoqzHXYbK5uzXFzrJ Xqj61szr41KLo1/683SCwV8g/vQLjSj5o7fMbpVz8EzL1EdomDWwdg4tWSPhqoLi PCzs7+/e2wo92Ibf1g/ZqzNDQ= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :mime-version:in-reply-to:references:date:message-id:subject :from:to:cc:content-type; s=default; bh=6MNIfKbgWFsPT79LmT2iaGea sdg=; b=BIPm+GgkW6DnPIB7U1+NuNB6VoANa90nI/02S2vDFCX/qbIk4PYGfW9L P1+LIsbcE9ABOGdJWSJNaVqT1mRRs+TjQQ+viITAhuhmBfZxNtn/rbGHDFCOQJzS dmFq9tK7n+E3J5e2NeOxB1DjiNzz2QcC5bfmuLDqY/pCCL1LlzY= Received: (qmail 76578 invoked by alias); 21 May 2016 06:08:14 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 76563 invoked by uid 89); 21 May 2016 06:08:13 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.6 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_LOW, SPF_PASS autolearn=ham version=3.3.2 spammy=2016-05-21 X-HELO: mail-qk0-f169.google.com Received: from mail-qk0-f169.google.com (HELO mail-qk0-f169.google.com) (209.85.220.169) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES128-GCM-SHA256 encrypted) ESMTPS; Sat, 21 May 2016 06:08:02 +0000 Received: by mail-qk0-f169.google.com with SMTP id n62so70119115qkc.2 for ; Fri, 20 May 2016 23:08:02 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:in-reply-to:references:date :message-id:subject:from:to:cc; bh=Mv/mOCrAc1Xxtt0FvfSE5227YET+n60fhYZOQDAA/iw=; b=XdXnd4qwfFAgoWMsG0OWiT1EprY7MJqPflHZwO/Ui+7sRVVTrG7XzAUsYzXXdo15uf z955b//+7QJIOuxzXewZQRMmdD6wDrho5tMzNsKpYC1/JwIhq523oY8nG87iFZQnpjBd lFckPef7VEFMbop9bghKLwQXszpg7zMTBVrvE/HsO0YMU6Wirpxi8HNgx2NXMoaiZkQK uZuxSQlFNsVFUjAmI0TXO7rdJz9Qd7anpKwmWWXuVlSiD66n+zpH/nRyD0/OC5aLOUyX G06EH1Tnu1AOOq+iaU24F6Bl+ehbhR/y+QI5evcYXYMUe/CWxG8Knrc18j+os1mGR1Fb V3HQ== X-Gm-Message-State: AOPr4FVlaLkWpEIVRtKg6Srpv85vsZKKyTPTDmelH0GgtUlQZFjMNtZUeOsoFXKcL38xVaTti2ZHCIGjOAmXF+GI MIME-Version: 1.0 X-Received: by 10.55.172.6 with SMTP id v6mr6445731qke.98.1463810880478; Fri, 20 May 2016 23:08:00 -0700 (PDT) Received: by 10.200.42.71 with HTTP; Fri, 20 May 2016 23:08:00 -0700 (PDT) In-Reply-To: References: <573D7394.5050208@suse.cz> <573D78CE.6020900@linaro.org> Date: Sat, 21 May 2016 16:08:00 +1000 Message-ID: Subject: Re: [PATCH] Fix PR tree-optimization/71170 From: Kugan Vivekanandarajah To: Richard Biener Cc: =?UTF-8?Q?Martin_Li=C5=A1ka?= , GCC Patches X-IsSubscribed: yes On 20 May 2016 at 21:07, Richard Biener wrote: > On Fri, May 20, 2016 at 1:51 AM, Kugan Vivekanandarajah > wrote: >> Hi Richard, >> >>> I think it should have the same rank as op or op + 1 which is the current >>> behavior. Sth else doesn't work correctly here I think, like inserting the >>> multiplication not near the definition of op. >>> >>> Well, the whole "clever insertion" logic is simply flawed. >> >> What I meant to say was that the simple logic we have now wouldn’t >> work. "clever logic" is knowing where exactly where it is needed and >> inserting there. I think thats what you are suggesting below in a >> simple to implement way. >> >>> I'd say that ideally we would delay inserting the multiplication to >>> rewrite_expr_tree time. For example by adding a ops->stmt_to_insert >>> member. >>> >> >> Here is an implementation based on above. Bootstrap on x86-linux-gnu >> is OK. regression testing is ongoing. > > I like it. Please push the insertion code to a helper as I think you need > to post-pone setting the stmts UID to that point. > > Ideally we'd make use of the same machinery in attempt_builtin_powi, > removing the special-casing of powi_result. (same as I said that ideally > the plus->mult stuff would use the repeat-ops machinery...) > > I'm not 100% convinced the place you insert the stmt is correct but I > haven't spent too much time to decipher reassoc in this area. Hi Richard, Thanks. Here is a tested version of the patch. I did miss one place which I fixed now (tranform_stmt_to_copy) I also created a function to do the insertion. Bootstrap and regression testing on x86_64-linux-gnu are fine. Is this OK for trunk. Thanks, Kugan gcc/ChangeLog: 2016-05-21 Kugan Vivekanandarajah PR middle-end/71170 * tree-ssa-reassoc.c (struct operand_entry): Add field stmt_to_insert. (add_to_ops_vec): Add stmt_to_insert. (add_repeat_to_ops_vec): Init stmt_to_insert. (insert_stmt_before_use): New. (transform_add_to_multiply): Remove mult_stmt insertion and add it to ops vector. (get_ops): Init stmt_to_insert. (maybe_optimize_range_tests): Likewise. (rewrite_expr_tree): Insert stmt_to_insert before use stmt. (rewrite_expr_tree_parallel): Likewise. (reassociate_bb): Likewise. diff --git a/gcc/tree-ssa-reassoc.c b/gcc/tree-ssa-reassoc.c index 3b5f36b..0b905e9 100644 --- a/gcc/tree-ssa-reassoc.c +++ b/gcc/tree-ssa-reassoc.c @@ -195,6 +195,7 @@ struct operand_entry int id; tree op; unsigned int count; + gimple *stmt_to_insert; }; static object_allocator operand_entry_pool @@ -553,7 +554,7 @@ sort_by_operand_rank (const void *pa, const void *pb) /* Add an operand entry to *OPS for the tree operand OP. */ static void -add_to_ops_vec (vec *ops, tree op) +add_to_ops_vec (vec *ops, tree op, gimple *stmt_to_insert = NULL) { operand_entry *oe = operand_entry_pool.allocate (); @@ -561,6 +562,7 @@ add_to_ops_vec (vec *ops, tree op) oe->rank = get_rank (op); oe->id = next_operand_entry_id++; oe->count = 1; + oe->stmt_to_insert = stmt_to_insert; ops->safe_push (oe); } @@ -577,6 +579,7 @@ add_repeat_to_ops_vec (vec *ops, tree op, oe->rank = get_rank (op); oe->id = next_operand_entry_id++; oe->count = repeat; + oe->stmt_to_insert = NULL; ops->safe_push (oe); reassociate_stats.pows_encountered++; @@ -1756,10 +1759,21 @@ eliminate_redundant_comparison (enum tree_code opcode, return false; } +/* If the stmt that defines operand has to be inserted, insert it + before the use. */ +static void +insert_stmt_before_use (gimple *stmt, gimple *stmt_to_insert) +{ + gimple_stmt_iterator gsi = gsi_for_stmt (stmt); + gimple_set_uid (stmt_to_insert, gimple_uid (stmt)); + gsi_insert_before (&gsi, stmt_to_insert, GSI_NEW_STMT); +} + + /* Transform repeated addition of same values into multiply with constant. */ static bool -transform_add_to_multiply (gimple *stmt, vec *ops) +transform_add_to_multiply (vec *ops) { operand_entry *oe; tree op = NULL_TREE; @@ -1810,21 +1824,11 @@ transform_add_to_multiply (gimple *stmt, vec *ops) ops->unordered_remove (i); tree tmp = make_ssa_name (TREE_TYPE (op)); tree cst = build_int_cst (integer_type_node, count); - gimple *def_stmt = SSA_NAME_DEF_STMT (op); gassign *mul_stmt = gimple_build_assign (tmp, MULT_EXPR, op, fold_convert (TREE_TYPE (op), cst)); - if (gimple_code (def_stmt) == GIMPLE_NOP - || gimple_bb (stmt) != gimple_bb (def_stmt)) - { - gimple_stmt_iterator gsi = gsi_for_stmt (stmt); - gimple_set_uid (mul_stmt, gimple_uid (stmt)); - gsi_insert_before (&gsi, mul_stmt, GSI_NEW_STMT); - } - else - insert_stmt_after (mul_stmt, def_stmt); gimple_set_visited (mul_stmt, true); - add_to_ops_vec (ops, tmp); + add_to_ops_vec (ops, tmp, mul_stmt); changed = true; } @@ -3224,6 +3228,7 @@ get_ops (tree var, enum tree_code code, vec *ops, oe->rank = code; oe->id = 0; oe->count = 1; + oe->stmt_to_insert = NULL; ops->safe_push (oe); } return true; @@ -3464,6 +3469,7 @@ maybe_optimize_range_tests (gimple *stmt) oe->rank = code; oe->id = 0; oe->count = 1; + oe->stmt_to_insert = NULL; ops.safe_push (oe); bb_ent.last_idx++; } @@ -3501,6 +3507,7 @@ maybe_optimize_range_tests (gimple *stmt) is. */ oe->id = bb->index; oe->count = 1; + oe->stmt_to_insert = NULL; ops.safe_push (oe); bb_ent.op = NULL; bb_ent.last_idx++; @@ -3798,6 +3805,7 @@ rewrite_expr_tree (gimple *stmt, unsigned int opindex, oe1 = ops[opindex]; oe2 = ops[opindex + 1]; + if (rhs1 != oe1->op || rhs2 != oe2->op) { gimple_stmt_iterator gsi = gsi_for_stmt (stmt); @@ -3817,6 +3825,12 @@ rewrite_expr_tree (gimple *stmt, unsigned int opindex, { gimple *insert_point = find_insert_point (stmt, oe1->op, oe2->op); + /* If the stmt that defines operand has to be inserted, insert it + before the use. */ + if (oe1->stmt_to_insert) + insert_stmt_before_use (stmt, oe1->stmt_to_insert); + if (oe2->stmt_to_insert) + insert_stmt_before_use (stmt, oe2->stmt_to_insert); lhs = make_ssa_name (TREE_TYPE (lhs)); stmt = gimple_build_assign (lhs, gimple_assign_rhs_code (stmt), @@ -3832,6 +3846,12 @@ rewrite_expr_tree (gimple *stmt, unsigned int opindex, { gcc_checking_assert (find_insert_point (stmt, oe1->op, oe2->op) == stmt); + /* If the stmt that defines operand has to be inserted, insert it + before the use. */ + if (oe1->stmt_to_insert) + insert_stmt_before_use (stmt, oe1->stmt_to_insert); + if (oe2->stmt_to_insert) + insert_stmt_before_use (stmt, oe2->stmt_to_insert); gimple_assign_set_rhs1 (stmt, oe1->op); gimple_assign_set_rhs2 (stmt, oe2->op); update_stmt (stmt); @@ -3855,6 +3875,11 @@ rewrite_expr_tree (gimple *stmt, unsigned int opindex, /* Rewrite the next operator. */ oe = ops[opindex]; + /* If the stmt that defines operand has to be inserted, insert it + before the use. */ + if (oe->stmt_to_insert) + insert_stmt_before_use (stmt, oe->stmt_to_insert); + /* Recurse on the LHS of the binary operator, which is guaranteed to be the non-leaf side. */ tree new_rhs1 @@ -3999,6 +4024,7 @@ rewrite_expr_tree_parallel (gassign *stmt, int width, int stmt_index = 0; int ready_stmts_end = 0; int i = 0; + gimple *stmt1 = NULL, *stmt2 = NULL; tree last_rhs1 = gimple_assign_rhs1 (stmt); /* We start expression rewriting from the top statements. @@ -4027,7 +4053,11 @@ rewrite_expr_tree_parallel (gassign *stmt, int width, if (ready_stmts_end > stmt_index) op2 = gimple_assign_lhs (stmts[stmt_index++]); else if (op_index >= 0) - op2 = ops[op_index--]->op; + { + operand_entry *oe = ops[op_index--]; + stmt2 = oe->stmt_to_insert; + op2 = oe->op; + } else { gcc_assert (stmt_index < i); @@ -4041,8 +4071,12 @@ rewrite_expr_tree_parallel (gassign *stmt, int width, { if (op_index > 1) swap_ops_for_binary_stmt (ops, op_index - 2, NULL); - op2 = ops[op_index--]->op; - op1 = ops[op_index--]->op; + operand_entry *oe2 = ops[op_index--]; + operand_entry *oe1 = ops[op_index--]; + op2 = oe2->op; + stmt2 = oe2->stmt_to_insert; + op1 = oe1->op; + stmt1 = oe1->stmt_to_insert; } /* If we emit the last statement then we should put @@ -4057,6 +4091,13 @@ rewrite_expr_tree_parallel (gassign *stmt, int width, print_gimple_stmt (dump_file, stmts[i], 0, 0); } + /* If the stmt that defines operand has to be inserted, insert it + before the use. */ + if (stmt1) + insert_stmt_before_use (stmts[i], stmt1); + if (stmt2) + insert_stmt_before_use (stmts[i], stmt2); + /* We keep original statement only for the last one. All others are recreated. */ if (i == stmt_num - 1) @@ -5187,7 +5228,7 @@ reassociate_bb (basic_block bb) } if (rhs_code == PLUS_EXPR - && transform_add_to_multiply (stmt, &ops)) + && transform_add_to_multiply (&ops)) ops.qsort (sort_by_operand_rank); if (rhs_code == BIT_IOR_EXPR || rhs_code == BIT_AND_EXPR) @@ -5214,7 +5255,11 @@ reassociate_bb (basic_block bb) else if (ops.length () == 1) { tree last_op = ops.last ()->op; - + + /* If the stmt that defines operand has to be inserted, insert it + before the use. */ + if (ops.last ()->stmt_to_insert) + insert_stmt_before_use (stmt, ops.last ()->stmt_to_insert); if (powi_result) transform_stmt_to_multiply (&gsi, stmt, last_op, powi_result);