Re: [gomp4,committed] Handle recursive restrict in function parameter
On 03/11/15 14:58, Tom de Vries wrote:
This patch adds handling of all the restrict qualifiers in the type of a
function parameter.
And committed to gomp-4_0-branch.
I've reverted this patch, and backported the version from trunk.
Committed as attached.
Thanks,
- Tom
[PATCH 1/2] Revert "Handle recursive restrict in function parameter"
2015-11-04 Tom de Vries
revert:
2015-10-03 Tom de Vries
* tree-ssa-structalias.c (struct fieldoff): Add restrict_var field.
(push_fields_onto_fieldstack): Add and handle handle_param parameter.
(create_variable_info_for_1): Add and handle
handle_param parameter. Add extra arg to call to
push_fields_onto_fieldstack. Handle restrict pointer fields.
(create_variable_info_for): Call create_variable_info_for_1 with extra
arg.
(make_param_constraints): Drop restrict_name parameter. Ignore
vi->only_restrict_pointers.
(intra_create_variable_infos): Call create_variable_info_for_1 with
extra arg. Remove restrict handling. Call make_param_constraints with
one less arg.
* gcc.dg/tree-ssa/restrict-7.c: New test.
* gcc.dg/tree-ssa/restrict-8.c: New test.
---
gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c | 12
gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c | 17 --
gcc/tree-ssa-structalias.c | 90 --
3 files changed, 36 insertions(+), 83 deletions(-)
delete mode 100644 gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c
delete mode 100644 gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c
deleted file mode 100644
index f7a68c7..000
--- a/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c
+++ /dev/null
@@ -1,12 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-fre1" } */
-
-int
-f (int *__restrict__ *__restrict__ *__restrict__ a, int *b)
-{
- *b = 1;
- ***a = 2;
- return *b;
-}
-
-/* { dg-final { scan-tree-dump-times "return 1" 1 "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c
deleted file mode 100644
index b0ab164..000
--- a/gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c
+++ /dev/null
@@ -1,17 +0,0 @@
-/* { dg-do compile } */
-/* { dg-options "-O2 -fdump-tree-fre1" } */
-
-struct s
-{
- int *__restrict__ *__restrict__ pp;
-};
-
-int
-f (struct s s, int *b)
-{
- *b = 1;
- **s.pp = 2;
- return *b;
-}
-
-/* { dg-final { scan-tree-dump-times "return 1" 1 "fre1" } } */
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 074285c..f4c875f 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -320,7 +320,6 @@ static varinfo_t first_or_preceding_vi_for_offset (varinfo_t,
unsigned HOST_WIDE_INT);
static varinfo_t lookup_vi_for_tree (tree);
static inline bool type_can_have_subvars (const_tree);
-static void make_param_constraints (varinfo_t);
/* Pool of variable info structures. */
static object_allocator variable_info_pool
@@ -407,7 +406,6 @@ new_var_info (tree t, const char *name, bool add_id)
return ret;
}
-static varinfo_t create_variable_info_for_1 (tree, const char *, bool, bool);
/* A map mapping call statements to per-stmt variables for uses
and clobbers specific to the call. */
@@ -5210,8 +5208,6 @@ struct fieldoff
unsigned may_have_pointers : 1;
unsigned only_restrict_pointers : 1;
-
- varinfo_t restrict_var;
};
typedef struct fieldoff fieldoff_s;
@@ -5306,12 +5302,11 @@ field_must_have_pointers (tree t)
OFFSET is used to keep track of the offset in this entire
structure, rather than just the immediately containing structure.
Returns false if the caller is supposed to handle the field we
- recursed for. If HANDLE_PARAM is set, we're handling part of a function
- parameter. */
+ recursed for. */
static bool
push_fields_onto_fieldstack (tree type, vec *fieldstack,
- HOST_WIDE_INT offset, bool handle_param)
+ HOST_WIDE_INT offset)
{
tree field;
bool empty_p = true;
@@ -5337,7 +5332,7 @@ push_fields_onto_fieldstack (tree type, vec *fieldstack,
|| TREE_CODE (field_type) == UNION_TYPE)
push = true;
else if (!push_fields_onto_fieldstack
- (field_type, fieldstack, offset + foff, handle_param)
+ (field_type, fieldstack, offset + foff)
&& (DECL_SIZE (field)
&& !integer_zerop (DECL_SIZE (field
/* Empty structures may have actual size, like in C++. So
@@ -5358,8 +5353,7 @@ push_fields_onto_fieldstack (tree type, vec *fieldstack,
if (!pair
&& offset + foff != 0)
{
- fieldoff_s e = {0, offset + foff, false, false, false, false,
-NULL};
+ fieldoff_s e = {0, offset + foff, false, false, false, false};
pair = fieldstack->safe_push (e);
}
@@ -5393,19 +5387,6 @@ push_fields_onto_fieldstack (tree type, vec *fieldstack,
= (!has_unknown_size
&& POINTER_TYPE_P (field_type)
&& TYPE_RESTRICT (field_type));
- if (handle_param
-
[committed] Handle recursive restrict in function parameter
On 04/11/15 10:28, Richard Biener wrote:
I think I can postpone the creation of the heapvar till where you suggest in
>create_variable_info_for_1, but I'd still need a means
>to communicate the TREE_TYPE (field_type) from push_fields_onto_fieldstack to
>create_variable_info_for_1.
>
>A simple implementation would be a new field:
>...
>@@ -5195,6 +5197,8 @@ struct fieldoff
>unsigned may_have_pointers : 1;
>
>unsigned only_restrict_pointers : 1;
>+
>+ tree restrict_pointed_type;
>};
>...
>Which AFAIU will change fieldoff size.
It's ok to change fieldoff size if there is a reason to;)
Patch is ok along this line.
Updated patch accordingly.
Bootstrapped and reg-tested on x86_64.
Committed to trunk as attached.
Thanks,
- Tom
Handle recursive restrict in function parameter
2015-11-04 Tom de Vries
PR tree-optimization/67742
* tree-ssa-structalias.c (struct fieldoff): Add restrict_pointed_type
field.
(push_fields_onto_fieldstack): Handle restrict_pointed_type field.
(create_variable_info_for_1): Add and handle handle_param parameter.
Add restrict handling.
(create_variable_info_for): Call create_variable_info_for_1 with extra
arg.
(make_param_constraints): Drop restrict_name parameter. Ignore
vi->only_restrict_pointers.
(intra_create_variable_infos): Call create_variable_info_for_1 with
extra arg. Remove restrict handling. Call make_param_constraints with
one less arg.
* gcc.dg/tree-ssa/restrict-7.c: New test.
* gcc.dg/tree-ssa/restrict-8.c: New test.
---
gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c | 12 +
gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c | 17 +++
gcc/tree-ssa-structalias.c | 78 +-
3 files changed, 74 insertions(+), 33 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c
create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c
new file mode 100644
index 000..f7a68c7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-fre1" } */
+
+int
+f (int *__restrict__ *__restrict__ *__restrict__ a, int *b)
+{
+ *b = 1;
+ ***a = 2;
+ return *b;
+}
+
+/* { dg-final { scan-tree-dump-times "return 1" 1 "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c b/gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c
new file mode 100644
index 000..b0ab164
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-fre1" } */
+
+struct s
+{
+ int *__restrict__ *__restrict__ pp;
+};
+
+int
+f (struct s s, int *b)
+{
+ *b = 1;
+ **s.pp = 2;
+ return *b;
+}
+
+/* { dg-final { scan-tree-dump-times "return 1" 1 "fre1" } } */
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 98b5f16..52a35f6 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -307,6 +307,7 @@ static varinfo_t first_or_preceding_vi_for_offset (varinfo_t,
unsigned HOST_WIDE_INT);
static varinfo_t lookup_vi_for_tree (tree);
static inline bool type_can_have_subvars (const_tree);
+static void make_param_constraints (varinfo_t);
/* Pool of variable info structures. */
static object_allocator variable_info_pool
@@ -393,7 +394,6 @@ new_var_info (tree t, const char *name, bool add_id)
return ret;
}
-
/* A map mapping call statements to per-stmt variables for uses
and clobbers specific to the call. */
static hash_map *call_stmt_vars;
@@ -5195,6 +5195,8 @@ struct fieldoff
unsigned may_have_pointers : 1;
unsigned only_restrict_pointers : 1;
+
+ tree restrict_pointed_type;
};
typedef struct fieldoff fieldoff_s;
@@ -5340,7 +5342,8 @@ push_fields_onto_fieldstack (tree type, vec *fieldstack,
if (!pair
&& offset + foff != 0)
{
- fieldoff_s e = {0, offset + foff, false, false, false, false};
+ fieldoff_s e
+ = {0, offset + foff, false, false, false, false, NULL_TREE};
pair = fieldstack->safe_push (e);
}
@@ -5374,6 +5377,8 @@ push_fields_onto_fieldstack (tree type, vec *fieldstack,
= (!has_unknown_size
&& POINTER_TYPE_P (field_type)
&& TYPE_RESTRICT (field_type));
+ if (e.only_restrict_pointers)
+ e.restrict_pointed_type = TREE_TYPE (field_type);
fieldstack->safe_push (e);
}
}
@@ -5642,10 +5647,11 @@ check_for_overlaps (vec fieldstack)
/* Create a varinfo structure for NAME and DECL, and add it to VARMAP.
This will also create any varinfo structures necessary for fields
- of DECL. */
+ of DECL. DECL is a function parameter if HANDLE_PARAM is set. */
static varinfo_t
-create_variable_info_for_1 (tree decl, const char *name, bool add_id)
+create_variable_info_for_1 (tree decl, const char *name, bool add_id,
+ bool handle_param)
{
varinfo_t vi, newvi;
tree decl_type = TREE_TYPE (decl);
@@ -5721,6
[gomp4,committed] Handle recursive restrict in function parameter
[ was: Re: [PATCH, 2/2] Handle recursive restrict in function parameter ]
On 03/11/15 14:46, Tom de Vries wrote:
On 01/11/15 19:20, Tom de Vries wrote:
On 01/11/15 19:03, Tom de Vries wrote:
So, the new patch series is:
1Rename make_restrict_var_constraints to
make_param_constraints
2Handle recursive restrict in function parameter
I'll repost in reply to this message.
This patch adds handling of all the restrict qualifiers in the type of a
function parameter.
And reposting an updated version, now that the toplevel parameter in
make_param_constraints has been eliminated.
And committed to gomp-4_0-branch.
Thanks,
- Tom
0001-Handle-recursive-restrict-in-function-parameter.patch
Handle recursive restrict in function parameter
* tree-ssa-structalias.c (struct fieldoff): Add restrict_var field.
(push_fields_onto_fieldstack): Add and handle handle_param parameter.
(create_variable_info_for_1): Add and handle
handle_param parameter. Add extra arg to call to
push_fields_onto_fieldstack. Handle restrict pointer fields.
(create_variable_info_for): Call create_variable_info_for_1 with extra
arg.
(make_param_constraints): Drop restrict_name parameter. Ignore
vi->only_restrict_pointers.
(intra_create_variable_infos): Call create_variable_info_for_1 with
extra arg. Remove restrict handling. Call make_param_constraints with
one less arg.
* gcc.dg/tree-ssa/restrict-7.c: New test.
* gcc.dg/tree-ssa/restrict-8.c: New test.
---
gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c | 12
gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c | 17 ++
gcc/tree-ssa-structalias.c | 90 ++
3 files changed, 83 insertions(+), 36 deletions(-)
create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c
create mode 100644 gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c
b/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c
new file mode 100644
index 000..f7a68c7
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-7.c
@@ -0,0 +1,12 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-fre1" } */
+
+int
+f (int *__restrict__ *__restrict__ *__restrict__ a, int *b)
+{
+ *b = 1;
+ ***a = 2;
+ return *b;
+}
+
+/* { dg-final { scan-tree-dump-times "return 1" 1 "fre1" } } */
diff --git a/gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c
b/gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c
new file mode 100644
index 000..b0ab164
--- /dev/null
+++ b/gcc/testsuite/gcc.dg/tree-ssa/restrict-8.c
@@ -0,0 +1,17 @@
+/* { dg-do compile } */
+/* { dg-options "-O2 -fdump-tree-fre1" } */
+
+struct s
+{
+ int *__restrict__ *__restrict__ pp;
+};
+
+int
+f (struct s s, int *b)
+{
+ *b = 1;
+ **s.pp = 2;
+ return *b;
+}
+
+/* { dg-final { scan-tree-dump-times "return 1" 1 "fre1" } } */
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index ded5a1e..3c65db8 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -307,6 +307,7 @@ static varinfo_t first_or_preceding_vi_for_offset
(varinfo_t,
unsigned HOST_WIDE_INT);
static varinfo_t lookup_vi_for_tree (tree);
static inline bool type_can_have_subvars (const_tree);
+static void make_param_constraints (varinfo_t);
/* Pool of variable info structures. */
static object_allocator variable_info_pool
@@ -393,6 +394,7 @@ new_var_info (tree t, const char *name, bool add_id)
return ret;
}
+static varinfo_t create_variable_info_for_1 (tree, const char *, bool, bool);
/* A map mapping call statements to per-stmt variables for uses
and clobbers specific to the call. */
@@ -5195,6 +5197,8 @@ struct fieldoff
unsigned may_have_pointers : 1;
unsigned only_restrict_pointers : 1;
+
+ varinfo_t restrict_var;
};
typedef struct fieldoff fieldoff_s;
@@ -5289,11 +5293,12 @@ field_must_have_pointers (tree t)
OFFSET is used to keep track of the offset in this entire
structure, rather than just the immediately containing structure.
Returns false if the caller is supposed to handle the field we
- recursed for. */
+ recursed for. If HANDLE_PARAM is set, we're handling part of a function
+ parameter. */
static bool
push_fields_onto_fieldstack (tree type, vec *fieldstack,
-HOST_WIDE_INT offset)
+HOST_WIDE_INT offset, bool handle_param)
{
tree field;
bool empty_p = true;
@@ -5319,7 +5324,7 @@ push_fields_onto_fieldstack (tree type, vec
*fieldstack,
|| TREE_CODE (field_type) == UNION_TYPE)
push = true;
else if (!push_fields_onto_fieldstack
- (field_type, fieldstack, offset + foff)
+ (field_type, fieldstack, offset + foff, handle_param)
&& (DECL_SIZE (field)
&& !in
