Skip to content

Commit e218477

Browse files
authored
Fix _Pragma: Add missing 'omp' (#6)
* t-reduction-team/test.c: Add missing 'omp' to '_Pragma("teams'. * t-tdpf-nested-parallel/defines.h: Likewise * t-tdpf-nested-parallel/test.c: Likewise. * t-unified-reduction-team/test.c: Likewise.
1 parent d359dd3 commit e218477

File tree

4 files changed

+67
-67
lines changed

4 files changed

+67
-67
lines changed

t-reduction-team/test.c

+32-32
Original file line numberDiff line numberDiff line change
@@ -554,7 +554,7 @@ int main(void) {
554554
REDUCTION_INIT();
555555
},
556556
{
557-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) REDUCTION_CLAUSES")
557+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) REDUCTION_CLAUSES")
558558
REDUCTION_LOOP()
559559
},
560560
{
@@ -575,7 +575,7 @@ int main(void) {
575575
REDUCTION_INIT();
576576
},
577577
{
578-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) schedule(static) REDUCTION_CLAUSES")
578+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) schedule(static) REDUCTION_CLAUSES")
579579
REDUCTION_LOOP()
580580
},
581581
{
@@ -597,7 +597,7 @@ int main(void) {
597597
REDUCTION_INIT();
598598
},
599599
{
600-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) schedule(static,sch) REDUCTION_CLAUSES")
600+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) schedule(static,sch) REDUCTION_CLAUSES")
601601
REDUCTION_LOOP()
602602
},
603603
{
@@ -619,7 +619,7 @@ int main(void) {
619619
REDUCTION_INIT();
620620
},
621621
{
622-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) schedule(dynamic) REDUCTION_CLAUSES")
622+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) schedule(dynamic) REDUCTION_CLAUSES")
623623
REDUCTION_LOOP()
624624
},
625625
{
@@ -641,7 +641,7 @@ int main(void) {
641641
REDUCTION_INIT();
642642
},
643643
{
644-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) schedule(dynamic,sch) REDUCTION_CLAUSES")
644+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) schedule(dynamic,sch) REDUCTION_CLAUSES")
645645
REDUCTION_LOOP()
646646
},
647647
{
@@ -663,7 +663,7 @@ int main(void) {
663663
REDUCTION_INIT();
664664
},
665665
{
666-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static) REDUCTION_CLAUSES")
666+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static) REDUCTION_CLAUSES")
667667
REDUCTION_LOOP()
668668
},
669669
{
@@ -684,7 +684,7 @@ int main(void) {
684684
REDUCTION_INIT();
685685
},
686686
{
687-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static) schedule(static) REDUCTION_CLAUSES")
687+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static) schedule(static) REDUCTION_CLAUSES")
688688
REDUCTION_LOOP()
689689
},
690690
{
@@ -706,7 +706,7 @@ int main(void) {
706706
REDUCTION_INIT();
707707
},
708708
{
709-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static) schedule(static,sch) REDUCTION_CLAUSES")
709+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static) schedule(static,sch) REDUCTION_CLAUSES")
710710
REDUCTION_LOOP()
711711
},
712712
{
@@ -729,7 +729,7 @@ int main(void) {
729729
REDUCTION_INIT();
730730
},
731731
{
732-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(static) REDUCTION_CLAUSES")
732+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(static) REDUCTION_CLAUSES")
733733
REDUCTION_LOOP()
734734
},
735735
{
@@ -752,7 +752,7 @@ int main(void) {
752752
REDUCTION_INIT();
753753
},
754754
{
755-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(static,sch) REDUCTION_CLAUSES")
755+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(static,sch) REDUCTION_CLAUSES")
756756
REDUCTION_LOOP()
757757
},
758758
{
@@ -775,7 +775,7 @@ int main(void) {
775775
REDUCTION_INIT();
776776
},
777777
{
778-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic) REDUCTION_CLAUSES")
778+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic) REDUCTION_CLAUSES")
779779
REDUCTION_LOOP()
780780
},
781781
{
@@ -798,7 +798,7 @@ int main(void) {
798798
REDUCTION_INIT();
799799
},
800800
{
801-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic,sch) REDUCTION_CLAUSES")
801+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic,sch) REDUCTION_CLAUSES")
802802
REDUCTION_LOOP()
803803
},
804804
{
@@ -821,7 +821,7 @@ int main(void) {
821821
REDUCTION_INIT();
822822
},
823823
{
824-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(guided) REDUCTION_CLAUSES")
824+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(guided) REDUCTION_CLAUSES")
825825
REDUCTION_LOOP()
826826
},
827827
{
@@ -844,7 +844,7 @@ int main(void) {
844844
REDUCTION_INIT();
845845
},
846846
{
847-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(guided,sch) REDUCTION_CLAUSES")
847+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(guided,sch) REDUCTION_CLAUSES")
848848
REDUCTION_LOOP()
849849
},
850850
{
@@ -867,7 +867,7 @@ int main(void) {
867867
REDUCTION_INIT();
868868
},
869869
{
870-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic) REDUCTION_CLAUSES")
870+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic) REDUCTION_CLAUSES")
871871
REDUCTION_LOOP()
872872
},
873873
{
@@ -890,7 +890,7 @@ int main(void) {
890890
REDUCTION_INIT();
891891
},
892892
{
893-
_Pragma("teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(runtime) REDUCTION_CLAUSES")
893+
_Pragma("omp teams distribute parallel for num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(runtime) REDUCTION_CLAUSES")
894894
REDUCTION_LOOP()
895895
},
896896
{
@@ -1222,7 +1222,7 @@ int main(void) {
12221222
REDUCTION_INIT();
12231223
},
12241224
{
1225-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) REDUCTION_CLAUSES")
1225+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) REDUCTION_CLAUSES")
12261226
REDUCTION_LOOP()
12271227
},
12281228
{
@@ -1243,7 +1243,7 @@ int main(void) {
12431243
REDUCTION_INIT();
12441244
},
12451245
{
1246-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) schedule(static) REDUCTION_CLAUSES")
1246+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) schedule(static) REDUCTION_CLAUSES")
12471247
REDUCTION_LOOP()
12481248
},
12491249
{
@@ -1265,7 +1265,7 @@ int main(void) {
12651265
REDUCTION_INIT();
12661266
},
12671267
{
1268-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) schedule(static,sch) REDUCTION_CLAUSES")
1268+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) schedule(static,sch) REDUCTION_CLAUSES")
12691269
REDUCTION_LOOP()
12701270
},
12711271
{
@@ -1287,7 +1287,7 @@ int main(void) {
12871287
REDUCTION_INIT();
12881288
},
12891289
{
1290-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) schedule(dynamic) REDUCTION_CLAUSES")
1290+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) schedule(dynamic) REDUCTION_CLAUSES")
12911291
REDUCTION_LOOP()
12921292
},
12931293
{
@@ -1309,7 +1309,7 @@ int main(void) {
13091309
REDUCTION_INIT();
13101310
},
13111311
{
1312-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) schedule(dynamic,sch) REDUCTION_CLAUSES")
1312+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) schedule(dynamic,sch) REDUCTION_CLAUSES")
13131313
REDUCTION_LOOP()
13141314
},
13151315
{
@@ -1331,7 +1331,7 @@ int main(void) {
13311331
REDUCTION_INIT();
13321332
},
13331333
{
1334-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static) REDUCTION_CLAUSES")
1334+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static) REDUCTION_CLAUSES")
13351335
REDUCTION_LOOP()
13361336
},
13371337
{
@@ -1352,7 +1352,7 @@ int main(void) {
13521352
REDUCTION_INIT();
13531353
},
13541354
{
1355-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static) schedule(static) REDUCTION_CLAUSES")
1355+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static) schedule(static) REDUCTION_CLAUSES")
13561356
REDUCTION_LOOP()
13571357
},
13581358
{
@@ -1374,7 +1374,7 @@ int main(void) {
13741374
REDUCTION_INIT();
13751375
},
13761376
{
1377-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static) schedule(static,sch) REDUCTION_CLAUSES")
1377+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static) schedule(static,sch) REDUCTION_CLAUSES")
13781378
REDUCTION_LOOP()
13791379
},
13801380
{
@@ -1397,7 +1397,7 @@ int main(void) {
13971397
REDUCTION_INIT();
13981398
},
13991399
{
1400-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(static) REDUCTION_CLAUSES")
1400+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(static) REDUCTION_CLAUSES")
14011401
REDUCTION_LOOP()
14021402
},
14031403
{
@@ -1420,7 +1420,7 @@ int main(void) {
14201420
REDUCTION_INIT();
14211421
},
14221422
{
1423-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(static,sch) REDUCTION_CLAUSES")
1423+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(static,sch) REDUCTION_CLAUSES")
14241424
REDUCTION_LOOP()
14251425
},
14261426
{
@@ -1443,7 +1443,7 @@ int main(void) {
14431443
REDUCTION_INIT();
14441444
},
14451445
{
1446-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic) REDUCTION_CLAUSES")
1446+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic) REDUCTION_CLAUSES")
14471447
REDUCTION_LOOP()
14481448
},
14491449
{
@@ -1466,7 +1466,7 @@ int main(void) {
14661466
REDUCTION_INIT();
14671467
},
14681468
{
1469-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic,sch) REDUCTION_CLAUSES")
1469+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic,sch) REDUCTION_CLAUSES")
14701470
REDUCTION_LOOP()
14711471
},
14721472
{
@@ -1489,7 +1489,7 @@ int main(void) {
14891489
REDUCTION_INIT();
14901490
},
14911491
{
1492-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(guided) REDUCTION_CLAUSES")
1492+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(guided) REDUCTION_CLAUSES")
14931493
REDUCTION_LOOP()
14941494
},
14951495
{
@@ -1512,7 +1512,7 @@ int main(void) {
15121512
REDUCTION_INIT();
15131513
},
15141514
{
1515-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(guided,sch) REDUCTION_CLAUSES")
1515+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(guided,sch) REDUCTION_CLAUSES")
15161516
REDUCTION_LOOP()
15171517
},
15181518
{
@@ -1535,7 +1535,7 @@ int main(void) {
15351535
REDUCTION_INIT();
15361536
},
15371537
{
1538-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic) REDUCTION_CLAUSES")
1538+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(dynamic) REDUCTION_CLAUSES")
15391539
REDUCTION_LOOP()
15401540
},
15411541
{
@@ -1558,7 +1558,7 @@ int main(void) {
15581558
REDUCTION_INIT();
15591559
},
15601560
{
1561-
_Pragma("teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(runtime) REDUCTION_CLAUSES")
1561+
_Pragma("omp teams distribute parallel for simd num_teams(tms) thread_limit(ths) dist_schedule(static,sch) schedule(runtime) REDUCTION_CLAUSES")
15621562
REDUCTION_LOOP()
15631563
},
15641564
{

t-tdpf-nested-parallel/defines.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#undef NESTED_PARALLEL_FOR
33
#define NESTED_PARALLEL_FOR(PRE,X,POST,VERIFY) TESTD("omp target", { \
4-
_Pragma("teams distribute parallel for num_teams(tms) num_threads(th)") \
4+
_Pragma("omp teams distribute parallel for num_teams(tms) num_threads(th)") \
55
for (int idx = 0; idx < tms*th; idx++) { \
66
PRE \
77
_Pragma("omp parallel for if(threads[0] > 1) num_threads(threads[0]) NESTED_PARALLEL_FOR_CLAUSES") \

t-tdpf-nested-parallel/test.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ int main(void) {
164164
// Test: lastprivate clause on omp teams distribute parallel for with nested parallel.
165165
//
166166
TESTD("omp target", {
167-
_Pragma("teams distribute parallel for num_teams(tms) num_threads(th)")
167+
_Pragma("omp teams distribute parallel for num_teams(tms) num_threads(th)")
168168
for (int idx = 0; idx < tms*th; idx++) {
169169
double q0[1];
170170
double q1[1];
@@ -315,7 +315,7 @@ int main(void) {
315315
//
316316
if (!cpuExec) {
317317
TESTD("omp target", {
318-
_Pragma("teams distribute parallel for num_teams(tms) num_threads(th)")
318+
_Pragma("omp teams distribute parallel for num_teams(tms) num_threads(th)")
319319
for (int idx = 0; idx < tms*th; idx++) {
320320
S[idx] = 0;
321321
for (int i = 0; i < 96; i++) {

0 commit comments

Comments
 (0)