Check different exclusions

Author: sergisiso

examples/nemo/scripts/omp_cpu_trans.py

@@ -69,19 +69,19 @@
     'par_kind.F90',
 ]
 
-if not NEMOV4:
-    FILES_TO_SKIP.extend([
-        # TODO #3112: These produce diverging run.stat results in NEMOv5 BENCH
-        "dynhpg.f90",
-        "dynspg_ts.f90",
-        "icedyn_rhg_evp.f90",
-        "icethd_dh.f90",
-        "icevar.f90",
-        "iom_nf90.f90",
-        "sbcssm.f90",
-        "tramle.f90",
-        "trazdf.f90",
-    ])
+# if not NEMOV4:
+#     FILES_TO_SKIP.extend([
+#         # TODO #3112: These produce diverging run.stat results in NEMOv5 BENCH
+#         "dynhpg.f90",
+#         "dynspg_ts.f90",
+#         "icedyn_rhg_evp.f90",
+#         "icethd_dh.f90",
+#         "icevar.f90",
+#         "iom_nf90.f90",
+#         "sbcssm.f90",
+#         "tramle.f90",
+#         "trazdf.f90",
+#     ])
 
 if PROFILING_ENABLED:
     # Fails with profiling enabled. issue #2723

examples/nemo/scripts/omp_gpu_trans.py

@@ -81,6 +81,11 @@
 
 NEMOV5_EXCLUSIONS = []
 
+NEMOV4_EXCLUSIONS = [
+    "dynspg_ts.f90",
+    # "tranxt.f90",
+]
+
 SKIP_FOR_PERFORMANCE = [
     "iom.f90",
     "iom_nf90.f90",
@@ -167,6 +172,8 @@ def trans(psyir):
         # insert profiling hooks later on.
         if psyir.name in SKIP_FOR_PERFORMANCE:
             continue
+        if NEMOV4 and psyir.name in NEMOV4_EXCLUSIONS:
+            continue
         if not NEMOV4 and psyir.name in NEMOV5_EXCLUSIONS:
             continue
         # ICE routines do not perform well on GPU, so we skip them

examples/nemo/scripts/utils.py

@@ -423,7 +423,7 @@ def insert_explicit_loop_parallelism(
 
     '''
     nemo_v4 = os.environ.get('NEMOV4', False)
-    # These are both in "dynstg_ts.f90" and has a big performance impact
+    # These are both in "dynspg_ts.f90" and has a big performance impact
     if schedule.name in ("ts_wgt", "ts_rst"):
         return  # TODO #2937 WaW dependency incorrectly considered private
     # Add the parallel directives in each loop