From 5f2ee48965b859e0d14e14359671f3e4db24fb27 Mon Sep 17 00:00:00 2001
From: rafael <rafael.sarmiento@cscs.ch>
Date: Wed, 5 Sep 2018 16:44:45 +0200
Subject: [PATCH 1/5] move to new syntax and change tests names

---
 cscs-checks/microbenchmarks/osu/osu_tests.py  | 91 ++++++++-----------
 .../osu/src/{Makefile_g2g => Makefile_pt2pt}  |  6 +-
 2 files changed, 42 insertions(+), 55 deletions(-)
 rename cscs-checks/microbenchmarks/osu/src/{Makefile_g2g => Makefile_pt2pt} (77%)

diff --git a/cscs-checks/microbenchmarks/osu/osu_tests.py b/cscs-checks/microbenchmarks/osu/osu_tests.py
index 761b2e8ef0..c35eb33a5e 100644
--- a/cscs-checks/microbenchmarks/osu/osu_tests.py
+++ b/cscs-checks/microbenchmarks/osu/osu_tests.py
@@ -1,17 +1,15 @@
-import os
-import itertools
+import reframe as rfm
 import reframe.utility.sanity as sn
 
-from reframe.core.pipeline import RegressionTest
 
-
-class AlltoallBaseTest(RegressionTest):
-    def __init__(self, name, **kwargs):
-        super().__init__(name,
-                         os.path.dirname(__file__), **kwargs)
+class AlltoallBaseTest(rfm.RegressionTest):
+    def __init__(self):
+        super().__init__()
         self.strict_check = False
         self.valid_systems = ['daint:gpu', 'dom:gpu']
         self.descr = 'Alltoall osu microbenchmark'
+        self.build_system = 'Make'
+        self.build_system.makefile = 'Makefile_alltoall'
         self.executable = './osu_alltoall'
         # The -x option controls the number of warm-up iterations
         # The -i option controls the number of iterations
@@ -38,13 +36,11 @@ def __init__(self, name, **kwargs):
             }
         }
 
-    def compile(self):
-        super().compile(makefile='Makefile_alltoall')
-
 
+@rfm.simple_test
 class AlltoallProdTest(AlltoallBaseTest):
