Merge pull request #35 from lf-lang/ts-parameterizable

Ts parameterizable

runner/conf/benchmark/savina_concurrency_philosopher.yaml

@@ -42,8 +42,9 @@ targets:
       - "${bench_path}/TS/Savina/src/concurrency"
     lf_file: "concurrency/Philosophers.lf"
     script: "src-gen/concurrency/Philosophers/dist/Philosophers.js"
-    gen_args:
-      philosophers: ["-D", "numPhilosophers=<value>"]
-      eating_rounds: ["-D", "numEatingRounds=<value>"]
+    gen_args: null
+    run_args:
+      philosophers: ["--numPhilosophers", "<value>"]
+      eating_rounds: ["--count", "<value>"]
 
 

runner/conf/benchmark/savina_micro_big.yaml

@@ -54,6 +54,6 @@ targets:
       - "${bench_path}/TS/Savina/src/micro"
     lf_file: "micro/Big.lf"
     script: "src-gen/micro/Big/dist/Big.js"
-    gen_args:
-      messages: ["-D", "numPingsPerReactor=<value>"]
-      actors: ["-D", "numReactors=<value>"]
+    gen_args: null
+    run_args:
+      messages: ["--limit", "<value>"]

runner/conf/benchmark/savina_micro_chameneos.yaml

@@ -51,5 +51,6 @@ targets:
       - "${bench_path}/TS/Savina/src/micro"
     lf_file: "micro/Chameneos.lf"
     script: "src-gen/micro/Chameneos/dist/Chameneos.js"
-    gen_args:
-      meetings: ["-D", "limit=<value>"]
+    gen_args: null
+    run_args:
+      meetings: ["--limit", "<value>"]

runner/conf/benchmark/savina_micro_count.yaml

@@ -45,5 +45,6 @@ targets:
       - "${bench_path}/TS/Savina/src/micro"
     lf_file: "micro/CountingActor.lf"
     script: "src-gen/micro/CountingActor/dist/CountingActor.js"
-    gen_args:
-      messages: ["-D", "limit=<value>"]
+    gen_args: null
+    run_args:
+      messages: ["--limit", "<value>"]

runner/conf/benchmark/savina_micro_fjthrput.yaml

@@ -51,6 +51,7 @@ targets:
       - "${bench_path}/TS/Savina/src/micro"
     lf_file: "micro/Throughput.lf"
     script: "src-gen/micro/Throughput/dist/Throughput.js"
-    gen_args:
-      messages: ["-D", "--numMessagesPerReactor=<value>"]
-      actors: ["-D", "--numWorkers=<value>"]
+    gen_args: null
+    run_args:
+      messages: ["--numMessagesPerReactor", "<value>"]
+      actors: ["--numWorkers", "<value>"]

runner/conf/benchmark/savina_micro_pingpong.yaml

@@ -45,5 +45,6 @@ targets:
       - "${bench_path}/TS/Savina/src/micro"
     lf_file: "micro/PingPong.lf"
     script: "src-gen/micro/PingPong/dist/PingPong.js"
-    gen_args:
-      pings: ["-D", "count=<value>"]
+    gen_args: null
+    run_args:
+      pings: ["--limit", "<value>"]

runner/conf/benchmark/savina_micro_threadring.yaml

@@ -51,5 +51,6 @@ targets:
       - "${bench_path}/TS/Savina/src/micro"
     lf_file: "micro/ThreadRing.lf"
     script: "src-gen/micro/ThreadRing/dist/ThreadRing.js"
-    gen_args:
-      pings: ["-D", "limit=<value>"]
+    gen_args: null
+    run_args:
+      pings: ["--limit", "<value>"]

runner/conf/target/lf-ts.yaml

@@ -1,11 +1,12 @@
 name: lf-ts
 prepare: ["mkdir", "src"]
 copy: ["cp", "-r", "${benchmark.targets.lf-ts.copy_sources}", "src"]
-gen: ["cog", "-r", "${args:benchmark.targets.lf-ts.gen_args}",
-      "-D", "numIterations=${iterations}",
-      "src/${benchmark.targets.lf-ts.lf_file}"]
+# gen: ["cog", "-r", "src/${benchmark.targets.lf-ts.lf_file}"]
+gen: null
 compile: ["${lf_path}/bin/lfc", "src/${benchmark.targets.lf-ts.lf_file}"]
 run: ["node",
-      "${benchmark.targets.lf-ts.script}"]
+      "${benchmark.targets.lf-ts.script}",
+      "--numIterations", "${iterations}",
+      "${args:benchmark.targets.lf-ts.run_args}"]
 parser:
   _target_: "parser.parse_lfcpp_output"