nits: clang-format passing with llvm 17

faasm · Mar 4, 2024 · 8d5c4a9 · 8d5c4a9
1 parent 89c98da
commit 8d5c4a9
Show file tree

Hide file tree

Showing 13 changed files with 34 additions and 32 deletions.
diff --git a/.clang-format b/.clang-format
@@ -15,6 +15,11 @@ DerivePointerAlignment: false
 BreakBeforeBraces: Custom
 BraceWrapping:
     AfterClass: true
+    AfterEnum: true
+    AfterExternBlock: true
+    AfterFunction: true
+    AfterStruct: true
+    AfterUnion: true
     SplitEmptyFunction: false
     SplitEmptyRecord: false
 ---
diff --git a/func/omp/complex_reduce.cpp b/func/omp/complex_reduce.cpp
@@ -40,10 +40,9 @@ int main(int argc, char* argv[])
     FAASM_REDUCE(reducedA, FAASM_TYPE_INT, FAASM_OP_SUM)
     FAASM_REDUCE(reducedB, FAASM_TYPE_DOUBLE, FAASM_OP_SUM)
 
-#pragma omp parallel for num_threads(nThreads) default(none) \
-    private(privateA,privateB) \
-    shared(loopSize,sharedA,sharedB,counts) \
-    reduction(+ : reducedA,reducedB)
+#pragma omp parallel for num_threads(nThreads) default(none) private(          \
+    privateA, privateB) shared(loopSize, sharedA, sharedB, counts)             \
+  reduction(+ : reducedA, reducedB)
     for (int i = 0; i < loopSize; i++) {
         int threadNum = omp_get_thread_num();
 

diff --git a/func/omp/custom_reduce.cpp b/func/omp/custom_reduce.cpp
@@ -18,8 +18,8 @@ complex_t complex_add(complex_t a, complex_t b)
     return c;
 }
 
-#pragma omp declare reduction(cmplxAdd:complex_t                               \
-                              : omp_out = complex_add(omp_out, omp_in))        \
+#pragma omp declare reduction(cmplxAdd:complex_t : omp_out =                   \
+                                complex_add(omp_out, omp_in))                  \
   initializer(omp_priv = { 0, 0 })
 
 int main()

diff --git a/func/omp/default_shared.cpp b/func/omp/default_shared.cpp
@@ -15,10 +15,8 @@ int main(int argc, char* argv[])
 
     FAASM_REDUCE(count, FAASM_TYPE_INT, FAASM_OP_SUM)
 
-#pragma omp parallel for num_threads(5) \
-    default(none) \
-    shared(nLoops, flagsStack, flagsHeap) \
-    reduction(+ : count)
+#pragma omp parallel for num_threads(5) default(none)                          \
+  shared(nLoops, flagsStack, flagsHeap) reduction(+ : count)
     for (int i = 0; i < nLoops; i++) {
         int threadNum = omp_get_thread_num();
         count += (threadNum + 1);

diff --git a/func/omp/inspect_reduction.cpp b/func/omp/inspect_reduction.cpp
@@ -11,9 +11,8 @@ int inspectAdder(int a, int b)
     return a + b;
 }
 