-    def __init__(self, **kwargs):
-        super().__init__('alltoall_osu_microbenchmark', **kwargs)
+    def __init__(self):
+        super().__init__()
         self.tags = {'production'}
         self.reference = {
             'dom:gpu': {
@@ -56,10 +52,10 @@ def __init__(self, **kwargs):
         }
 
 
+@rfm.parameterized_test(*({'num_tasks': i} for i in range(2, 10, 2)))
 class AlltoallMonchAcceptanceTest(AlltoallBaseTest):
-    def __init__(self, num_tasks, **kwargs):
-        super().__init__('alltoall_osu_microbenchmark_monch_%s'
-                         % num_tasks, **kwargs)
+    def __init__(self, num_tasks):
+        super().__init__()
         self.valid_systems = ['monch:compute']
         self.num_tasks = num_tasks
         reference_by_node = {
@@ -82,15 +78,16 @@ def __init__(self, num_tasks, **kwargs):
         self.tags = {'monch_acceptance'}
 
 
-class G2GBaseTest(RegressionTest):
-    def __init__(self, name, **kwargs):
-        super().__init__('g2g_osu_microbenchmark_p2p_%s' % name,
-                         os.path.dirname(__file__), **kwargs)
+class Pt2PtBaseTest(rfm.RegressionTest):
+    def __init__(self):
+        super().__init__()
         self.exclusive_access = True
         self.strict_check = False
         self.num_tasks = 2
         self.num_tasks_per_node = 1
-        self.descr = 'G2G microbenchmark P2P ' + name.upper()
+        self.descr = 'Point to point microbenchmark '
+        self.build_system = 'Make'
+        self.build_system.makefile = 'Makefile_pt2pt'
         self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
                                     'PrgEnv-intel']
         self.maintainers = ['RS', 'VK']
@@ -114,15 +111,13 @@ def setup(self, partition, environ, **job_opts):
 
         super().setup(partition, environ, **job_opts)
         if self.num_gpus_per_node >= 1:
-            self.current_environ.cflags = ' -D_ENABLE_CUDA_ -DCUDA_ENABLED '
-
-    def compile(self):
-        super().compile(makefile='Makefile_g2g')
+            self.build_system.cflags = ['-D_ENABLE_CUDA_', '-DCUDA_ENABLED']
 
 
-class G2GCPUBandwidthTest(G2GBaseTest):
-    def __init__(self, **kwargs):
-        super().__init__('cpu_bandwidth', **kwargs)
+@rfm.simple_test
+class Pt2PtCPUBandwidthTest(Pt2PtBaseTest):
+    def __init__(self):
+        super().__init__()
         self.valid_systems = ['daint:gpu', 'daint:mc',
                               'dom:gpu', 'dom:mc',
                               'monch:compute',
@@ -130,7 +125,7 @@ def __init__(self, **kwargs):
         if self.current_system.name == 'kesch':
             self.valid_prog_environs = ['PrgEnv-cray']
 
-        self.executable = './g2g_osu_bw'
+        self.executable = './pt2pt_osu_bw'
         self.executable_opts = ['-x', '100', '-i', '1000']
 
         self.reference = {
@@ -160,9 +155,10 @@ def __init__(self, **kwargs):
         self.tags |= {'monch_acceptance'}
 
 
-class G2GCPULatencyTest(G2GBaseTest):
-    def __init__(self, **kwargs):
-        super().__init__('cpu_latency', **kwargs)
+@rfm.simple_test
+class Pt2PtCPULatencyTest(Pt2PtBaseTest):
+    def __init__(self):
+        super().__init__()
         self.valid_systems = ['daint:gpu', 'daint:mc',
                               'dom:gpu', 'dom:mc',
                               'monch:compute',
@@ -171,7 +167,7 @@ def __init__(self, **kwargs):
             self.valid_prog_environs = ['PrgEnv-cray']
         self.executable_opts = ['-x', '100', '-i', '1000']
 
-        self.executable = './g2g_osu_latency'
+        self.executable = './pt2pt_osu_latency'
         self.reference = {
             'daint:gpu': {
                 'latency': (1.16, None, 1.0)
@@ -199,15 +195,16 @@ def __init__(self, **kwargs):
         self.tags |= {'monch_acceptance'}
 
 
-class G2GCUDABandwidthTest(G2GBaseTest):
-    def __init__(self, **kwargs):
-        super().__init__('gpu_bandwidth', **kwargs)
+@rfm.simple_test
+class Pt2PtCUDABandwidthTest(Pt2PtBaseTest):
+    def __init__(self):
+        super().__init__()
         self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn']
         if self.current_system.name == 'kesch':
             self.valid_prog_environs = ['PrgEnv-cray']
 
         self.num_gpus_per_node = 1
-        self.executable = './g2g_osu_bw'
+        self.executable = './pt2pt_osu_bw'
         self.executable_opts = ['-x', '100', '-i', '1000', '-d',
                                 'cuda', 'D', 'D']
 
@@ -228,15 +225,16 @@ def __init__(self, **kwargs):
         }
 
 
-class G2GCUDALatencyTest(G2GBaseTest):
-    def __init__(self, **kwargs):
-        super().__init__('gpu_latency', **kwargs)
+@rfm.simple_test
+class Pt2PtCUDALatencyTest(Pt2PtBaseTest):
+    def __init__(self):
+        super().__init__()
         self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn']
         if self.current_system.name == 'kesch':
             self.valid_prog_environs = ['PrgEnv-cray']
 
         self.num_gpus_per_node = 1
-        self.executable = './g2g_osu_latency'
+        self.executable = './pt2pt_osu_latency'
         self.executable_opts = ['-x', '100', '-i', '1000', '-d',
                                 'cuda', 'D', 'D']
 
@@ -255,14 +253,3 @@ def __init__(self, **kwargs):
             'latency': sn.extractsingle(r'^8\s+(?P<latency>\S+)',
                                         self.stdout, 'latency', float)
         }
-
-
-def _get_checks(**kwargs):
-    fixed_tests = [AlltoallProdTest(**kwargs),
-                   G2GCPUBandwidthTest(**kwargs),
-                   G2GCPULatencyTest(**kwargs),
-                   G2GCUDABandwidthTest(**kwargs),
-                   G2GCUDALatencyTest(**kwargs)]
-    return list(itertools.chain(fixed_tests,
-                                map(lambda n: AlltoallMonchAcceptanceTest(
-                                    n, **kwargs), range(2, 10, 2))))
diff --git a/cscs-checks/microbenchmarks/osu/src/Makefile_g2g b/cscs-checks/microbenchmarks/osu/src/Makefile_pt2pt
similarity index 77%
rename from cscs-checks/microbenchmarks/osu/src/Makefile_g2g
rename to cscs-checks/microbenchmarks/osu/src/Makefile_pt2pt
index 4a62a2bdc1..634b004ed6 100644
--- a/cscs-checks/microbenchmarks/osu/src/Makefile_g2g
+++ b/cscs-checks/microbenchmarks/osu/src/Makefile_pt2pt
@@ -1,4 +1,4 @@
-EXECUTABLES := g2g_osu_bw g2g_osu_latency
+EXECUTABLES := pt2pt_osu_bw pt2pt_osu_latency
 
 all: $(EXECUTABLES)
 
@@ -14,10 +14,10 @@ OBJS := $(SRCS:.c=.o)
 $(OBJS):
 	$(CC) $(CFLAGS) -o $(@) -c $(@:.o=.c)
 
-g2g_osu_bw: $(OBJS_BW)
+pt2pt_osu_bw: $(OBJS_BW)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BW) -o $(@)
 
-g2g_osu_latency: $(OBJS_LT)
+pt2pt_osu_latency: $(OBJS_LT)
 	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_LT) -o $(@)
 
 clean:

From f48c6c16414059576aded87a636d3c70b8da3367 Mon Sep 17 00:00:00 2001
From: rafael <rafael.sarmiento@cscs.ch>
Date: Mon, 10 Sep 2018 16:25:00 +0200
Subject: [PATCH 2/5] Fixes comments

---
 cscs-checks/microbenchmarks/osu/osu_tests.py  | 105 ++++++++----------
 .../microbenchmarks/osu/src/Makefile_p2p      |  25 +++++
 .../microbenchmarks/osu/src/Makefile_pt2pt    |  25 -----
 3 files changed, 73 insertions(+), 82 deletions(-)
 create mode 100644 cscs-checks/microbenchmarks/osu/src/Makefile_p2p
 delete mode 100644 cscs-checks/microbenchmarks/osu/src/Makefile_pt2pt

diff --git a/cscs-checks/microbenchmarks/osu/osu_tests.py b/cscs-checks/microbenchmarks/osu/osu_tests.py
index c35eb33a5e..10bbaaaf6e 100644
--- a/cscs-checks/microbenchmarks/osu/osu_tests.py
+++ b/cscs-checks/microbenchmarks/osu/osu_tests.py
@@ -2,8 +2,9 @@
 import reframe.utility.sanity as sn
 
 
-class AlltoallBaseTest(rfm.RegressionTest):
-    def __init__(self):
+@rfm.parameterized_test([['production']])
+class AlltoallTest(rfm.RegressionTest):
+    def __init__(self, tags):
         super().__init__()
         self.strict_check = False
         self.valid_systems = ['daint:gpu', 'dom:gpu']
@@ -22,6 +23,15 @@ def __init__(self):
             'perf': sn.extractsingle(r'^8\s+(?P<perf>\S+)',
                                      self.stdout, 'perf', float)
         }
+        self.tags = set(tags)
+        self.reference = {
+            'dom:gpu': {
+                'perf': (8.23, None, 0.1)
+            },
+            'daint:gpu': {
+                'perf': (20.73, None, 2.0)
+            },
+        }
         self.num_tasks_per_node = 1
         self.num_gpus_per_node  = 1
         if self.current_system.name == 'dom':
@@ -37,25 +47,10 @@ def __init__(self):
         }
 
 
