From 7bf6790a47b63c49968867d9ecd65c8a8d4b71d0 Mon Sep 17 00:00:00 2001
From: Jan Eitzinger <jan.eitzinger@fau.de>
Date: Wed, 9 Dec 2020 08:44:50 +0100
Subject: [PATCH] Change clang openmp flags. Formatting.

---
 include_CLANG.mk |  4 ++--
 src/daxpy.c      |  6 +++---
 src/main.c       | 16 +++++++---------
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/include_CLANG.mk b/include_CLANG.mk
index 30945f6..60eaef0 100644
--- a/include_CLANG.mk
+++ b/include_CLANG.mk
@@ -3,11 +3,11 @@ GCC  = gcc
 LINKER = $(CC)
 
 ifeq ($(ENABLE_OPENMP),true)
-OPENMP   = -fopenmp
+OPENMP   = -Xpreprocessor -fopenmp
+LIBS     = -lomp
 endif
 
 CFLAGS   = -Ofast -ffreestanding -std=c99 $(OPENMP)
 LFLAGS   = $(OPENMP)
 DEFINES  = -D_GNU_SOURCE
 INCLUDES =
-LIBS     =
diff --git a/src/daxpy.c b/src/daxpy.c
index b42e279..2e2ebe5 100644
--- a/src/daxpy.c
+++ b/src/daxpy.c
@@ -38,9 +38,9 @@ double daxpy(
 
     S = getTimeStamp();
 #pragma omp parallel for schedule(static)
-        for (int i=0; i<N; i++) {
-            a[i] = a[i] + scalar * b[i];
-        }
+    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 36056f3..4ebe0b1 100644
--- a/src/main.c
+++ b/src/main.c
@@ -2,7 +2,7 @@
  * =======================================================================================
  *
  *      Author:   Jan Eitzinger (je), jan.eitzinger@fau.de
- *      Copyright (c) 2019 RRZE, University Erlangen-Nuremberg
+ *      Copyright (c) 2020 RRZE, University Erlangen-Nuremberg
  *
  *      Permission is hereby granted, free of charge, to any person obtaining a copy
  *      of this software and associated documentation files (the "Software"), to deal
@@ -54,10 +54,10 @@
 
 #define LIKWID_PROFILE(tag,call) \
     _Pragma ("omp parallel") \
-    {LIKWID_MARKER_START(#tag);} \
-    times[tag][k]  = call; \
-    _Pragma ("omp parallel") \
-    {LIKWID_MARKER_STOP(#tag);}
+{LIKWID_MARKER_START(#tag);} \
+times[tag][k]  = call; \
+_Pragma ("omp parallel") \
+{LIKWID_MARKER_STOP(#tag);}
 
 
 typedef enum benchmark {
@@ -115,7 +115,7 @@ int main (int argc, char** argv)
     };
 
     LIKWID_MARKER_INIT;
-_Pragma("omp parallel")
+    _Pragma("omp parallel")
     {
         LIKWID_MARKER_REGISTER("INIT");
         LIKWID_MARKER_REGISTER("SUM");
@@ -146,7 +146,7 @@ _Pragma("omp parallel")
 
 #ifdef _OPENMP
     printf(HLINE);
-_Pragma("omp parallel")
+    _Pragma("omp parallel")
     {
         int k = omp_get_num_threads();
         int i = omp_get_thread_num();
@@ -180,10 +180,8 @@ _Pragma("omp parallel")
 
         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));