From 89b2ecdb750ef512aa76c1ffe200276bf8916621 Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan.eitzinger@fau.de>
Date: Wed, 9 Dec 2020 08:37:07 +0100
Subject: [PATCH] Fix LIKWID profile macro wrapper

---
 src/daxpy.c |  6 +-----
 src/main.c  | 21 ++++++++++++---------
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/src/daxpy.c b/src/daxpy.c
index 589d7ac..b42e279 100644
--- a/src/daxpy.c
+++ b/src/daxpy.c
@@ -26,7 +26,6 @@
  */
 
 #include <timing.h>
-#include <likwid-marker.h>
 
 double daxpy(
         double * restrict a,
@@ -38,13 +37,10 @@ double daxpy(
     double S, E;
 
     S = getTimeStamp();
-#pragma omp parallel
-    {
-#pragma omp for schedule(static)
+#pragma omp parallel for schedule(static)
         for (int i=0; i<N; i++) {
             a[i] = a[i] + scalar * b[i];
         }
-    }
     E = getTimeStamp();
 
     return E-S;
diff --git a/src/main.c b/src/main.c
index 1b80138..36056f3 100644
--- a/src/main.c
+++ b/src/main.c
@@ -55,20 +55,20 @@
 #define LIKWID_PROFILE(tag,call) \
     _Pragma ("omp parallel") \
     {LIKWID_MARKER_START(#tag);} \
-    times[tag##T][k]  = call; \
+    times[tag][k]  = call; \
     _Pragma ("omp parallel") \
     {LIKWID_MARKER_STOP(#tag);}
 
 
 typedef enum benchmark {
-    INITT = 0,
-    SUMT,
-    COPYT,
-    UPDATET,
-    TRIADT,
-    DAXPYT,
-    STRIADT,
-    SDAXPYT,
+    INIT = 0,
+    SUM,
+    COPY,
+    UPDATE,
+    TRIAD,
+    DAXPY,
+    STRIAD,
+    SDAXPY,
     NUMBENCH
 } benchmark;
 
@@ -177,10 +177,13 @@ _Pragma("omp parallel")
     scalar = 3.0;
 
     for ( int k=0; k < NTIMES; k++) {
+
         LIKWID_PROFILE(INIT,init(b, scalar, N));
         tmp = a[10];
+
         LIKWID_PROFILE(SUM,sum(a, N));
         a[10] = tmp;
+
         LIKWID_PROFILE(COPY,copy(c, a, N));
         LIKWID_PROFILE(UPDATE,update(a, scalar, N));
         LIKWID_PROFILE(TRIAD,triad(a, b, c, scalar, N));