-@rfm.simple_test
-class AlltoallProdTest(AlltoallBaseTest):
-    def __init__(self):
-        super().__init__()
-        self.tags = {'production'}
-        self.reference = {
-            'dom:gpu': {
-                'perf': (8.23, None, 0.1)
-            },
-            'daint:gpu': {
-                'perf': (20.73, None, 2.0)
-            },
-        }
-
-
 @rfm.parameterized_test(*({'num_tasks': i} for i in range(2, 10, 2)))
-class AlltoallMonchAcceptanceTest(AlltoallBaseTest):
+class AlltoallMonchAcceptanceTest(AlltoallTest):
     def __init__(self, num_tasks):
-        super().__init__()
+        super().__init__('monch_acceptance')
         self.valid_systems = ['monch:compute']
         self.num_tasks = num_tasks
         reference_by_node = {
@@ -75,21 +70,23 @@ def __init__(self, num_tasks):
         self.reference = {
             'monch:compute': reference_by_node[self.num_tasks]
         }
-        self.tags = {'monch_acceptance'}
 
 
-class Pt2PtBaseTest(rfm.RegressionTest):
+class P2PBaseTest(rfm.RegressionTest):
     def __init__(self):
         super().__init__()
         self.exclusive_access = True
         self.strict_check = False
         self.num_tasks = 2
         self.num_tasks_per_node = 1
-        self.descr = 'Point to point microbenchmark '
+        self.descr = 'P2P microbenchmark '
         self.build_system = 'Make'
-        self.build_system.makefile = 'Makefile_pt2pt'
-        self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
-                                    'PrgEnv-intel']
+        self.build_system.makefile = 'Makefile_p2p'
+        if self.current_system.name == 'kesch':
+            self.valid_prog_environs = ['PrgEnv-cray']
+        else:
+            self.valid_prog_environs = ['PrgEnv-cray', 'PrgEnv-gnu',
+                                        'PrgEnv-intel']
         self.maintainers = ['RS', 'VK']
         self.tags = {'production'}
         self.sanity_patterns = sn.assert_found(r'^4194304', self.stdout)
