re PR libgomp/58756 (FAIL: libgomp.c/pr58392.c execution test)
PR libgomp/58756 * omp-low.c (lower_rec_input_clauses) <case OMP_CLAUSE_REDUCTION>: For reductions without placeholder if is_simd, but when not using GOMP_SIMD* internal calls, also perform the reduction operation on the outer var rather than simple assignment. * testsuite/libgomp.c/pr58756.c: New test. From-SVN: r206011
This commit is contained in:
parent
cc7937daac
commit
e9792e1d9d
|
@ -1,4 +1,13 @@
|
||||||
|
2013-12-16 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
|
PR libgomp/58756
|
||||||
|
* omp-low.c (lower_rec_input_clauses) <case OMP_CLAUSE_REDUCTION>: For
|
||||||
|
reductions without placeholder if is_simd, but when not using
|
||||||
|
GOMP_SIMD* internal calls, also perform the reduction operation
|
||||||
|
on the outer var rather than simple assignment.
|
||||||
|
|
||||||
2013-12-16 Yuri Rumyantsev <ysrumyan@gmail.com>
|
2013-12-16 Yuri Rumyantsev <ysrumyan@gmail.com>
|
||||||
|
|
||||||
* config/i386/i386.c (slm_cost): Fix imul cost for HI.
|
* config/i386/i386.c (slm_cost): Fix imul cost for HI.
|
||||||
|
|
||||||
2013-12-16 Jakub Jelinek <jakub@redhat.com>
|
2013-12-16 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
|
@ -3565,20 +3565,21 @@ lower_rec_input_clauses (tree clauses, gimple_seq *ilist, gimple_seq *dlist,
|
||||||
{
|
{
|
||||||
x = omp_reduction_init (c, TREE_TYPE (new_var));
|
x = omp_reduction_init (c, TREE_TYPE (new_var));
|
||||||
gcc_assert (TREE_CODE (TREE_TYPE (new_var)) != ARRAY_TYPE);
|
gcc_assert (TREE_CODE (TREE_TYPE (new_var)) != ARRAY_TYPE);
|
||||||
if (is_simd
|
|
||||||
&& lower_rec_simd_input_clauses (new_var, ctx, max_vf,
|
|
||||||
idx, lane, ivar, lvar))
|
|
||||||
{
|
|
||||||
enum tree_code code = OMP_CLAUSE_REDUCTION_CODE (c);
|
enum tree_code code = OMP_CLAUSE_REDUCTION_CODE (c);
|
||||||
tree ref = build_outer_var_ref (var, ctx);
|
|
||||||
|
|
||||||
gimplify_assign (unshare_expr (ivar), x, &llist[0]);
|
|
||||||
|
|
||||||
/* reduction(-:var) sums up the partial results, so it
|
/* reduction(-:var) sums up the partial results, so it
|
||||||
acts identically to reduction(+:var). */
|
acts identically to reduction(+:var). */
|
||||||
if (code == MINUS_EXPR)
|
if (code == MINUS_EXPR)
|
||||||
code = PLUS_EXPR;
|
code = PLUS_EXPR;
|
||||||
|
|
||||||
|
if (is_simd
|
||||||
|
&& lower_rec_simd_input_clauses (new_var, ctx, max_vf,
|
||||||
|
idx, lane, ivar, lvar))
|
||||||
|
{
|
||||||
|
tree ref = build_outer_var_ref (var, ctx);
|
||||||
|
|
||||||
|
gimplify_assign (unshare_expr (ivar), x, &llist[0]);
|
||||||
|
|
||||||
x = build2 (code, TREE_TYPE (ref), ref, ivar);
|
x = build2 (code, TREE_TYPE (ref), ref, ivar);
|
||||||
ref = build_outer_var_ref (var, ctx);
|
ref = build_outer_var_ref (var, ctx);
|
||||||
gimplify_assign (ref, x, &llist[1]);
|
gimplify_assign (ref, x, &llist[1]);
|
||||||
|
@ -3587,8 +3588,13 @@ lower_rec_input_clauses (tree clauses, gimple_seq *ilist, gimple_seq *dlist,
|
||||||
{
|
{
|
||||||
gimplify_assign (new_var, x, ilist);
|
gimplify_assign (new_var, x, ilist);
|
||||||
if (is_simd)
|
if (is_simd)
|
||||||
gimplify_assign (build_outer_var_ref (var, ctx),
|
{
|
||||||
new_var, dlist);
|
tree ref = build_outer_var_ref (var, ctx);
|
||||||
|
|
||||||
|
x = build2 (code, TREE_TYPE (ref), ref, new_var);
|
||||||
|
ref = build_outer_var_ref (var, ctx);
|
||||||
|
gimplify_assign (ref, x, dlist);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
|
|
|
@ -1,3 +1,8 @@
|
||||||
|
2013-12-16 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
|
PR libgomp/58756
|
||||||
|
* testsuite/libgomp.c/pr58756.c: New test.
|
||||||
|
|
||||||
2013-12-12 Jakub Jelinek <jakub@redhat.com>
|
2013-12-12 Jakub Jelinek <jakub@redhat.com>
|
||||||
|
|
||||||
PR libgomp/59467
|
PR libgomp/59467
|
||||||
|
|
|
@ -0,0 +1,58 @@
|
||||||
|
/* PR libgomp/58756 */
|
||||||
|
/* { dg-do run } */
|
||||||
|
/* { dg-options "-O2" } */
|
||||||
|
/* { dg-additional-options "-msse2" { target sse2_runtime } } */
|
||||||
|
/* { dg-additional-options "-mavx" { target avx_runtime } } */
|
||||||
|
|
||||||
|
extern void abort (void);
|
||||||
|
int d[32 * 32];
|
||||||
|
|
||||||
|
__attribute__((noinline, noclone)) int
|
||||||
|
foo (int a, int b)
|
||||||
|
{
|
||||||
|
int j, c = 0;
|
||||||
|
#pragma omp parallel for reduction(+: c)
|
||||||
|
for (j = 0; j < a; j += 32)
|
||||||
|
{
|
||||||
|
int l;
|
||||||
|
#pragma omp simd reduction(+: c) safelen(1)
|
||||||
|
for (l = 0; l < b; ++l)
|
||||||
|
c += d[j + l];
|
||||||
|
}
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((noinline, noclone)) int
|
||||||
|
bar (int a)
|
||||||
|
{
|
||||||
|
int j, c = 0;
|
||||||
|
#pragma omp parallel for simd reduction(+: c) safelen(1)
|
||||||
|
for (j = 0; j < a; ++j)
|
||||||
|
c += d[j];
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
__attribute__((noinline)) static int
|
||||||
|
baz (int a)
|
||||||
|
{
|
||||||
|
int j, c = 0;
|
||||||
|
#pragma omp simd reduction(+: c) safelen(1)
|
||||||
|
for (j = 0; j < a; ++j)
|
||||||
|
c += d[j];
|
||||||
|
return c;
|
||||||
|
}
|
||||||
|
|
||||||
|
int
|
||||||
|
main ()
|
||||||
|
{
|
||||||
|
int i;
|
||||||
|
for (i = 0; i < 32 * 32; i++)
|
||||||
|
d[i] = (i & 31);
|
||||||
|
if (foo (32 * 32, 32) != (31 * 32 / 2) * 32)
|
||||||
|
abort ();
|
||||||
|
if (bar (32 * 32) != (31 * 32 / 2) * 32)
|
||||||
|
abort ();
|
||||||
|
if (baz (32 * 32) != (31 * 32 / 2) * 32)
|
||||||
|
abort ();
|
||||||
|
return 0;
|
||||||
|
}
|
Loading…
Reference in New Issue