-#pragma omp declare reduction(inspectAdd:int                                   \
-                              : omp_out = inspectAdder(omp_out, omp_in))       \
-  initializer(omp_priv = 0)
+#pragma omp declare reduction(inspectAdd                                       \
+:int : omp_out = inspectAdder(omp_out, omp_in)) initializer(omp_priv = 0)
 
 int main()
 {

diff --git a/func/omp/mem_stress.cpp b/func/omp/mem_stress.cpp
@@ -28,7 +28,7 @@ int main(int argc, char** argv)
     FAASM_REDUCE(totalLoops, FAASM_TYPE_INT, FAASM_OP_SUM)
 
 #pragma omp parallel for num_threads(nThreads) default(none)                   \
-  shared(ptrs, counts) reduction(+:totalLoops)
+  shared(ptrs, counts) reduction(+ : totalLoops)
     for (int i = 0; i < ITERATIONS; i++) {
         totalLoops++;
 
@@ -49,7 +49,7 @@ int main(int argc, char** argv)
     FAASM_REDUCE(totalLoops, FAASM_TYPE_INT, FAASM_OP_SUM)
 
 #pragma omp parallel for num_threads(nThreads) default(none)                   \
-  shared(ptrs, counts) reduction(+:totalLoops)
+  shared(ptrs, counts) reduction(+ : totalLoops)
     for (int i = 0; i < ITERATIONS; i++) {
         totalLoops++;
         ::free(ptrs[i]);
@@ -61,7 +61,7 @@ int main(int argc, char** argv)
     FAASM_REDUCE(totalLoops, FAASM_TYPE_INT, FAASM_OP_SUM)
 
 #pragma omp parallel for num_threads(nThreads) default(none)                   \
-  shared(ptrs, counts) reduction(+:totalLoops)
+  shared(ptrs, counts) reduction(+ : totalLoops)
     for (int i = 0; i < ITERATIONS; i++) {
         totalLoops++;
         size_t mallocSize = (i % 6) * 1024;

diff --git a/func/omp/pi_faasm.cpp b/func/omp/pi_faasm.cpp
@@ -23,9 +23,8 @@ int main(int argc, char** argv)
     int nTotal = nWorkers * CHUNK_SIZE;
 
     FAASM_REDUCE(result, FAASM_TYPE_LONG, FAASM_OP_SUM)
-#pragma omp parallel num_threads(nWorkers) default(none) \
-        shared(nTotal) \
-        reduction(+ : result)
+#pragma omp parallel num_threads(nWorkers) default(none) shared(nTotal)        \
+  reduction(+ : result)
     {
         // Different seed per thread
         std::uniform_real_distribution<double> unif(0, 1);

diff --git a/func/omp/pi_native.cpp b/func/omp/pi_native.cpp
@@ -25,9 +25,8 @@ int main(int argc, char** argv)
 
     printf("Estimating Pi with %i workers\n", nWorkers);
 
-#pragma omp parallel num_threads(nWorkers) default(none) \
-    shared(nTotal) \
-    reduction(+ : result)
+#pragma omp parallel num_threads(nWorkers) default(none) shared(nTotal)        \
+  reduction(+ : result)
     {
         // Different seed per thread
         std::uniform_real_distribution<double> unif(0, 1);

diff --git a/func/omp/reduction_integral.cpp b/func/omp/reduction_integral.cpp
@@ -124,7 +124,8 @@ double doBetterReduction()
 
     FAASM_REDUCE(sum, FAASM_TYPE_DOUBLE, FAASM_OP_SUM)
 
-#pragma omp parallel for private(x) default(none) shared(nSteps, step) reduction(+:sum)
+#pragma omp parallel for private(x) default(none) shared(nSteps, step)         \
+  reduction(+ : sum)
     for (i = 0; i < nSteps; ++i) {
         x = (i + 0.5) * step;
         sum += 4.0 / (1.0 + x * x);

diff --git a/func/omp/repeated_reduce.cpp b/func/omp/repeated_reduce.cpp
@@ -20,9 +20,8 @@ bool doReduce()
     FAASM_REDUCE(reducedA, FAASM_TYPE_INT, FAASM_OP_SUM)
     FAASM_REDUCE(reducedB, FAASM_TYPE_INT, FAASM_OP_SUM)
 
-#pragma omp parallel for num_threads(nThreads) default(none) \
-    shared(counts,loopSize,success) \
-    reduction(+ : reducedA,reducedB)
+#pragma omp parallel for num_threads(nThreads) default(none)                   \
+  shared(counts, loopSize, success) reduction(+ : reducedA, reducedB)
     for (int i = 0; i < loopSize; i++) {
         int threadNum = omp_get_thread_num();
         counts[threadNum]++;

diff --git a/func/omp/simple_reduce.cpp b/func/omp/simple_reduce.cpp
@@ -14,7 +14,8 @@ int main(int argc, char* argv[])
 
     FAASM_REDUCE(count, FAASM_TYPE_INT, FAASM_OP_SUM)
 
-#pragma omp parallel for num_threads(5) default(none) shared(loopSize) reduction(+ : count)
+#pragma omp parallel for num_threads(5) default(none) shared(loopSize)         \
+  reduction(+ : count)
     for (int i = 0; i < loopSize; i++) {
         count += (omp_get_thread_num() + 1);
     }

diff --git a/func/omp/single_thread_reduce.cpp b/func/omp/single_thread_reduce.cpp
@@ -30,10 +30,9 @@ int main(int argc, char* argv[])
     FAASM_REDUCE(reducedA, FAASM_TYPE_INT, FAASM_OP_SUM)
     FAASM_REDUCE(reducedB, FAASM_TYPE_DOUBLE, FAASM_OP_SUM)
 
-#pragma omp parallel for num_threads(1) default(none) \
-    private(privateA,privateB) \
-    reduction(+ : reducedA,reducedB) \
-    shared(loopSize, sharedA)
+#pragma omp parallel for num_threads(1) default(none) private(privateA,        \
+                                                                privateB)      \
+  reduction(+ : reducedA, reducedB) shared(loopSize, sharedA)
     for (int i = 0; i < loopSize; i++) {
         int threadNum = omp_get_thread_num();
 

diff --git a/tests/test_input.cpp b/tests/test_input.cpp
@@ -25,7 +25,10 @@ TEST_CASE("Test string input", "[input]")
 
     std::string expected;
     std::string defaultVal = "default";
-    SECTION("No input") { expected = defaultVal; }
+    SECTION("No input")
+    {
+        expected = defaultVal;
+    }
 
     SECTION("Input")
     {