@@ -100,32 +97,16 @@ def __init__(self):
             }
         }
 
-    def setup(self, partition, environ, **job_opts):
-        if partition.name == 'gpu':
-            self.num_gpus_per_node  = 1
-            self.modules = ['cudatoolkit']
-            self.variables = {'MPICH_RDMA_ENABLED_CUDA': '1'}
-
-        if partition.name == 'cn':
-            self.variables = {'MV2_USE_CUDA': '1'}
-
-        super().setup(partition, environ, **job_opts)
-        if self.num_gpus_per_node >= 1:
-            self.build_system.cflags = ['-D_ENABLE_CUDA_', '-DCUDA_ENABLED']
-
 
 @rfm.simple_test
-class Pt2PtCPUBandwidthTest(Pt2PtBaseTest):
+class P2PCPUBandwidthTest(P2PBaseTest):
     def __init__(self):
         super().__init__()
         self.valid_systems = ['daint:gpu', 'daint:mc',
                               'dom:gpu', 'dom:mc',
                               'monch:compute',
                               'kesch:cn']
-        if self.current_system.name == 'kesch':
-            self.valid_prog_environs = ['PrgEnv-cray']
-
-        self.executable = './pt2pt_osu_bw'
+        self.executable = './p2p_osu_bw'
         self.executable_opts = ['-x', '100', '-i', '1000']
 
         self.reference = {
@@ -156,18 +137,16 @@ def __init__(self):
 
 
 @rfm.simple_test
-class Pt2PtCPULatencyTest(Pt2PtBaseTest):
+class P2PCPULatencyTest(P2PBaseTest):
     def __init__(self):
         super().__init__()
         self.valid_systems = ['daint:gpu', 'daint:mc',
                               'dom:gpu', 'dom:mc',
                               'monch:compute',
                               'kesch:cn']
-        if self.current_system.name == 'kesch':
-            self.valid_prog_environs = ['PrgEnv-cray']
         self.executable_opts = ['-x', '100', '-i', '1000']
 
-        self.executable = './pt2pt_osu_latency'
+        self.executable = './p2p_osu_latency'
         self.reference = {
             'daint:gpu': {
                 'latency': (1.16, None, 1.0)
@@ -196,15 +175,12 @@ def __init__(self):
 
 
 @rfm.simple_test
-class Pt2PtCUDABandwidthTest(Pt2PtBaseTest):
+class G2GBandwidthTest(P2PBaseTest):
     def __init__(self):
         super().__init__()
         self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn']
-        if self.current_system.name == 'kesch':
-            self.valid_prog_environs = ['PrgEnv-cray']
-
         self.num_gpus_per_node = 1
-        self.executable = './pt2pt_osu_bw'
+        self.executable = './p2p_osu_bw'
         self.executable_opts = ['-x', '100', '-i', '1000', '-d',
                                 'cuda', 'D', 'D']
 
@@ -223,18 +199,24 @@ def __init__(self):
             'bw': sn.extractsingle(r'^4194304\s+(?P<bw>\S+)',
                                    self.stdout, 'bw', float)
         }
+        if self.current_system.name in ['daint', 'dom']:
+            self.num_gpus_per_node  = 1
+            self.modules = ['craype-accel-nvidia60']
+            self.variables = {'MPICH_RDMA_ENABLED_CUDA': '1'}
+
+        if self.current_system.name == 'kesch':
+            self.variables = {'MV2_USE_CUDA': '1'}
+
+        self.build_system.cppflags = ['-D_ENABLE_CUDA_']
 
 
 @rfm.simple_test
-class Pt2PtCUDALatencyTest(Pt2PtBaseTest):
+class GPGLatencyTest(P2PBaseTest):
     def __init__(self):
         super().__init__()
         self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn']
-        if self.current_system.name == 'kesch':
-            self.valid_prog_environs = ['PrgEnv-cray']
-
         self.num_gpus_per_node = 1
-        self.executable = './pt2pt_osu_latency'
+        self.executable = './p2p_osu_latency'
         self.executable_opts = ['-x', '100', '-i', '1000', '-d',
                                 'cuda', 'D', 'D']
 
@@ -253,3 +235,12 @@ def __init__(self):
             'latency': sn.extractsingle(r'^8\s+(?P<latency>\S+)',
                                         self.stdout, 'latency', float)
         }
+        if self.current_system.name in ['daint', 'dom']:
+            self.num_gpus_per_node  = 1
+            self.modules = ['craype-accel-nvidia60']
+            self.variables = {'MPICH_RDMA_ENABLED_CUDA': '1'}
+
+        if self.current_system.name == 'kesch':
+            self.variables = {'MV2_USE_CUDA': '1'}
+
+        self.build_system.cppflags = ['-D_ENABLE_CUDA_']
diff --git a/cscs-checks/microbenchmarks/osu/src/Makefile_p2p b/cscs-checks/microbenchmarks/osu/src/Makefile_p2p
new file mode 100644
index 0000000000..1e0a399b15
--- /dev/null
+++ b/cscs-checks/microbenchmarks/osu/src/Makefile_p2p
@@ -0,0 +1,25 @@
+EXECUTABLES := p2p_osu_bw p2p_osu_latency
+
+all: $(EXECUTABLES)
+
+SRCS += osu_util.c \
+        osu_latency.c \
+        osu_bw.c
+
+OBJS_BW = osu_util.o osu_bw.o
+OBJS_LT = osu_util.o osu_latency.o
+
+OBJS := $(SRCS:.c=.o)
+
+$(OBJS):
+	$(CC) $(CPPFLAGS) -o $(@) -c $(@:.o=.c)
+
+p2p_osu_bw: $(OBJS_BW)
+	$(CC) $(CPPFLAGS) $(LDFLAGS) $(OBJS_BW) -o $(@)
+
+p2p_osu_latency: $(OBJS_LT)
+	$(CC) $(CPPFLAGS) $(LDFLAGS) $(OBJS_LT) -o $(@)
+
+clean:
+	rm -f $(OBJS) $(EXECUTABLES)
+
diff --git a/cscs-checks/microbenchmarks/osu/src/Makefile_pt2pt b/cscs-checks/microbenchmarks/osu/src/Makefile_pt2pt
deleted file mode 100644
index 634b004ed6..0000000000
--- a/cscs-checks/microbenchmarks/osu/src/Makefile_pt2pt
+++ /dev/null
@@ -1,25 +0,0 @@
-EXECUTABLES := pt2pt_osu_bw pt2pt_osu_latency
-
-all: $(EXECUTABLES)
-
-SRCS += osu_util.c \
-        osu_latency.c \
-        osu_bw.c
-
-OBJS_BW = osu_util.o osu_bw.o
-OBJS_LT = osu_util.o osu_latency.o
-
-OBJS := $(SRCS:.c=.o)
-
-$(OBJS):
-	$(CC) $(CFLAGS) -o $(@) -c $(@:.o=.c)
-
-pt2pt_osu_bw: $(OBJS_BW)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_BW) -o $(@)
-
-pt2pt_osu_latency: $(OBJS_LT)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS_LT) -o $(@)
-
-clean:
-	rm -f $(OBJS) $(EXECUTABLES)
-

