Always include the include directory.

Author: petervdonovan

C/Savina/src/concurrency/BoundedBuffer.lf

@@ -48,32 +48,32 @@ preamble {=
     #include "PseudoRandom.h"
     #include <math.h>
     #include "deque.h"
-
-    double processItem(double curTerm, size_t cost) {
-        double res = curTerm;
-
-        PseudoRandom random;
-        random.mValue = cost;
-
-        if(cost > 0) {
-            for(size_t i = 0; i < cost; i++) {
-                for(size_t j = 0; j < 100; j++) {
-                    res += log(fabs(nextDouble(&random)) + 0.01);
-                }
-            }
-        } else {
-            res += log(fabs(nextDouble(&random)) + 0.01);
-        }
-
-        return res;
-    }
+    #include "benchmark_runner.h"
+    double processItem(double curTerm, size_t cost);
 =}
 
 
 reactor ManagerReactor(bufferSize: size_t(50), numProducers: size_t(40), numConsumers: size_t(40)) {
 
     preamble {=
-        #include "deque.h"
+        double processItem(double curTerm, size_t cost) {
+            double res = curTerm;
+
+            PseudoRandom random;
+            random.mValue = cost;
+
+            if(cost > 0) {
+                for(size_t i = 0; i < cost; i++) {
+                    for(size_t j = 0; j < 100; j++) {
+                        res += log(fabs(nextDouble(&random)) + 0.01);
+                    }
+                }
+            } else {
+                res += log(fabs(nextDouble(&random)) + 0.01);
+            }
+
+            return res;
+        }
     =}
 
     input start: bool;

C/Savina/src/micro/Counting.lf

@@ -47,9 +47,9 @@ target C {
       else:
           cog.outl("threading: false,")
     ]]] */
-    files: ["../include/benchmark_runner.h"],
     threading: false,
     /// [[[end]]]
+    files: ["../include/benchmark_runner.h"],
     fast: true
 }
 

C/Savina/src/micro/PingPong.lf

@@ -31,9 +31,9 @@ target C {
       else:
           cog.outl("threading: false,")
     ]]] */
-    files: ["../include/benchmark_runner.h"],
     threading: false,
     /// [[[end]]]
+    files: ["../include/benchmark_runner.h"],
     fast: true
 };
 

C/Savina/src/micro/ThreadRing.lf

@@ -60,9 +60,9 @@ target C {
       else:
           cog.outl("threading: false,")
     ]]] */
-    files: ["../include/benchmark_runner.h"],
     threading: false,
     /// [[[end]]]
+    files: ["../include/benchmark_runner.h"],
     fast: true,
     logging: warn,
 };

C/Savina/src/micro/Throughput.lf

@@ -61,9 +61,9 @@ target C {
       else:
           cog.outl("threading: false,")
     ]]] */
-    files: ["../include/benchmark_runner.h"],
     threading: false,
     /// [[[end]]]
+    files: ["../include/benchmark_runner.h"],
     flags: "-lm",
     fast: true
 };

C/Savina/src/parallelism/FilterBank.lf

@@ -38,9 +38,9 @@ target C {
       else:
           cog.outl("threading: false,")
     ]]] */
-    files: ["../include/benchmark_runner.h"],
     threading: false,
     /// [[[end]]]
+    files: ["../include/benchmark_runner.h"],
     fast: true
 };
 

runner/conf/benchmark/savina_concurrency_banking.yaml

@@ -32,7 +32,6 @@ targets:
   lf-c:
     copy_sources:
       - "${bench_path}/C/Savina/src/BenchmarkRunner.lf"
-      - "${bench_path}/C/Savina/src/include"
       - "${bench_path}/C/Savina/src/concurrency"
     lf_file: "concurrency/Banking.lf"
     binary: "Banking"

runner/conf/benchmark/savina_concurrency_barber.yaml

@@ -33,7 +33,6 @@ targets:
   lf-c:
     copy_sources:
       - "${bench_path}/C/Savina/src/BenchmarkRunner.lf"
-      - "${bench_path}/C/Savina/src/include"
       - "${bench_path}/C/Savina/src/concurrency"
     lf_file: "concurrency/SleepingBarber.lf"
     binary: "SleepingBarber"

runner/conf/benchmark/savina_concurrency_cigsmok.yaml

@@ -27,7 +27,6 @@ targets:
   lf-c:
     copy_sources:
       - "${bench_path}/C/Savina/src/BenchmarkRunner.lf"
-      - "${bench_path}/C/Savina/src/include"
       - "${bench_path}/C/Savina/src/concurrency"
     lf_file: "concurrency/CigaretteSmoker.lf"
     binary: "CigaretteSmoker"

runner/conf/benchmark/savina_concurrency_concdict.yaml

@@ -34,7 +34,6 @@ targets:
   lf-c:
     copy_sources:
       - "${bench_path}/C/Savina/src/BenchmarkRunner.lf"
-      - "${bench_path}/C/Savina/src/include"
       - "${bench_path}/C/Savina/src/concurrency"
     lf_file: "concurrency/Dictionary.lf"
     binary: "Dictionary"