Merge branch 'lf-lang:main' into ts_savina

Author: Wonseo-C

.github/workflows/benchmark-tests.yml

@@ -12,7 +12,6 @@ on:
       benchmarks-ref:
         required: false
         type: string
-        default: main
 
 jobs:
   run:
@@ -21,7 +20,7 @@ jobs:
       - name: Check out benchmarks
         uses: actions/checkout@v3
         with:
-          repository: lf-lang/benchmarks
+          repository: lf-lang/benchmarks-lingua-franca
           ref: ${{ inputs.benchmarks-ref}}
       - name: Check out lingua-franca repository
         uses: actions/checkout@v3
@@ -52,7 +51,7 @@ jobs:
         run: |
           mkdir -p reactor-cpp/build
           cd reactor-cpp/build
-          cmake -DCMAKE_INSTALL_PREFIX=../install ../../lf/org.lflang/src/lib/cpp/reactor-cpp
+          cmake -DCMAKE_INSTALL_PREFIX=../install -DCMAKE_BUILD_TYPE=RelWithDebInfo -DREACTOR_CPP_VALIDATE=ON -DREACTOR_CPP_TRACE=OFF -DREACTOR_CPP_LOG_LEVEL=2  ../../lf/org.lflang/src/lib/cpp/reactor-cpp
           make install
           echo "LD_LIBRARY_PATH=$GITHUB_WORKSPACE/reactor-cpp/install/lib" >> $GITHUB_ENV
         if: ${{ inputs.target == 'Cpp' }}
@@ -70,3 +69,19 @@ jobs:
         run: |
           python3 runner/run_benchmark.py -m test_mode=True iterations=1 benchmark="glob(*)" target=lf-rust
         if: ${{ inputs.target == 'Rust' }}
+      - name: Setup Node.js environment
+        uses: actions/[email protected]
+        if: ${{ inputs.target == 'TS' }}
+      - name: Install pnpm
+        run: npm i -g pnpm
+        if: ${{ inputs.target == 'TS' }}
+      - name: Cache .pnpm-store
+        uses: actions/cache@v2
+        with:
+          path: ~/.pnpm-store
+          key: ${{ runner.os }}-node${{ matrix.node-version }}-${{ hashFiles('org.lflang/src/lib/ts/package.json') }}
+        if: ${{ inputs.target == 'TS' }}
+      - name: Test TypeScript benchmarks
+        run: |
+          python3 runner/run_benchmark.py -m test_mode=True iterations=1 benchmark="glob(*)" target=lf-ts
+        if: ${{ inputs.target == 'TS' }}

.github/workflows/ci.yml

@@ -23,5 +23,9 @@ jobs:
     uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
     with:
       target: 'Rust'
+  ts-benchmark-tests:
+    uses: lf-lang/benchmarks-lingua-franca/.github/workflows/benchmark-tests.yml@main
+    with:
+      target: 'TS'
 
 

.gitignore

@@ -9,5 +9,5 @@ multirun
 __pycache__
 *.csv
 *.txt
-
+.vscode
 

C/Savina/src/BenchmarkRunner.lf