From 152df98ea511f00bfd2e25f7f7b4e9b4e5642d9a Mon Sep 17 00:00:00 2001
From: rafael <rafael.sarmiento@cscs.ch>
Date: Wed, 12 Sep 2018 11:09:46 +0200
Subject: [PATCH 3/5] Fixes comments

---
 cscs-checks/microbenchmarks/osu/osu_tests.py | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/cscs-checks/microbenchmarks/osu/osu_tests.py b/cscs-checks/microbenchmarks/osu/osu_tests.py
index 10bbaaaf6e..eae82e65bc 100644
--- a/cscs-checks/microbenchmarks/osu/osu_tests.py
+++ b/cscs-checks/microbenchmarks/osu/osu_tests.py
@@ -2,9 +2,9 @@
 import reframe.utility.sanity as sn
 
 
-@rfm.parameterized_test([['production']])
+@rfm.parameterized_test(['production'])
 class AlltoallTest(rfm.RegressionTest):
-    def __init__(self, tags):
+    def __init__(self, tag):
         super().__init__()
         self.strict_check = False
         self.valid_systems = ['daint:gpu', 'dom:gpu']
@@ -23,7 +23,7 @@ def __init__(self, tags):
             'perf': sn.extractsingle(r'^8\s+(?P<perf>\S+)',
                                      self.stdout, 'perf', float)
         }
