From 83bae30d098d10948317cc92d6890d73a099a51b Mon Sep 17 00:00:00 2001
From: Theofilos Manitaras <manitaras@cscs.ch>
Date: Fri, 7 Jun 2019 10:33:12 +0200
Subject: [PATCH 1/2] Fix timing in the allocation speed test

---
 .../microbenchmarks/alloc_speed/alloc_speed.py     |  4 ++--
 .../alloc_speed/src/alloc_speed.cpp                | 14 +++++++++-----
 2 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/cscs-checks/microbenchmarks/alloc_speed/alloc_speed.py b/cscs-checks/microbenchmarks/alloc_speed/alloc_speed.py
index eec6156950..e060b666c7 100644
--- a/cscs-checks/microbenchmarks/alloc_speed/alloc_speed.py
+++ b/cscs-checks/microbenchmarks/alloc_speed/alloc_speed.py
@@ -27,10 +27,10 @@ def __init__(self, hugepages):
         self.sys_reference = {
             'no': {
                 'dom:gpu': {
-                    'time': (1.80, None, 0.10, 's')
+                    'time': (1.00, None, 0.10, 's')
                 },
                 'dom:mc': {
-                    'time': (2.00, None, 0.10, 's')
+                    'time': (1.20, None, 0.10, 's')
                 },
                 'daint:gpu': {
                     'time': (1.80, None, 0.10, 's')
diff --git a/cscs-checks/microbenchmarks/alloc_speed/src/alloc_speed.cpp b/cscs-checks/microbenchmarks/alloc_speed/src/alloc_speed.cpp
index 3627013633..3d04ed5b21 100644
--- a/cscs-checks/microbenchmarks/alloc_speed/src/alloc_speed.cpp
+++ b/cscs-checks/microbenchmarks/alloc_speed/src/alloc_speed.cpp
@@ -1,21 +1,25 @@
 #include <chrono>
 #include <iostream>
 #include <algorithm>
-#include <memory>
 
 double test_alloc(size_t n)
 {
     auto t_start = std::chrono::system_clock::now();
-    std::unique_ptr<char[]> ptr(new char[n]);
 
     /* time to allocate + fill */
-    std::fill(ptr.get(), ptr.get() + n, 0);
+    char* ptr = (char*)std::malloc(n);
+    std::fill(ptr, ptr + n, 0);
     auto t_alloc_fill = std::chrono::system_clock::now();
 
-    /* time too fill */
-    std::fill(ptr.get(), ptr.get() + n, 0);
+    /* time to fill */
+    std::fill(ptr, ptr + n, 0);
     auto t_alloc_two_fills = std::chrono::system_clock::now();
 
+    /* prevent compiler optimizations */
+    t_start += std::chrono::nanoseconds(ptr[0]);
+
+    std::free(ptr);
+
     return std::chrono::duration_cast<std::chrono::duration<double>>((t_alloc_fill - t_start) - (t_alloc_two_fills - t_alloc_fill)).count();
 }
 

From 0f0d333d369c61d8e94fc089f0cb7422c20ecd5b Mon Sep 17 00:00:00 2001
From: Theofilos Manitaras <manitaras@cscs.ch>
Date: Tue, 11 Jun 2019 09:09:16 +0200
Subject: [PATCH 2/2] Address PR comments

---
 cscs-checks/microbenchmarks/alloc_speed/src/alloc_speed.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/cscs-checks/microbenchmarks/alloc_speed/src/alloc_speed.cpp b/cscs-checks/microbenchmarks/alloc_speed/src/alloc_speed.cpp
index 3d04ed5b21..ac44d28bb1 100644
--- a/cscs-checks/microbenchmarks/alloc_speed/src/alloc_speed.cpp
+++ b/cscs-checks/microbenchmarks/alloc_speed/src/alloc_speed.cpp
@@ -7,6 +7,9 @@ double test_alloc(size_t n)
     auto t_start = std::chrono::system_clock::now();
 
     /* time to allocate + fill */
+    /* memory is allocated using "malloc" since
+       "std::unique_ptr<char[]> ptr(new char[n])"
+       also creates the objects via "new[]" */
     char* ptr = (char*)std::malloc(n);
     std::fill(ptr, ptr + n, 0);
     auto t_alloc_fill = std::chrono::system_clock::now();