FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR middle-end/83977 (ICE in simd_clone_clauses_extract, at omp-simd-clone.c:184)

Browse source 
PR middle-end/83977
	* tree.c (free_lang_data_in_decl): Don't clear DECL_ABSTRACT_ORIGIN
	here.
	* omp-low.c (create_omp_child_function): Remove "omp declare simd"
	attributes from DECL_ATTRIBUTES (decl) without affecting
	DECL_ATTRIBUTES (current_function_decl).
	* omp-simd-clone.c (expand_simd_clones): Ignore DECL_ARTIFICIAL
	functions with non-NULL DECL_ABSTRACT_ORIGIN.

	* c-c++-common/gomp/pr83977-1.c: New test.
	* c-c++-common/gomp/pr83977-2.c: New test.
	* c-c++-common/gomp/pr83977-3.c: New test.
	* gfortran.dg/gomp/pr83977.f90: New test.

From-SVN: r257023
This commit is contained in:
Jakub Jelinek 2018-01-24 17:28:47 +01:00 • committed by Jakub Jelinek
parent 556d3a2433
commit f1542d9aee
9 changed files with 113 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
gcc/ChangeLog
View file

@ -1,3 +1,14 @@
2018-01-24 Jakub Jelinek <jakub@redhat.com>
PR middle-end/83977
* tree.c (free_lang_data_in_decl): Don't clear DECL_ABSTRACT_ORIGIN
here.
* omp-low.c (create_omp_child_function): Remove "omp declare simd"
attributes from DECL_ATTRIBUTES (decl) without affecting
DECL_ATTRIBUTES (current_function_decl).
* omp-simd-clone.c (expand_simd_clones): Ignore DECL_ARTIFICIAL
functions with non-NULL DECL_ABSTRACT_ORIGIN.
2018-01-24 Richard Sandiford <richard.sandiford@linaro.org>
PR tree-optimization/83979

17
gcc/omp-low.c
View file

@ -1585,6 +1585,23 @@ create_omp_child_function (omp_context *ctx, bool task_copy)
DECL_INITIAL (decl) = make_node (BLOCK);
BLOCK_SUPERCONTEXT (DECL_INITIAL (decl)) = decl;
DECL_ATTRIBUTES (decl) = DECL_ATTRIBUTES (current_function_decl);
/* Remove omp declare simd attribute from the new attributes. */
if (tree a = lookup_attribute ("omp declare simd", DECL_ATTRIBUTES (decl)))
{
while (tree a2 = lookup_attribute ("omp declare simd", TREE_CHAIN (a)))
a = a2;
a = TREE_CHAIN (a);
for (tree *p = &DECL_ATTRIBUTES (decl); *p != a;)
if (is_attribute_p ("omp declare simd", get_attribute_name (*p)))
*p = TREE_CHAIN (*p);
else
{
tree chain = TREE_CHAIN (*p);
*p = copy_node (*p);
p = &TREE_CHAIN (*p);
*p = chain;
}
}
DECL_FUNCTION_SPECIFIC_OPTIMIZATION (decl)
= DECL_FUNCTION_SPECIFIC_OPTIMIZATION (current_function_decl);
DECL_FUNCTION_SPECIFIC_TARGET (decl)

4
gcc/omp-simd-clone.c
View file

@ -1574,6 +1574,10 @@ expand_simd_clones (struct cgraph_node *node)
tree attr = lookup_attribute ("omp declare simd",
DECL_ATTRIBUTES (node->decl));
if (attr == NULL_TREE
/* Ignore artificial decls with an abstract origin, results of function
cloning, versioning etc. We want to handle certain builtins
with simd attribute, like __builtin_sin. */
|| (DECL_ARTIFICIAL (node->decl) && DECL_ABSTRACT_ORIGIN (node->decl))
|| node->global.inlined_to
|| lookup_attribute ("noclone", DECL_ATTRIBUTES (node->decl)))
return;