-        self.tags = set(tags)
+        self.tags = {tag}
         self.reference = {
             'dom:gpu': {
                 'perf': (8.23, None, 0.1)

From 985f9bd34ff7524178bc5af3538de78e5871f43a Mon Sep 17 00:00:00 2001
From: rafael <rafael.sarmiento@cscs.ch>
Date: Wed, 12 Sep 2018 11:14:16 +0200
Subject: [PATCH 4/5] Fixes comments

---
 cscs-checks/microbenchmarks/osu/osu_tests.py     | 2 +-
 cscs-checks/microbenchmarks/osu/src/Makefile_p2p | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/cscs-checks/microbenchmarks/osu/osu_tests.py b/cscs-checks/microbenchmarks/osu/osu_tests.py
index eae82e65bc..26f829f741 100644
--- a/cscs-checks/microbenchmarks/osu/osu_tests.py
+++ b/cscs-checks/microbenchmarks/osu/osu_tests.py
@@ -211,7 +211,7 @@ def __init__(self):
 
 
 @rfm.simple_test
-class GPGLatencyTest(P2PBaseTest):
+class G2GLatencyTest(P2PBaseTest):
     def __init__(self):
         super().__init__()
         self.valid_systems = ['daint:gpu', 'dom:gpu', 'kesch:cn']
diff --git a/cscs-checks/microbenchmarks/osu/src/Makefile_p2p b/cscs-checks/microbenchmarks/osu/src/Makefile_p2p
index 1e0a399b15..fda3e92d21 100644
--- a/cscs-checks/microbenchmarks/osu/src/Makefile_p2p
+++ b/cscs-checks/microbenchmarks/osu/src/Makefile_p2p
@@ -12,13 +12,13 @@ OBJS_LT = osu_util.o osu_latency.o
 OBJS := $(SRCS:.c=.o)
 
 $(OBJS):
-	$(CC) $(CPPFLAGS) -o $(@) -c $(@:.o=.c)
+	$(CC) $(CXXFLAGS) $(CPPFLAGS) -o $(@) -c $(@:.o=.c)
 
 p2p_osu_bw: $(OBJS_BW)
-	$(CC) $(CPPFLAGS) $(LDFLAGS) $(OBJS_BW) -o $(@)
+	$(CC) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS_BW) -o $(@)
 
 p2p_osu_latency: $(OBJS_LT)
-	$(CC) $(CPPFLAGS) $(LDFLAGS) $(OBJS_LT) -o $(@)
+	$(CC) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS_LT) -o $(@)
 
 clean:
 	rm -f $(OBJS) $(EXECUTABLES)

From 53ee14f2805dc8a3933b8e1052e6fb279c93594f Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <karakasis@cscs.ch>
Date: Wed, 12 Sep 2018 13:33:21 +0200
Subject: [PATCH 5/5] Normalise Makefiles + minor fix in OSU test

