Author: abataev
Date: Fri Jun 30 06:50:13 2017
New Revision: 306825
URL: http://llvm.org/viewvc/llvm-project?rev=306825&view=rev
Log:
[OPENMP] Initial support for taskloop reductions.
Add sema/parsupping ort for taskloop [simd] reductions.
Modified:
cfe/trunk/include/clang/Basic/OpenMPKinds.def
cfe/trunk/test/OpenMP/taskloop_ast_print.cpp
cfe/trunk/test/OpenMP/taskloop_simd_ast_print.cpp
Modified: cfe/trunk/include/clang/Basic/OpenMPKinds.def
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Basic/OpenMPKinds.def?rev=306825&r1=306824&r2=306825&view=diff
==============================================================================
--- cfe/trunk/include/clang/Basic/OpenMPKinds.def (original)
+++ cfe/trunk/include/clang/Basic/OpenMPKinds.def Fri Jun 30 06:50:13 2017
@@ -552,6 +552,7 @@ OPENMP_TASKLOOP_CLAUSE(priority)
OPENMP_TASKLOOP_CLAUSE(grainsize)
OPENMP_TASKLOOP_CLAUSE(nogroup)
OPENMP_TASKLOOP_CLAUSE(num_tasks)
+OPENMP_TASKLOOP_CLAUSE(reduction)
// Clauses allowed for OpenMP directive 'taskloop simd'.
OPENMP_TASKLOOP_SIMD_CLAUSE(if)
@@ -572,6 +573,7 @@ OPENMP_TASKLOOP_SIMD_CLAUSE(simdlen)
OPENMP_TASKLOOP_SIMD_CLAUSE(grainsize)
OPENMP_TASKLOOP_SIMD_CLAUSE(nogroup)
OPENMP_TASKLOOP_SIMD_CLAUSE(num_tasks)
+OPENMP_TASKLOOP_SIMD_CLAUSE(reduction)
// Clauses allowed for OpenMP directive 'critical'.
OPENMP_CRITICAL_CLAUSE(hint)
Modified: cfe/trunk/test/OpenMP/taskloop_ast_print.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/taskloop_ast_print.cpp?rev=306825&r1=306824&r2=306825&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/taskloop_ast_print.cpp (original)
+++ cfe/trunk/test/OpenMP/taskloop_ast_print.cpp Fri Jun 30 06:50:13 2017
@@ -13,14 +13,14 @@ T tmain(T argc) {
T b = argc, c, d, e, f, g;
static T a;
// CHECK: static T a;
-#pragma omp taskloop if(taskloop: argc > N) default(shared) untied priority(N)
grainsize(N)
- // CHECK-NEXT: #pragma omp taskloop if(taskloop: argc > N) default(shared)
untied priority(N) grainsize(N)
+#pragma omp taskloop if(taskloop: argc > N) default(shared) untied priority(N)
grainsize(N) reduction(+:g)
+ // CHECK-NEXT: #pragma omp taskloop if(taskloop: argc > N) default(shared)
untied priority(N) grainsize(N) reduction(+: g)
for (int i = 0; i < 2; ++i)
a = 2;
// CHECK-NEXT: for (int i = 0; i < 2; ++i)
// CHECK-NEXT: a = 2;
#pragma omp parallel
-#pragma omp taskloop private(argc, b), firstprivate(c, d), lastprivate(d, f)
collapse(N) shared(g) if (c) final(d) mergeable priority(f) nogroup num_tasks(N)
+#pragma omp taskloop private(argc, b), firstprivate(c, d), lastprivate(d, f)
collapse(N) shared(g) if (c) final(d) mergeable priority(f) nogroup
num_tasks(N) reduction(min:a)
for (int i = 0; i < 2; ++i)
for (int j = 0; j < 2; ++j)
for (int j = 0; j < 2; ++j)
@@ -33,7 +33,7 @@ T tmain(T argc) {
for (int j = 0; j < 2; ++j)
foo();
// CHECK-NEXT: #pragma omp parallel
- // CHECK-NEXT: #pragma omp taskloop private(argc,b) firstprivate(c,d)
lastprivate(d,f) collapse(N) shared(g) if(c) final(d) mergeable priority(f)
nogroup num_tasks(N)
+ // CHECK-NEXT: #pragma omp taskloop private(argc,b) firstprivate(c,d)
lastprivate(d,f) collapse(N) shared(g) if(c) final(d) mergeable priority(f)
nogroup num_tasks(N) reduction(min: a)
// CHECK-NEXT: for (int i = 0; i < 2; ++i)
// CHECK-NEXT: for (int j = 0; j < 2; ++j)
// CHECK-NEXT: for (int j = 0; j < 2; ++j)
@@ -53,19 +53,19 @@ int main(int argc, char **argv) {
int b = argc, c, d, e, f, g;
static int a;
// CHECK: static int a;
-#pragma omp taskloop if(taskloop: a) default(none) shared(a) final(b)
priority(5) nogroup num_tasks(argc)
- // CHECK-NEXT: #pragma omp taskloop if(taskloop: a) default(none) shared(a)
final(b) priority(5) nogroup num_tasks(argc)
+#pragma omp taskloop if(taskloop: a) default(none) shared(a) final(b)
priority(5) nogroup num_tasks(argc) reduction(*: g)
+ // CHECK-NEXT: #pragma omp taskloop if(taskloop: a) default(none) shared(a)
final(b) priority(5) nogroup num_tasks(argc) reduction(*: g)
for (int i = 0; i < 2; ++i)
a = 2;
// CHECK-NEXT: for (int i = 0; i < 2; ++i)
// CHECK-NEXT: a = 2;
#pragma omp parallel
-#pragma omp taskloop private(argc, b), firstprivate(argv, c), lastprivate(d,
f) collapse(2) shared(g) if(argc) mergeable priority(argc) grainsize(argc)
+#pragma omp taskloop private(argc, b), firstprivate(argv, c), lastprivate(d,
f) collapse(2) shared(g) if(argc) mergeable priority(argc) grainsize(argc)
reduction(max: a, e)
for (int i = 0; i < 10; ++i)
for (int j = 0; j < 10; ++j)
foo();
// CHECK-NEXT: #pragma omp parallel
- // CHECK-NEXT: #pragma omp taskloop private(argc,b) firstprivate(argv,c)
lastprivate(d,f) collapse(2) shared(g) if(argc) mergeable priority(argc)
grainsize(argc)
+ // CHECK-NEXT: #pragma omp taskloop private(argc,b) firstprivate(argv,c)
lastprivate(d,f) collapse(2) shared(g) if(argc) mergeable priority(argc)
grainsize(argc) reduction(max: a,e)
// CHECK-NEXT: for (int i = 0; i < 10; ++i)
// CHECK-NEXT: for (int j = 0; j < 10; ++j)
// CHECK-NEXT: foo();
Modified: cfe/trunk/test/OpenMP/taskloop_simd_ast_print.cpp
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/test/OpenMP/taskloop_simd_ast_print.cpp?rev=306825&r1=306824&r2=306825&view=diff
==============================================================================
--- cfe/trunk/test/OpenMP/taskloop_simd_ast_print.cpp (original)
+++ cfe/trunk/test/OpenMP/taskloop_simd_ast_print.cpp Fri Jun 30 06:50:13 2017
@@ -14,14 +14,14 @@ T tmain(T argc) {
T *ptr;
static T a;
// CHECK: static T a;
-#pragma omp taskloop simd if(taskloop: argc > N) default(shared) untied
priority(N) safelen(N) linear(c) aligned(ptr) grainsize(N)
- // CHECK-NEXT: #pragma omp taskloop simd if(taskloop: argc > N)
default(shared) untied priority(N) safelen(N) linear(c) aligned(ptr)
grainsize(N)
+#pragma omp taskloop simd if(taskloop: argc > N) default(shared) untied
priority(N) safelen(N) linear(c) aligned(ptr) grainsize(N) reduction(+:g)
+ // CHECK-NEXT: #pragma omp taskloop simd if(taskloop: argc > N)
default(shared) untied priority(N) safelen(N) linear(c) aligned(ptr)
grainsize(N) reduction(+: g)
for (int i = 0; i < 2; ++i)
a = 2;
// CHECK-NEXT: for (int i = 0; i < 2; ++i)
// CHECK-NEXT: a = 2;
#pragma omp parallel
-#pragma omp taskloop simd private(argc, b), firstprivate(c, d), lastprivate(d,
f) collapse(N) shared(g) if (c) final(d) mergeable priority(f) simdlen(N)
nogroup num_tasks(N)
+#pragma omp taskloop simd private(argc, b), firstprivate(c, d), lastprivate(d,
f) collapse(N) shared(g) if (c) final(d) mergeable priority(f) simdlen(N)
nogroup num_tasks(N) reduction(min:a)
for (int i = 0; i < 2; ++i)
for (int j = 0; j < 2; ++j)
for (int j = 0; j < 2; ++j)
@@ -34,7 +34,7 @@ T tmain(T argc) {
for (int j = 0; j < 2; ++j)
foo();
// CHECK-NEXT: #pragma omp parallel
- // CHECK-NEXT: #pragma omp taskloop simd private(argc,b) firstprivate(c,d)
lastprivate(d,f) collapse(N) shared(g) if(c) final(d) mergeable priority(f)
simdlen(N) nogroup num_tasks(N)
+ // CHECK-NEXT: #pragma omp taskloop simd private(argc,b) firstprivate(c,d)
lastprivate(d,f) collapse(N) shared(g) if(c) final(d) mergeable priority(f)
simdlen(N) nogroup num_tasks(N) reduction(min: a)
// CHECK-NEXT: for (int i = 0; i < 2; ++i)
// CHECK-NEXT: for (int j = 0; j < 2; ++j)
// CHECK-NEXT: for (int j = 0; j < 2; ++j)
@@ -54,19 +54,19 @@ int main(int argc, char **argv) {
int b = argc, c, d, e, f, g;
static int a;
// CHECK: static int a;
-#pragma omp taskloop simd if(taskloop: a) default(none) shared(a) final(b)
priority(5) safelen(8) linear(b), aligned(argv) nogroup num_tasks(argc)
- // CHECK-NEXT: #pragma omp taskloop simd if(taskloop: a) default(none)
shared(a) final(b) priority(5) safelen(8) linear(b) aligned(argv) nogroup
num_tasks(argc)
+#pragma omp taskloop simd if(taskloop: a) default(none) shared(a) final(b)
priority(5) safelen(8) linear(b), aligned(argv) nogroup num_tasks(argc)
reduction(*: g)
+ // CHECK-NEXT: #pragma omp taskloop simd if(taskloop: a) default(none)
shared(a) final(b) priority(5) safelen(8) linear(b) aligned(argv) nogroup
num_tasks(argc) reduction(*: g)
for (int i = 0; i < 2; ++i)
a = 2;
// CHECK-NEXT: for (int i = 0; i < 2; ++i)
// CHECK-NEXT: a = 2;
#pragma omp parallel
-#pragma omp taskloop simd private(argc, b), firstprivate(argv, c),
lastprivate(d, f) collapse(2) shared(g) if(argc) mergeable priority(argc)
simdlen(16) grainsize(argc)
+#pragma omp taskloop simd private(argc, b), firstprivate(argv, c),
lastprivate(d, f) collapse(2) shared(g) if(argc) mergeable priority(argc)
simdlen(16) grainsize(argc) reduction(max: a, e)
for (int i = 0; i < 10; ++i)
for (int j = 0; j < 10; ++j)
foo();
// CHECK-NEXT: #pragma omp parallel
- // CHECK-NEXT: #pragma omp taskloop simd private(argc,b)
firstprivate(argv,c) lastprivate(d,f) collapse(2) shared(g) if(argc) mergeable
priority(argc) simdlen(16) grainsize(argc)
+ // CHECK-NEXT: #pragma omp taskloop simd private(argc,b)
firstprivate(argv,c) lastprivate(d,f) collapse(2) shared(g) if(argc) mergeable
priority(argc) simdlen(16) grainsize(argc) reduction(max: a,e)
// CHECK-NEXT: for (int i = 0; i < 10; ++i)
// CHECK-NEXT: for (int j = 0; j < 10; ++j)
// CHECK-NEXT: foo();
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