8
gcc/testsuite/ChangeLog
View file

@ -1,3 +1,11 @@
2018-01-24 Jakub Jelinek <jakub@redhat.com>
PR middle-end/83977
* c-c++-common/gomp/pr83977-1.c: New test.
* c-c++-common/gomp/pr83977-2.c: New test.
* c-c++-common/gomp/pr83977-3.c: New test.
* gfortran.dg/gomp/pr83977.f90: New test.
2018-01-24 Richard Sandiford <richard.sandiford@linaro.org>
PR testsuite/83889

19
gcc/testsuite/c-c++-common/gomp/pr83977-1.c Normal file
View file

@ -0,0 +1,19 @@
/* PR middle-end/83977 */
/* { dg-do compile } */
/* { dg-additional-options "-O2" } */
struct S { int a, b, c; };
#pragma omp declare simd uniform(z) linear(v:1)
__attribute__((noinline)) static int
foo (int x, int y, struct S z, int u, int v)
{
return x + y + z.a;
}
int
bar (int x, int y, int z)
{
struct S s = { z, 1, 1 };
return foo (x, y, s, 0, 0);
}

18
gcc/testsuite/c-c++-common/gomp/pr83977-2.c Normal file
View file

@ -0,0 +1,18 @@
/* PR middle-end/83977 */
/* { dg-do compile } */
void bar (void);
#pragma omp declare simd uniform (b) linear(a:b)
int
foo (int a, int b)
{
a = a + 1;
/* This function can't be called from simd loops,
because it violates declare simd restrictions.
We shouldn't ICE on it though, nor attempt to generate
simd clones for the *omp_fn* functions. */
#pragma omp parallel
bar ();
return a;
}

21
gcc/testsuite/c-c++-common/gomp/pr83977-3.c Normal file
View file

@ -0,0 +1,21 @@
/* PR middle-end/83977 */
/* { dg-do compile } */
void bar (void);
int foo (int, int) __attribute__((used));
#pragma omp declare simd uniform (b) linear(a:b)
int
foo (int a, int b)
{
a = a + 1;
/* This function can't be called from simd loops,
because it violates declare simd restrictions.
We shouldn't ICE on it though, nor attempt to generate
simd clones for the *omp_fn* functions. */
#pragma omp parallel
bar ();
return a;
}
int foo (int, int) __attribute__((unused));

15
gcc/testsuite/gfortran.dg/gomp/pr83977.f90 Normal file
View file

@ -0,0 +1,15 @@
! PR middle-end/83977
! { dg-do compile }
integer function foo (a, b)
integer :: a, b
!$omp declare simd uniform(b) linear(ref(a):b)
a = a + 1
! This function can't be called from simd loops,
! because it violates declare simd restrictions.
! We shouldn't ICE on it though, nor attempt to generate
! simd clones for the *omp_fn* functions.
!$omp parallel
call sub
!$omp end parallel
end

10
gcc/tree.c
View file

@ -5329,16 +5329,6 @@ free_lang_data_in_decl (tree decl)
At this point, it is not needed anymore. */
DECL_SAVED_TREE (decl) = NULL_TREE;
/* Clear the abstract origin if it refers to a method.
Otherwise dwarf2out.c will ICE as we splice functions out of
TYPE_FIELDS and thus the origin will not be output
correctly. */
if (DECL_ABSTRACT_ORIGIN (decl)
&& DECL_CONTEXT (DECL_ABSTRACT_ORIGIN (decl))
&& RECORD_OR_UNION_TYPE_P
(DECL_CONTEXT (DECL_ABSTRACT_ORIGIN (decl))))
DECL_ABSTRACT_ORIGIN (decl) = NULL_TREE;
/* Sometimes the C++ frontend doesn't manage to transform a temporary
DECL_VINDEX referring to itself into a vtable slot number as it
should. Happens with functions that are copied and then forgotten