[OPENMP 4.0] Allow to use 'omp simd' directive inside other simd-regions.

alexey-bataev · alexey-bataev · commit f3056a38b3f1 · 2016-02-02T04:59:52.000Z
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@259465 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Sema/SemaOpenMP.cpp b/lib/Sema/SemaOpenMP.cpp
@@ -1925,7 +1925,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack,
   // | simd             | for simd        |                                    |
   // | simd             | master          |                                    |
   // | simd             | critical        |                                    |
-  // | simd             | simd            |                                    |
+  // | simd             | simd            | *                                  |
   // | simd             | sections        |                                    |
   // | simd             | section         |                                    |
   // | simd             | single          |                                    |
@@ -1959,7 +1959,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack,
   // | for simd         | for simd        |                                    |
   // | for simd         | master          |                                    |
   // | for simd         | critical        |                                    |
-  // | for simd         | simd            |                                    |
+  // | for simd         | simd            | *                                  |
   // | for simd         | sections        |                                    |
   // | for simd         | section         |                                    |
   // | for simd         | single          |                                    |
@@ -1993,7 +1993,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack,
   // | parallel for simd| for simd        |                                    |
   // | parallel for simd| master          |                                    |
   // | parallel for simd| critical        |                                    |
-  // | parallel for simd| simd            |                                    |
+  // | parallel for simd| simd            | *                                  |
   // | parallel for simd| sections        |                                    |
   // | parallel for simd| section         |                                    |
   // | parallel for simd| single          |                                    |
@@ -2434,7 +2434,7 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack,
   // | taskloop simd    | for simd        |                                    |
   // | taskloop simd    | master          |                                    |
   // | taskloop simd    | critical        |                                    |
-  // | taskloop simd    | simd            |                                    |
+  // | taskloop simd    | simd            | *                                  |
   // | taskloop simd    | sections        |                                    |
   // | taskloop simd    | section         |                                    |
   // | taskloop simd    | single          |                                    |
@@ -2509,7 +2509,8 @@ static bool CheckNestingOfRegions(Sema &SemaRef, DSAStackTy *Stack,
       ShouldBeInTargetRegion,
       ShouldBeInTeamsRegion
     } Recommend = NoRecommend;
-    if (isOpenMPSimdDirective(ParentRegion) && CurrentRegion != OMPD_ordered) {
+    if (isOpenMPSimdDirective(ParentRegion) && CurrentRegion != OMPD_ordered &&
+        CurrentRegion != OMPD_simd) {
       // OpenMP [2.16, Nesting of Regions]
       // OpenMP constructs may not be nested inside a simd region.
       // OpenMP [2.8.1,simd Construct, Restrictions]
diff --git a/test/OpenMP/nesting_of_regions.cpp b/test/OpenMP/nesting_of_regions.cpp
@@ -137,7 +137,7 @@ void foo() {
   }
 #pragma omp simd
   for (int i = 0; i < 10; ++i) {
-#pragma omp simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
+#pragma omp simd
     for (int i = 0; i < 10; ++i)
       ;
   }
@@ -468,7 +468,7 @@ void foo() {
   }
 #pragma omp for simd
   for (int i = 0; i < 10; ++i) {
-#pragma omp simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
+#pragma omp simd
     for (int i = 0; i < 10; ++i)
       ;
   }
@@ -1730,7 +1730,7 @@ void foo() {
   }
 #pragma omp parallel for simd
   for (int i = 0; i < 10; ++i) {
-#pragma omp simd// expected-error {{OpenMP constructs may not be nested inside a simd region}}
+#pragma omp simd
     for (int i = 0; i < 10; ++i)
       ;
   }
@@ -3504,7 +3504,7 @@ void foo() {
   }
 #pragma omp simd
   for (int i = 0; i < 10; ++i) {
-#pragma omp simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
+#pragma omp simd
     for (int i = 0; i < 10; ++i)
       ;
   }
@@ -3818,7 +3818,7 @@ void foo() {
   }
 #pragma omp for simd
   for (int i = 0; i < 10; ++i) {
-#pragma omp simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}
+#pragma omp simd
     for (int i = 0; i < 10; ++i)
       ;
   }
@@ -5053,7 +5053,7 @@ void foo() {
   }
 #pragma omp parallel for simd
   for (int i = 0; i < 10; ++i) {
-#pragma omp simd// expected-error {{OpenMP constructs may not be nested inside a simd region}}
+#pragma omp simd
     for (int i = 0; i < 10; ++i)
       ;
   }

Original file line number	Diff line number	Diff line change
`@@ -137,7 +137,7 @@ void foo() {`
`137`	`137`	`}`
`138`	`138`	`#pragma omp simd`
`139`	`139`	`for (int i = 0; i < 10; ++i) {`
`140`		`-#pragma omp simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}`
	`140`	`+#pragma omp simd`
`141`	`141`	`for (int i = 0; i < 10; ++i)`
`142`	`142`	`;`
`143`	`143`	`}`
`@@ -468,7 +468,7 @@ void foo() {`
`468`	`468`	`}`
`469`	`469`	`#pragma omp for simd`
`470`	`470`	`for (int i = 0; i < 10; ++i) {`
`471`		`-#pragma omp simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}`
	`471`	`+#pragma omp simd`
`472`	`472`	`for (int i = 0; i < 10; ++i)`
`473`	`473`	`;`
`474`	`474`	`}`
`@@ -1730,7 +1730,7 @@ void foo() {`
`1730`	`1730`	`}`
`1731`	`1731`	`#pragma omp parallel for simd`
`1732`	`1732`	`for (int i = 0; i < 10; ++i) {`
`1733`		`-#pragma omp simd// expected-error {{OpenMP constructs may not be nested inside a simd region}}`
	`1733`	`+#pragma omp simd`
`1734`	`1734`	`for (int i = 0; i < 10; ++i)`
`1735`	`1735`	`;`
`1736`	`1736`	`}`
`@@ -3504,7 +3504,7 @@ void foo() {`
`3504`	`3504`	`}`
`3505`	`3505`	`#pragma omp simd`
`3506`	`3506`	`for (int i = 0; i < 10; ++i) {`
`3507`		`-#pragma omp simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}`
	`3507`	`+#pragma omp simd`
`3508`	`3508`	`for (int i = 0; i < 10; ++i)`
`3509`	`3509`	`;`
`3510`	`3510`	`}`
`@@ -3818,7 +3818,7 @@ void foo() {`
`3818`	`3818`	`}`
`3819`	`3819`	`#pragma omp for simd`
`3820`	`3820`	`for (int i = 0; i < 10; ++i) {`
`3821`		`-#pragma omp simd // expected-error {{OpenMP constructs may not be nested inside a simd region}}`
	`3821`	`+#pragma omp simd`
`3822`	`3822`	`for (int i = 0; i < 10; ++i)`
`3823`	`3823`	`;`
`3824`	`3824`	`}`
`@@ -5053,7 +5053,7 @@ void foo() {`
`5053`	`5053`	`}`
`5054`	`5054`	`#pragma omp parallel for simd`
`5055`	`5055`	`for (int i = 0; i < 10; ++i) {`
`5056`		`-#pragma omp simd// expected-error {{OpenMP constructs may not be nested inside a simd region}}`
	`5056`	`+#pragma omp simd`
`5057`	`5057`	`for (int i = 0; i < 10; ++i)`
`5058`	`5058`	`;`
`5059`	`5059`	`}`