From: "Kewen.Lin" <linkw@linux.ibm.com>
To: GCC Patches <gcc-patches@gcc.gnu.org>
Cc: Segher Boessenkool <segher@kernel.crashing.org>,
Bill Schmidt <wschmidt@linux.ibm.com>,
"bin.cheng" <bin.cheng@linux.alibaba.com>,
Richard Guenther <rguenther@suse.de>
Subject: [PATCH 3/4 GCC11] IVOPTs Consider cost_step on different forms during unrolling
Date: Thu, 16 Jan 2020 10:06:00 -0000 [thread overview]
Message-ID: <a4ea0512-1e2f-0e88-005b-e874a3aac6fe@linux.ibm.com> (raw)
In-Reply-To: <ddd8c186-fc88-96df-b1c0-f99edec654f2@linux.ibm.com>
[-- Attachment #1: Type: text/plain, Size: 544 bytes --]
gcc/ChangeLog
2020-01-16 Kewen Lin <linkw@gcc.gnu.org>
* tree-ssa-loop-ivopts.c (struct iv_group): New field dform_p.
(struct iv_cand): New field dform_p.
(struct ivopts_data): New field mark_dform_p.
(record_group): Initialize dform_p.
(mark_dform_groups): New function.
(find_interesting_uses): Call mark_dform_groups.
(add_candidate_1): Update dform_p if derived from dform_p group.
(determine_iv_cost): Increase cost by considering unroll factor.
(tree_ssa_iv_optimize_loop): Call estimate_unroll_factor, update mark_dform_p.
[-- Attachment #2: 0003.patch --]
[-- Type: text/plain, Size: 5667 bytes --]
gcc/tree-ssa-loop-ivopts.c | 84 +++++++++++++++++++++++++++++++++++++++++++++-
1 file changed, 83 insertions(+), 1 deletion(-)
diff --git a/gcc/tree-ssa-loop-ivopts.c b/gcc/tree-ssa-loop-ivopts.c
index ab52cbe..a0d29bb 100644
--- a/gcc/tree-ssa-loop-ivopts.c
+++ b/gcc/tree-ssa-loop-ivopts.c
@@ -429,6 +429,8 @@ struct iv_group
struct iv_cand *selected;
/* To indicate this is a doloop use group. */
bool doloop_p;
+ /* To indicate this group is D-form preferred. */
+ bool dform_p;
/* Uses in the group. */
vec<struct iv_use *> vuses;
};
@@ -470,6 +472,7 @@ struct iv_cand
struct iv *orig_iv; /* The original iv if this cand is added from biv with
smaller type. */
bool doloop_p; /* Whether this is a doloop candidate. */
+ bool dform_p; /* Derived from one D-form preferred group. */
};
/* Hashtable entry for common candidate derived from iv uses. */
@@ -650,6 +653,10 @@ struct ivopts_data
/* Whether the loop has doloop comparison use. */
bool doloop_use_p;
+
+ /* Whether the loop is likely to unroll and need to check and mark
+ D-form group for better step cost modeling. */
+ bool mark_dform_p;
};
/* An assignment of iv candidates to uses. */
@@ -1575,6 +1582,7 @@ record_group (struct ivopts_data *data, enum use_type type)
group->related_cands = BITMAP_ALLOC (NULL);
group->vuses.create (1);
group->doloop_p = false;
+ group->dform_p = false;
data->vgroups.safe_push (group);
return group;
@@ -2724,6 +2732,59 @@ split_address_groups (struct ivopts_data *data)
}
}
+/* Go through all address type groups, check and mark D-form preferred. */
+static void
+mark_dform_groups (struct ivopts_data *data)
+{
+ if (!data->mark_dform_p)
+ return;
+
+ class loop *loop = data->current_loop;
+ bool dump_details = (dump_file && (dump_flags & TDF_DETAILS));
+ for (unsigned i = 0; i < data->vgroups.length (); i++)
+ {
+ struct iv_group *group = data->vgroups[i];
+ if (address_p (group->type))
+ {
+ bool found = true;
+ for (unsigned j = 0; j < group->vuses.length (); j++)
+ {
+ struct iv_use *use = group->vuses[j];
+ gcc_assert (use->mem_type);
+ /* Ensure the step fit into D-form field. */
+ if (TREE_CODE (use->iv->step) != INTEGER_CST
+ || !tree_fits_shwi_p (use->iv->step))
+ {
+ found = false;
+ if (dump_details)
+ fprintf (dump_file,
+ " Group use %u.%u doesn't"
+ "have constant step for D-form.\n",
+ i, j);
+ break;
+ }
+ bool is_store
+ = TREE_CODE (gimple_assign_lhs (use->stmt)) == SSA_NAME;
+ if (!targetm.stride_dform_valid_p (TYPE_MODE (use->mem_type),
+ tree_to_shwi (use->iv->step),
+ TYPE_UNSIGNED (use->mem_type),
+ is_store, loop->estimated_uf))
+ {
+ found = false;
+ if (dump_details)
+ fprintf (dump_file,
+ " Group use %u.%u isn't"
+ "suitable for D-form.\n",
+ i, j);
+ break;
+ }
+ }
+ if (found)
+ group->dform_p = true;
+ }
+ }
+}
+
/* Finds uses of the induction variables that are interesting. */
static void
@@ -2755,6 +2816,8 @@ find_interesting_uses (struct ivopts_data *data)
split_address_groups (data);
+ mark_dform_groups (data);
+
if (dump_file && (dump_flags & TDF_DETAILS))
{
fprintf (dump_file, "\n<IV Groups>:\n");
@@ -3137,6 +3200,7 @@ add_candidate_1 (struct ivopts_data *data, tree base, tree step, bool important,
cand->important = important;
cand->incremented_at = incremented_at;
cand->doloop_p = doloop;
+ cand->dform_p = false;
data->vcands.safe_push (cand);
if (!poly_int_tree_p (step))
@@ -3173,7 +3237,11 @@ add_candidate_1 (struct ivopts_data *data, tree base, tree step, bool important,
/* Relate candidate to the group for which it is added. */
if (use)
- bitmap_set_bit (data->vgroups[use->group_id]->related_cands, i);
+ {
+ bitmap_set_bit (data->vgroups[use->group_id]->related_cands, i);
+ if (data->vgroups[use->group_id]->dform_p)
+ cand->dform_p = true;
+ }
return cand;
}
@@ -5867,6 +5935,10 @@ determine_iv_cost (struct ivopts_data *data, struct iv_cand *cand)
cost_step = add_cost (data->speed, TYPE_MODE (TREE_TYPE (base)));
cost = cost_step + adjust_setup_cost (data, cost_base.cost);
+ /* Consider the stride update cost during unrolling. */
+ if (!cand->dform_p)
+ cost += (data->current_loop->estimated_uf - 1) * cost_step;
+
/* Prefer the original ivs unless we may gain something by replacing it.
The reason is to make debugging simpler; so this is not relevant for
artificial ivs created by other optimization passes. */
@@ -7953,6 +8025,7 @@ tree_ssa_iv_optimize_loop (struct ivopts_data *data, class loop *loop,
data->current_loop = loop;
data->loop_loc = find_loop_location (loop).get_location_t ();
data->speed = optimize_loop_for_speed_p (loop);
+ data->mark_dform_p = false;
if (dump_file && (dump_flags & TDF_DETAILS))
{
@@ -7984,6 +8057,15 @@ tree_ssa_iv_optimize_loop (struct ivopts_data *data, class loop *loop,
if (!find_induction_variables (data))
goto finish;
+ if (targetm.stride_dform_valid_p && exit)
+ {
+ tree_niter_desc *desc = niter_for_exit (data, exit);
+ estimate_unroll_factor (loop, desc);
+ if (dump_file && (dump_flags & TDF_DETAILS))
+ fprintf (dump_file, "estimated_uf:%u\n", loop->estimated_uf);
+ data->mark_dform_p = loop->estimated_uf > 1;
+ }
+
/* Finds interesting uses (item 1). */
find_interesting_uses (data);
if (data->vgroups.length () > MAX_CONSIDERED_GROUPS)
--
2.7.4
next prev parent reply other threads:[~2020-01-16 9:41 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-16 9:41 [PATCH 0/4 GCC11] IVOPTs consider step cost for different forms when unrolling Kewen.Lin
2020-01-16 9:43 ` [PATCH 1/4 GCC11] Add middle-end unroll factor estimation Kewen.Lin
2020-01-20 13:12 ` Segher Boessenkool
2020-02-10 6:20 ` [PATCH 1/4 v2 " Kewen.Lin
2020-02-10 23:34 ` Segher Boessenkool
2020-02-11 6:51 ` [PATCH 1/4 v3 " Kewen.Lin
2020-02-11 7:00 ` Segher Boessenkool
2020-02-11 2:15 ` [PATCH 1/4 v2 " Jiufu Guo
2020-02-11 3:04 ` Kewen.Lin
2020-01-16 10:02 ` [PATCH 2/4 GCC11] Add target hook stride_dform_valid_p Kewen.Lin
2020-01-20 10:53 ` Richard Sandiford
2020-01-20 11:47 ` Richard Biener
2020-01-20 13:20 ` Segher Boessenkool
2020-02-25 9:46 ` Kewen.Lin
2020-03-02 11:09 ` Richard Sandiford
2020-03-03 12:26 ` Kewen.Lin
2020-05-13 5:50 ` Kewen.Lin
2020-05-28 2:17 ` Ping^1 [PATCH 2/4 V3] " Kewen.Lin
2020-05-28 10:54 ` Richard Sandiford
2020-01-16 10:06 ` Kewen.Lin [this message]
2020-02-25 9:48 ` [PATCH 3/4 V2 GCC11] IVOPTs Consider cost_step on different forms during unrolling Kewen.Lin
2020-05-13 5:42 ` [PATCH 3/4 V3 " Kewen.Lin
2020-01-16 10:12 ` [PATCH 4/4 GCC11] rs6000: P9 D-form test cases Kewen.Lin
2020-01-20 13:37 ` Segher Boessenkool
2020-02-10 6:25 ` [PATCH 4/4 v2 " Kewen.Lin
2020-02-10 23:51 ` Segher Boessenkool
2020-01-20 13:03 ` [PATCH 0/4 GCC11] IVOPTs consider step cost for different forms when unrolling Segher Boessenkool
2020-02-10 6:17 ` Kewen.Lin
2020-02-10 21:29 ` Segher Boessenkool
2020-02-11 2:56 ` Kewen.Lin
2020-02-11 7:34 ` Richard Biener
2020-02-11 7:49 ` Segher Boessenkool
2020-02-11 8:01 ` Richard Biener
2020-02-11 12:46 ` Roman Zhuykov
2020-02-11 13:58 ` Richard Biener
2020-02-11 18:00 ` Segher Boessenkool
2020-02-12 8:07 ` Richard Biener
2020-02-12 21:53 ` Segher Boessenkool
2020-02-11 18:12 ` Segher Boessenkool
2020-02-12 8:13 ` Richard Biener
2020-02-12 10:02 ` Segher Boessenkool
2020-02-12 10:53 ` Richard Biener
2020-02-12 22:05 ` Segher Boessenkool
2020-02-13 7:48 ` Richard Biener
2020-02-13 9:02 ` Segher Boessenkool
2020-01-20 14:16 [PATCH 3/4 GCC11] IVOPTs Consider cost_step on different forms during unrolling Wilco Dijkstra
2020-01-20 14:42 ` Segher Boessenkool
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=a4ea0512-1e2f-0e88-005b-e874a3aac6fe@linux.ibm.com \
--to=linkw@linux.ibm.com \
--cc=bin.cheng@linux.alibaba.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=rguenther@suse.de \
--cc=segher@kernel.crashing.org \
--cc=wschmidt@linux.ibm.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).