@@ -61,29 +61,28 @@ reactor BenchmarkRunner(num_iterations:int(12)) {
     reaction(startup) -> nextIteration {=
         // Initialize an array of interval_t
         self->measuredTimes = (interval_t *) calloc(self->num_iterations, sizeof(interval_t));
-        schedule(nextIteration, 0);
+        lf_schedule(nextIteration, 0);
     =}
 
 
     reaction(nextIteration) -> start, done {=
         if (self->count < self->num_iterations) { 
-            self->startTime = get_physical_time();
-            SET(start, true);
+            self->startTime = lf_time_physical();
+            lf_set(start, true);
         } else {
-            schedule(done, 0);
+            lf_schedule(done, 0);
         }
     =}
 
     reaction(finish) -> nextIteration {=
-        interval_t end_time = get_physical_time();
+        interval_t end_time = lf_time_physical();
         interval_t duration = end_time - self->startTime;
         self->measuredTimes[self->count] = duration;
         self->count += 1;
 
         printf("Iteration %d - %.3f ms\n", self->count, toMS(duration));
 
-        schedule(nextIteration, 0);
-        
+        lf_schedule(nextIteration, 0);
     =}
 
     reaction(done) {=        
@@ -94,7 +93,7 @@ reactor BenchmarkRunner(num_iterations:int(12)) {
         printf("Best Time:\t %.3f msec\n", measuredMSTimes[0]);
         printf("Worst Time:\t %.3f msec\n", measuredMSTimes[self->num_iterations - 1]);
         printf("Median Time:\t %.3f msec\n", median(measuredMSTimes, self->num_iterations));
-        request_stop();
+        lf_request_stop();
     =}
 
     preamble {=

C/Savina/src/micro/PingPong.lf

@@ -50,7 +50,7 @@ reactor Ping(count:int(1000000)) {
     =}
     reaction (receive) -> serve, finished {=
         if (self->pingsLeft > 0) {
-            schedule(serve, 0);
+            lf_schedule(serve, 0);
         } else {
             // reset pingsLeft for next iteration
             self->pingsLeft = self->count;

C/Savina/src/parallelism/Trapezoidal.lf

@@ -135,7 +135,7 @@ reactor Worker(instance:int(0)) {
 }
 
 /* [[[cog
-    cog.outl(f'main reactor Trapezoidal(numIterations:int({numIterations}), numWorkers:int({workers}), numPieces:int({pieces}), leftEndPoint:double({left}), rightEndPoint:double({right}))') 
+    cog.outl(f'main reactor Trapezoidal(numIterations:int({numIterations}), numWorkers:int({worker_reactors}), numPieces:int({pieces}), leftEndPoint:double({left}), rightEndPoint:double({right}))')
 ]]] */
     main reactor Trapezoidal(numIterations:int(12), numWorkers:int(100), numPieces:int(10000000), leftEndPoint:double(1.0), rightEndPoint:double(5.0))
 

README.md

@@ -117,10 +117,11 @@ The results for a multirun are written to a directory in the scheme `multirun/<d
 
 A second script called `collect_results.py` provides a convenient way for collecting results from a multirun and merging them into a single CSV file. Simply running
 ```
-./collect_results.py multirun/<date>/<time>/ out.csv
+./collect_results.py out.csv multirun/<date>/<time>/
 ```
 collects all results from the particular multirun and stores the merged data structure in out.csv. `collect_results.py` not only merges the results, but it also calculates minimum, maximum and median execution time for each individual run. The resulting CSV does not contain the measured values of individual iterations anymore and only contains a single row per run. This behavior can be disabled with the `--raw` command line flag. With the flag set, the results from all runs are merged as say are and the resulting file contains rows for all individual runs, but no minimum, maximum and median values.
 
+As a shortcut, you may omit the multirun directory to write the latest multirun results to `out.csv`.
 
 ## How it works
 

TS/src/NodeHTTPServer.js renamed to TS/NodeHTTPServer.js

@@ -7,7 +7,7 @@ target TypeScript;
  * @author Wonseo Choi
  */
 
-reactor BenchmarkRunner(num_iterations:number(12)) {
+reactor BenchmarkRunner(numIterations:number(12)) {
 
     output start:boolean;
     input finish:boolean;
@@ -25,42 +25,40 @@ reactor BenchmarkRunner(num_iterations:number(12)) {
 
 
     reaction(startup) -> nextIteration {=
-        measuredTimes.length = num_iterations;
+        // measuredTimes.length = numIterations;
         actions.nextIteration.schedule(0, true);
 
-        console.log("Benchmark will run " + num_iterations + " times \n");
+        console.log("Benchmark will run " + numIterations + " times \n");
         console.log("System information:")
         console.log(`Platform: ${process.platform} \n`)
     =}
-   
 
-    reaction(nextIteration) -> start, done {=
-        if (count < num_iterations) { 
-            startTime = util.getCurrentPhysicalTime();
-            start = true;
-        } else {
-            actions.done.schedule(0, true);
-        }
+    reaction(nextIteration) -> start {=
+        startTime = util.getCurrentPhysicalTime();
+        start = true;
     =}
 
-    reaction(finish) -> nextIteration {=
+    reaction(finish) -> nextIteration, done {=
         const duration = util.getCurrentPhysicalTime().subtract(startTime as TimeValue);
-        measuredTimes[count] = duration.toMilliseconds();
+        measuredTimes.push(duration.toMilliseconds());
         ++count;
 
         console.log("Iteration "+ count + " - " + duration.toMilliseconds() + " ms\n");
 
-        actions.nextIteration.schedule(0, true);
-        
+        if (count < numIterations) {
+            actions.nextIteration.schedule(0, true);
+        } else {
+            actions.done.schedule(0, true);
+        }        
     =}
 
     reaction(done) {=        
         measuredTimes.sort()
 
         console.log("Execution - Summary:\n");
         console.log("Best Time:\t " + measuredTimes[0] + " msec\n");
-        console.log("Worst Time:\t " + measuredTimes[num_iterations - 1] + " msec\n");
-        console.log("Median Time:\t " + median(measuredTimes, num_iterations) + " msec\n");
+        console.log("Worst Time:\t " + measuredTimes[numIterations - 1] + " msec\n");
+        console.log("Median Time:\t " + median(measuredTimes, numIterations) + " msec\n");
 
         util.requestStop();
     =}

TS/src/BenchmarkRunner.lf renamed to TS/Savina/src/BenchmarkRunner.lf

@@ -5,12 +5,11 @@
  */
 
 
- target TypeScript {
+target TypeScript {
     fast: true
 };
 
-import BenchmarkRunner from "BenchmarkRunner.lf";
-
+import BenchmarkRunner from "../BenchmarkRunner.lf";
 
 reactor Philosopher(count:number(10000)) {    
 
@@ -48,7 +47,7 @@ reactor Philosopher(count:number(10000)) {
 }
 
 
-reactor Arbitrator(num_philosophers:number(20)) {
+reactor Arbitrator(numPhilosophers:number(20)) {
     preamble {=
         enum Reply {
             INVALID = 0,
@@ -60,11 +59,11 @@ reactor Arbitrator(num_philosophers:number(20)) {
     input start: boolean;
     output allFinished: boolean;
 
-    input[num_philosophers] finished: boolean;
-    input[num_philosophers] done: boolean;
-    input[num_philosophers] hungry: boolean;
-    output[num_philosophers] eat: boolean;
-    output[num_philosophers] denied: boolean;
+    input[numPhilosophers] finished: boolean;
+    input[numPhilosophers] done: boolean;
+    input[numPhilosophers] hungry: boolean;
+    output[numPhilosophers] eat: boolean;
+    output[numPhilosophers] denied: boolean;
 
     state forks: {=Array<boolean>=}({= [] =});
     state replies: {=Array<number>=}({= [] =});
@@ -75,8 +74,8 @@ reactor Arbitrator(num_philosophers:number(20)) {
     logical action sendReplies;
 
     reaction(startup) {=
-        forks.length = num_philosophers;
-        replies.length = num_philosophers;
+        forks.length = numPhilosophers;
+        replies.length = numPhilosophers;
     =}
 
     reaction(start) {=
@@ -88,7 +87,7 @@ reactor Arbitrator(num_philosophers:number(20)) {
     =}
 
     reaction(sendReplies) -> eat, denied {=
-        for(let i = 0; i < num_philosophers; i++) {
+        for(let i = 0; i < numPhilosophers; i++) {
             if (replies[i] == Reply.EAT) {
                 eat[i] = true;
             } else if (replies[i] == Reply.DENIED) {
@@ -99,42 +98,42 @@ reactor Arbitrator(num_philosophers:number(20)) {
     =}
 
     reaction (done) {=
-        for(let i = 0; i < num_philosophers; i++){
+        for(let i = 0; i < numPhilosophers; i++){
             if (done[i] !== undefined) {
                 forks[i] = false;
-                forks[(i + 1) % num_philosophers] = false;
+                forks[(i + 1) % numPhilosophers] = false;
             }
         }
     =}
 
     reaction(hungry) -> sendReplies {=
-        for(let i = 0; i < num_philosophers; i++) {
-            const j= (i + arbitration_id) % num_philosophers;
+        for(let i = 0; i < numPhilosophers; i++) {
+            const j= (i + arbitration_id) % numPhilosophers;
 
             if(hungry[j] !== undefined) {
                 const left = j;
-                const right = (j + 1) % num_philosophers;     
+                const right = (j + 1) % numPhilosophers;     
 
                 if(forks[left] || forks[right]) {
                     replies[j] = Reply.DENIED;
                     ++numRetries;
                 } else {
                     forks[j] = true;
-                    forks[(j + 1) % num_philosophers] = true;
+                    forks[(j + 1) % numPhilosophers] = true;
                     replies[j] = Reply.EAT;
                 }       
             }
         }
-        arbitration_id = (arbitration_id + 1) % num_philosophers;
+        arbitration_id = (arbitration_id + 1) % numPhilosophers;
         actions.sendReplies.schedule(0, null);
     =}
 
     reaction (finished) -> allFinished {=
-        // i < finished_width ... finished_width = num_philosophers in this code
-        for(let i = 0; i < num_philosophers; i++) { 
+        // i < finished_width ... finished_width = numPhilosophers in this code
+        for(let i = 0; i < numPhilosophers; i++) { 
             if(finished[i] !== undefined) {
                 ++numFinishedPhilosophers;
-                if(num_philosophers == numFinishedPhilosophers) {
+                if(numPhilosophers == numFinishedPhilosophers) {
                     console.log("Arbitrator: All philosophers are sated. Number of denials to philosophers: " + numRetries + "\n");
                     allFinished = true;
                 }
@@ -144,11 +143,11 @@ reactor Arbitrator(num_philosophers:number(20)) {
 }
 
 
-main reactor Philosophers (numIterations:number(12), num_philosophers:number(20), count:number(100)){
+main reactor Philosophers (numIterations:number(12), numPhilosophers:number(20), count:number(100)){
 
-    arbitrator = new Arbitrator(num_philosophers = num_philosophers);
-    philosophers = new[num_philosophers] Philosopher(count=count);
-    runner = new BenchmarkRunner(num_iterations = numIterations);
+    arbitrator = new Arbitrator(numPhilosophers = numPhilosophers);
+    philosophers = new[numPhilosophers] Philosopher(count=count);
+    runner = new BenchmarkRunner(numIterations = numIterations);
 
     reaction (startup) {=
         console.log("Start Philosophers LF Benchmark!");