---
 cscs-checks/microbenchmarks/osu/osu_tests.py          |  4 ++--
 cscs-checks/microbenchmarks/osu/src/Makefile_alltoall |  7 +++----
 cscs-checks/microbenchmarks/osu/src/Makefile_p2p      | 11 +++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/cscs-checks/microbenchmarks/osu/osu_tests.py b/cscs-checks/microbenchmarks/osu/osu_tests.py
index 26f829f741..a9d8449100 100644
--- a/cscs-checks/microbenchmarks/osu/osu_tests.py
+++ b/cscs-checks/microbenchmarks/osu/osu_tests.py
@@ -4,7 +4,7 @@
 
 @rfm.parameterized_test(['production'])
 class AlltoallTest(rfm.RegressionTest):
-    def __init__(self, tag):
+    def __init__(self, variant):
         super().__init__()
         self.strict_check = False
         self.valid_systems = ['daint:gpu', 'dom:gpu']
@@ -23,7 +23,7 @@ def __init__(self, tag):
             'perf': sn.extractsingle(r'^8\s+(?P<perf>\S+)',
                                      self.stdout, 'perf', float)
         }
-        self.tags = {tag}
+        self.tags = {variant}
         self.reference = {
             'dom:gpu': {
                 'perf': (8.23, None, 0.1)
diff --git a/cscs-checks/microbenchmarks/osu/src/Makefile_alltoall b/cscs-checks/microbenchmarks/osu/src/Makefile_alltoall
index 04ded7a657..5c514508cb 100644
--- a/cscs-checks/microbenchmarks/osu/src/Makefile_alltoall
+++ b/cscs-checks/microbenchmarks/osu/src/Makefile_alltoall
@@ -3,16 +3,15 @@ EXECUTABLE := osu_alltoall
 all: $(EXECUTABLE)
 
 SRCS += osu_util.c \
-        osu_alltoall.c
+		osu_alltoall.c
 
 OBJS := $(SRCS:.c=.o)
 
 $(OBJS):
-	$(CC) $(CFLAGS) -o $(@) -c $(@:.o=.c)
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $(@) -c $(@:.o=.c)
 
 $(EXECUTABLE): $(OBJS)
-	$(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) -o $(@)
+	$(CC) $(CPPFLAGS) $(CFLAGS) -o $(@) $(OBJS) $(LDFLAGS)
 
 clean:
 	rm -f $(OBJS) $(EXECUTABLE)
-
diff --git a/cscs-checks/microbenchmarks/osu/src/Makefile_p2p b/cscs-checks/microbenchmarks/osu/src/Makefile_p2p
index fda3e92d21..4700f3638c 100644
--- a/cscs-checks/microbenchmarks/osu/src/Makefile_p2p
+++ b/cscs-checks/microbenchmarks/osu/src/Makefile_p2p
@@ -3,8 +3,8 @@ EXECUTABLES := p2p_osu_bw p2p_osu_latency
 all: $(EXECUTABLES)
 
 SRCS += osu_util.c \
-        osu_latency.c \
-        osu_bw.c
+		osu_latency.c \
+		osu_bw.c
 
 OBJS_BW = osu_util.o osu_bw.o
 OBJS_LT = osu_util.o osu_latency.o
@@ -12,14 +12,13 @@ OBJS_LT = osu_util.o osu_latency.o
 OBJS := $(SRCS:.c=.o)
 
 $(OBJS):
-	$(CC) $(CXXFLAGS) $(CPPFLAGS) -o $(@) -c $(@:.o=.c)
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -o $(@) -c $(@:.o=.c)
 
 p2p_osu_bw: $(OBJS_BW)
-	$(CC) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS_BW) -o $(@)
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -o $(@) $(OBJS_BW) $(LDFLAGS)
 
 p2p_osu_latency: $(OBJS_LT)
-	$(CC) $(CXXFLAGS) $(CPPFLAGS) $(LDFLAGS) $(OBJS_LT) -o $(@)
+	$(CC) $(CPPFLAGS) $(CXXFLAGS) -o $(@) $(OBJS_LT) $(LDFLAGS)
 
 clean:
 	rm -f $(OBJS) $(EXECUTABLES)
-