compiler: Adjust targets for CXX and SIMD or OpenMP

Author: EdCaunt

devito/passes/iet/languages/openmp.py

@@ -16,6 +16,7 @@
                                          PragmaIteration, PragmaTransfer)
 from devito.passes.iet.languages.utils import joins
 from devito.passes.iet.languages.C import CBB
+from devito.passes.iet.languages.CXX import CXXBB
 from devito.symbolics import CondEq, DefFunction
 from devito.tools import filter_ordered
 
@@ -111,7 +112,7 @@ def _generate(self):
         return self.pragma % (joins(*items), n)
 
 
-class OmpBB(LangBB):
+class AbstractOmpBB(LangBB):
 
     mapper = {
         # Misc
@@ -134,14 +135,21 @@ class OmpBB(LangBB):
         'atomic':
             Pragma('omp atomic update')
     }
-    mapper.update(CBB.mapper)
 
     Region = OmpRegion
     HostIteration = OmpIteration
     DeviceIteration = DeviceOmpIteration
     Prodder = ThreadedProdder
 
 
+class OmpBB(AbstractOmpBB):
+    mapper = {**AbstractOmpBB.mapper, **CBB.mapper}
+
+
+class CXXOmpBB(AbstractOmpBB):
+    mapper = {**AbstractOmpBB.mapper, **CXXBB.mapper}
+
+
 class DeviceOmpBB(OmpBB, PragmaLangBB):
 
     BackendCall = DeviceCall
@@ -213,9 +221,11 @@ class SimdOmpizer(PragmaSimdTransformer):
     langbb = OmpBB
 
 
-class Ompizer(PragmaShmTransformer):
+class CXXSimdOmpizer(PragmaSimdTransformer):
+    langbb = CXXOmpBB
 
-    langbb = OmpBB
+
+class AbstractOmpizer(PragmaShmTransformer):
 
     @classmethod
     def _support_array_reduction(cls, compiler):
@@ -231,6 +241,14 @@ def _support_array_reduction(cls, compiler):
             return True
 
 
+class Ompizer(AbstractOmpizer):
+    langbb = OmpBB
+
+
+class CXXOmpizer(AbstractOmpizer):
+    langbb = CXXOmpBB
+
+
 class DeviceOmpizer(PragmaDeviceAwareTransformer):
     langbb = DeviceOmpBB
 

devito/passes/iet/languages/targets.py

@@ -2,7 +2,8 @@
 from devito.passes.iet.languages.CXX import CXXPrinter
 from devito.passes.iet.languages.openmp import (SimdOmpizer, Ompizer, DeviceOmpizer,
                                                 OmpDataManager, DeviceOmpDataManager,
-                                                OmpOrchestrator, DeviceOmpOrchestrator)
+                                                OmpOrchestrator, DeviceOmpOrchestrator,
+                                                CXXSimdOmpizer, CXXOmpizer)
 from devito.passes.iet.languages.openacc import (DeviceAccizer, DeviceAccDataManager,
                                                  AccOrchestrator, AccPrinter)
 from devito.passes.iet.instrument import instrument
@@ -34,7 +35,7 @@ class CTarget(Target):
 
 
 class CXXTarget(Target):
-    Parizer = SimdOmpizer
+    Parizer = CXXSimdOmpizer
     DataManager = CDataManager
     Orchestrator = COrchestrator
     Printer = CXXPrinter
@@ -51,7 +52,7 @@ class COmpTarget(Target):
 
 
 class CXXOmpTarget(Target):
-    Parizer = Ompizer
+    Parizer = CXXOmpizer
     DataManager = OmpDataManager
     Orchestrator = OmpOrchestrator
     Printer = CXXPrinter