182190f2b3
gcc/ * gcc/gimplify.c (enum omp_region_type): Add ORT_ACC, ORT_ACC_DATA, ORT_ACC_PARALLEL, ORT_ACC_KERNELS. Adjust ORT_NONE. (gimple_add_tmp_var): Add ORT_ACC checks. (gimplify_var_or_parm_decl): Likewise. (omp_firstprivatize_variable): Likewise. Use ORT_TARGET_DATA as a mask. (omp_add_variable): Look in outer contexts for openacc and allow reductions with other sharing. Add ORT_ACC and ORT_TARGET_DATA checks. (omp_notice_variable, omp_is_private, omp_check_private): Add ORT_ACC checks. (gimplify_scan_omp_clauses: Treat ORT_ACC as ORT_WORKSHARE. Permit private openacc reductions. (gimplify_oacc_cache): Specify ORT_ACC. (gimplify_omp_workshare): Adjust OpenACC region types. (gimplify_omp_target_update): Likewise. * gcc/omp-low.c (scan_sharing_clauses): Remove Openacc firstprivate sorry. (lower-rec_input_clauses): Don't handle openacc firstprivate references here. (lower_omp_target): Emit initializers for openacc firstprivate vars. gcc/testsuite/ * gfortran.dg/goacc/private-3.f95: Remove xfail. * gfortran.dg/goacc/combined_loop.f90: Remove xfail. libgomp/ * testsuite/libgomp.oacc-c-c++-common/loop-red-v-2.c: Remove xfail. * testsuite/libgomp.oacc-c-c++-common/loop-red-w-2.c: Remove xfail. * testsuite/libgomp.oacc-c-c++-common/firstprivate-1.c: New. * testsuite/libgomp.oacc-c-c++-common/firstprivate-2.c: New. Co-Authored-By: Cesar Philippidis <cesar@codesourcery.com> From-SVN: r230169
58 lines
991 B
C
58 lines
991 B
C
/* { dg-do run } */
|
|
/* { dg-additional-options "-O2" */
|
|
|
|
#include <stdio.h>
|
|
|
|
#define N (32*32*32+17)
|
|
int main ()
|
|
{
|
|
int ix;
|
|
int ondev = 0;
|
|
int q = 0, h = 0;
|
|
|
|
#pragma acc parallel num_workers(32) vector_length(32) copy(q) copy(ondev)
|
|
{
|
|
int t = q;
|
|
|
|
#pragma acc loop worker reduction(+:t)
|
|
for (unsigned ix = 0; ix < N; ix++)
|
|
{
|
|
int val = ix;
|
|
|
|
if (__builtin_acc_on_device (5))
|
|
{
|
|
int g = 0, w = 0, v = 0;
|
|
|
|
__asm__ volatile ("mov.u32 %0,%%ctaid.x;" : "=r" (g));
|
|
__asm__ volatile ("mov.u32 %0,%%tid.y;" : "=r" (w));
|
|
__asm__ volatile ("mov.u32 %0,%%tid.x;" : "=r" (v));
|
|
val = (g << 16) | (w << 8) | v;
|
|
ondev = 1;
|
|
}
|
|
t += val;
|
|
}
|
|
q = t;
|
|
}
|
|
|
|
for (ix = 0; ix < N; ix++)
|
|
{
|
|
int val = ix;
|
|
if(ondev)
|
|
{
|
|
int g = 0;
|
|
int w = ix % 32;
|
|
int v = 0;
|
|
|
|
val = (g << 16) | (w << 8) | v;
|
|
}
|
|
h += val;
|
|
}
|
|
if (q != h)
|
|
{
|
|
printf ("t=%x expected %x\n", q, h);
|
|
return 1;
|
|
}
|
|
|
|
return 0;
|
|
}
|