lf-lang · edwardalee · Feb 26, 2022 · Nov 10, 2021 · Nov 11, 2021 · Nov 11, 2021
diff --git a/benchmark/C/Savina/src/concurrency/BoundedBuffer.lf b/benchmark/C/Savina/src/concurrency/BoundedBuffer.lf
@@ -24,6 +24,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/concurrency/CigaretteSmoker.lf b/benchmark/C/Savina/src/concurrency/CigaretteSmoker.lf
@@ -63,6 +63,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/concurrency/Dictionary.lf b/benchmark/C/Savina/src/concurrency/Dictionary.lf
@@ -28,6 +28,7 @@ target CCpp {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/concurrency/LogisticMap.lf b/benchmark/C/Savina/src/concurrency/LogisticMap.lf
@@ -12,6 +12,7 @@ target C {
      /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/concurrency/Philosophers.lf b/benchmark/C/Savina/src/concurrency/Philosophers.lf
@@ -11,6 +11,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */
@@ -170,7 +171,7 @@ reactor Arbitrator(num_philosophers:int(20)) {
         }
 
         if (self->finished_philosophers == self->num_philosophers) {
-            printf("Arbitrator: All philosophers are sated. Number of denials to philosophers: %d", self->retries);
+            printf("Arbitrator: All philosophers are sated. Number of denials to philosophers: %d\n", self->retries);
             request_stop();
         }        
     =}

diff --git a/benchmark/C/Savina/src/concurrency/ProdCons.lf b/benchmark/C/Savina/src/concurrency/ProdCons.lf
@@ -10,6 +10,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/concurrency/SleepingBarber.lf b/benchmark/C/Savina/src/concurrency/SleepingBarber.lf
@@ -46,6 +46,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/concurrency/SortedLinkList.lf b/benchmark/C/Savina/src/concurrency/SortedLinkList.lf
@@ -18,6 +18,7 @@ target CCpp {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/micro/Big.lf b/benchmark/C/Savina/src/micro/Big.lf
@@ -29,6 +29,7 @@ target C{
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */  

diff --git a/benchmark/C/Savina/src/micro/Chameneos.lf b/benchmark/C/Savina/src/micro/Chameneos.lf
@@ -41,6 +41,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/micro/Counting.lf b/benchmark/C/Savina/src/micro/Counting.lf
@@ -42,6 +42,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/micro/PingPong.lf b/benchmark/C/Savina/src/micro/PingPong.lf
@@ -26,6 +26,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/micro/ThreadRing.lf b/benchmark/C/Savina/src/micro/ThreadRing.lf
@@ -55,6 +55,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/micro/Throughput.lf b/benchmark/C/Savina/src/micro/Throughput.lf
@@ -56,12 +56,13 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */
     threads: 2,
     /// [[[end]]]
-    flags: "-lm",
+    flags: "-lm"
 };
 
 

diff --git a/benchmark/C/Savina/src/parallelism/Apsp.lf b/benchmark/C/Savina/src/parallelism/Apsp.lf
@@ -21,6 +21,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/parallelism/FilterBank.lf b/benchmark/C/Savina/src/parallelism/FilterBank.lf
@@ -33,6 +33,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/parallelism/GuidedSearch.lf b/benchmark/C/Savina/src/parallelism/GuidedSearch.lf
@@ -62,6 +62,7 @@ target CCpp {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/parallelism/MatMul.lf b/benchmark/C/Savina/src/parallelism/MatMul.lf
@@ -10,6 +10,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/parallelism/MatMulBenchmarkRunner.lf b/benchmark/C/Savina/src/parallelism/MatMulBenchmarkRunner.lf
@@ -10,6 +10,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/parallelism/NQueens.lf b/benchmark/C/Savina/src/parallelism/NQueens.lf
@@ -41,6 +41,7 @@ target C{
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/parallelism/PiPrecision.lf b/benchmark/C/Savina/src/parallelism/PiPrecision.lf
@@ -17,6 +17,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/parallelism/RadixSort.lf b/benchmark/C/Savina/src/parallelism/RadixSort.lf
@@ -15,6 +15,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/C/Savina/src/parallelism/Trapezoidal.lf b/benchmark/C/Savina/src/parallelism/Trapezoidal.lf
@@ -17,6 +17,7 @@ target C {
     /* [[[cog
       if (threaded_runtime=="True"):
           cog.outl(f"threads: {threads},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
           cog.outl("threads: 0,")
     ]]] */

diff --git a/benchmark/runner/conf/default.yaml b/benchmark/runner/conf/default.yaml
@@ -1,5 +1,6 @@
 iterations: 12
 threads: null
+scheduler: GEDF_NP
 savina_path: "${oc.env:SAVINA_PATH}"
 lf_path: "${oc.env:LF_PATH}"
 continue_on_error: False

diff --git a/benchmark/runner/conf/target/lf-c.yaml b/benchmark/runner/conf/target/lf-c.yaml
@@ -3,6 +3,7 @@ prepare: ["mkdir", "src"]
 copy: ["cp", "-r", "${benchmark.targets.lf-c.copy_sources}", "src"]
 gen: ["cog", "-r", "${args:benchmark.targets.lf-c.gen_args}",
       "-D", "threads=${threads}",
+      "-D", "scheduler=${scheduler}",
       "-D", "threaded_runtime=True",
       "src/${benchmark.targets.lf-c.lf_file}"]
 compile: ["${lf_path}/bin/lfc", "src/${benchmark.targets.lf-c.lf_file}"]

diff --git a/org.lflang.lfc/src/org/lflang/lfc/Main.java b/org.lflang.lfc/src/org/lflang/lfc/Main.java
@@ -109,6 +109,7 @@ enum CLIOption {
         NO_COMPILE("n", "no-compile", false, false, "Do not invoke target compiler.", true),
         FEDERATED("f", "federated", false, false, "Treat main reactor as federated.", false),
         THREADS("t", "threads", true, false, "Specify the default number of threads.", true),
+        SCHEDULER("s", "scheduler", true, false, "Specify the runtime scheduler (if supported).", true),
         OUTPUT_PATH("o", "output-path", true, false, "Specify the root output directory.", false),
         RUNTIME_VERSION(null, "runtime-version", true, false, "Specify the version of the runtime library used for compiling LF programs.", true),
         EXTERNAL_RUNTIME_PATH(null, "external-runtime-path", true, false, "Specify an external runtime library to be used by the compiled binary.", true);

diff --git a/org.lflang.tests/src/org/lflang/tests/AbstractTest.java b/org.lflang.tests/src/org/lflang/tests/AbstractTest.java
@@ -7,6 +7,7 @@
 import org.junit.jupiter.api.Test;
 import org.lflang.ASTUtils;
 import org.lflang.Target;
+import org.lflang.TargetProperty.SchedulerOptions;
 import org.lflang.tests.TestRegistry.TestCategory;
 
 /**
@@ -63,6 +64,13 @@ protected boolean supportsDockerOption() {
         return false;
     }
 
+
+    /**
+     * Whether to test different {@link org.lflang.TargetProperty#SchedulerOptions}.
+     */
+    protected boolean supportsSchedulerSwapping() {
+        return false;
+    }
 
     @Test
     public void runExampleTests() {
@@ -192,4 +200,43 @@ public void runWithFourThreads() {
             true
         );
     }
+
+    /**
+     * Swap the default runtime scheduler with other supported versions and run all the supported tests.
+     */
+    @Test
+    public void runWithNonDefaultSchedulers() {
+        Assumptions.assumeTrue(supportsSchedulerSwapping(), Message.NO_SCHED_SWAPPING_SUPPORT);
+
+        EnumSet<TestCategory> categories = EnumSet.of(TestCategory.CONCURRENT,
+                                                      TestCategory.MULTIPORT);
+
+        // Add federated and docker tests if supported
+        if (!isWindows() && supportsFederatedExecution()) {
+            categories.add(TestCategory.FEDERATED);
+            if (isLinux() && supportsDockerOption()) {
+                categories.add(TestCategory.DOCKER_FEDERATED);
+            }
+        }
+
+        for (SchedulerOptions scheduler: EnumSet.allOf(SchedulerOptions.class)) {
+            if (scheduler == SchedulerOptions.getDefault()) continue;
+
+            this.runTestsForTargets(
+                Message.DESC_SCHED_SWAPPING + scheduler.toString() +".",
+                categories::contains,
+                test -> {
+                    test.getContext()
+                        .getArgs()
+                        .setProperty(
+                                "scheduler", 
+                                scheduler.toString()
+                                ); 
+                    return true;
+                },
+                TestLevel.EXECUTION,
+                true
+            );
+        }
+    }
 }
diff --git a/org.lflang.tests/src/org/lflang/tests/LFTest.java b/org.lflang.tests/src/org/lflang/tests/LFTest.java
@@ -28,6 +28,9 @@ public class LFTest implements Comparable<LFTest> {
 
     /** The result of the test. */
     public Result result = Result.UNKNOWN;
+
+    /** The exit code of the test. **/
+    public String exitValue = "?";
 
     /** Object used to determine where the code generator puts files. */
     public FileConfig fileConfig;
@@ -128,7 +131,7 @@ public String reportErrors() {
             sb.append("+---------------------------------------------------------------------------+").append(System.lineSeparator());
             sb.append("Failed: ").append(this.name).append(System.lineSeparator());
             sb.append("-----------------------------------------------------------------------------").append(System.lineSeparator());
-            sb.append("Reason: ").append(this.result.message).append(System.lineSeparator());
+            sb.append("Reason: ").append(this.result.message).append(" Exit code: ").append(this.exitValue).append(System.lineSeparator());
             appendIfNotEmpty("Reported issues", this.issues.toString(), sb);
             appendIfNotEmpty("Compilation output", this.compilationLog.toString(), sb);
             appendIfNotEmpty("Execution output", this.execLog.toString(), sb);
@@ -164,6 +167,7 @@ public enum Result {
         CODE_GEN_FAIL("Error while generating code for test."),
         NO_EXEC_FAIL("Did not execute test."),
         TEST_FAIL("Test did not pass."),
+        TEST_EXCEPTION("Test exited with an exception."),
         TEST_TIMEOUT("Test timed out."),
         TEST_PASS("Test passed.");
 

diff --git a/org.lflang.tests/src/org/lflang/tests/TestBase.java b/org.lflang.tests/src/org/lflang/tests/TestBase.java
@@ -5,6 +5,8 @@
 
 import java.io.IOException;
 import java.io.PrintStream;
+import java.io.PrintWriter;
+import java.io.StringWriter;
 import java.lang.reflect.Constructor;
 import java.lang.reflect.InvocationTargetException;
 import java.nio.file.Files;
@@ -121,6 +123,7 @@ public static class Message {
         public static final String NO_DOCKER_SUPPORT = "Target does not support the 'docker' property.";
         public static final String NO_DOCKER_TEST_SUPPORT = "Docker tests are only supported on Linux.";
         public static final String NO_GENERICS_SUPPORT = "Target does not support generic types.";
+        public static final String NO_SCHED_SWAPPING_SUPPORT = "Target does not support runtime scheduler swapping.";
 
         /* Descriptions of collections of tests. */
         public static final String DESC_SERIALIZATION = "Run serialization tests (threads = 0).";
@@ -137,6 +140,7 @@ public static class Message {
         public static final String DESC_TARGET_SPECIFIC = "Run target-specific tests (threads = 0)";
         public static final String DESC_AS_CCPP = "Running C tests as CCpp.";
         public static final String DESC_FOUR_THREADS = "Run non-concurrent and non-federated tests (threads = 4).";
+        public static final String DESC_SCHED_SWAPPING = "Running with non-default runtime scheduler ";
 
         /* Missing dependency messages */
         public static final String MISSING_DOCKER = "Executable 'docker' not found or 'docker' daemon thread not running";
@@ -466,12 +470,18 @@ private void execute(LFTest test) {
                 } else {
                     if (p.exitValue() != 0) {
                         test.result = Result.TEST_FAIL;
+                        test.exitValue = Integer.toString(p.exitValue());
                         return;
                     }
                 }
             }
         } catch (Exception e) {
-            test.result = Result.TEST_FAIL;
+            test.result = Result.TEST_EXCEPTION;
+            // Add the stack trace to the test output
+            StringWriter sw = new StringWriter();
+            PrintWriter pw = new PrintWriter(sw);
+            e.printStackTrace(pw);
+            test.execLog.buffer.append(sw.toString());
             return;
         }
         test.result = Result.TEST_PASS;

diff --git a/org.lflang.tests/src/org/lflang/tests/runtime/CTest.java b/org.lflang.tests/src/org/lflang/tests/runtime/CTest.java
@@ -63,6 +63,11 @@ protected boolean supportsFederatedExecution() {
     protected boolean supportsDockerOption() {
         return true;
     }
+
+    @Override
+    protected boolean supportsSchedulerSwapping() {
+        return true;
+    }
 
     @Test
     @Override
@@ -101,6 +106,12 @@ public void runWithFourThreads() {
         super.runWithFourThreads();
     }
 
+    @Test
+    @Override
+    public void runWithNonDefaultSchedulers() {
+        super.runWithNonDefaultSchedulers();
+    }
+
     @Test
     @Override
     public void runSerializationTests() {

diff --git a/org.lflang/src/lib/c/reactor-c b/org.lflang/src/lib/c/reactor-c
diff --git a/org.lflang/src/lib/py/reactor-c-py b/org.lflang/src/lib/py/reactor-c-py