Replace the 'threads' target property with the 'workers' and 'threading' properties

.github/scripts/test-lfc.sh

@@ -65,9 +65,11 @@ bin/lfc --output-path . test/C/src/Minimal.lf
 #                                    programs.
 bin/lfc --runtime-version ca216ccc3da5ecff0e8013f75e275d7acac099de test/Cpp/src/Minimal.lf
 
-# -t,--threads                       Specify the default number of threads.
-bin/lfc -t 2 test/C/src/Minimal.lf
-bin/lfc -threads 2 test/C/src/Minimal.lf
+# -w,--workers                       Specify the default number of worker threads.
+bin/lfc -w 2 test/C/src/Minimal.lf
+bin/lfc --workers 2 test/C/src/Minimal.lf
+bin/lfc --threading true test/C/src/Minimal.lf
+bin/lfc --threading false test/C/src/Minimal.lf
 
 #    --target-compiler <arg>         Target compiler to invoke.
 # (Added no-compile to avoid adding dependency.)

benchmark/C/Savina/src/concurrency/Banking.lf

@@ -51,12 +51,14 @@
 
  target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
+          cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,    
+    threading: false,
     /// [[[end]]]
     files: ["../include/PseudoRandom.h", 
             "/lib/c/reactor-c/util/deque.h", 

benchmark/C/Savina/src/concurrency/BoundedBuffer.lf

@@ -22,13 +22,14 @@
 
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     files: ["/lib/c/reactor-c/util/deque.h", 
             "/lib/c/reactor-c/util/deque.c",

benchmark/C/Savina/src/concurrency/CigaretteSmoker.lf

@@ -61,13 +61,14 @@
 
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     files: "../include/PseudoRandom.h"
 };

benchmark/C/Savina/src/concurrency/Dictionary.lf

@@ -26,13 +26,14 @@
 
 target CCpp {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     build-type : RelWithDebInfo,
     logging: "warn"

benchmark/C/Savina/src/concurrency/LogisticMap.lf

@@ -9,14 +9,15 @@
  */
 
 target C {
-     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+    /* [[[cog
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
 }
 

benchmark/C/Savina/src/concurrency/Philosophers.lf

@@ -9,13 +9,14 @@
  */
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     logging: warn
 };

benchmark/C/Savina/src/concurrency/SleepingBarber.lf

@@ -44,13 +44,14 @@
 target C {
     keepalive: true, // To silence warnings; because of the physical action.
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     files: ["/lib/c/reactor-c/util/deque.h", "/lib/c/reactor-c/util/deque.c", "../include/PseudoRandom.h"]
 };

benchmark/C/Savina/src/concurrency/SortedList.lf

@@ -16,13 +16,14 @@
 
 target CCpp {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     files: "../include/PseudoRandom.h"
 };

benchmark/C/Savina/src/micro/Big.lf

@@ -23,16 +23,16 @@
  * @author Arthur Deng
  */
 
-
-
 target C{
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
-    ]]] */  
+          cog.outl("threading: false,")
+    ]]] */
+    threading: false,
     /// [[[end]]]
     files: "../include/PseudoRandom.h"
 };

benchmark/C/Savina/src/micro/Chameneos.lf

@@ -39,13 +39,14 @@
 
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     logging: warn
 }

benchmark/C/Savina/src/micro/Counting.lf

@@ -40,13 +40,14 @@
 
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
 }
 

benchmark/C/Savina/src/micro/PingPong.lf

@@ -24,13 +24,14 @@
  */
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     fast: true
 };

benchmark/C/Savina/src/micro/ThreadRing.lf

@@ -53,13 +53,14 @@
 
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
 };
 

benchmark/C/Savina/src/micro/Throughput.lf

@@ -54,13 +54,14 @@
 
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 2,
+    threading: false,
     /// [[[end]]]
     flags: "-lm"
 };

benchmark/C/Savina/src/parallelism/Apsp.lf

@@ -19,13 +19,14 @@
 
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     build-type : RelWithDebInfo,
     cmake-include: ["../lib/matrix.cmake"],

benchmark/C/Savina/src/parallelism/FilterBank.lf

@@ -31,13 +31,14 @@
 
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     fast: true
 };

benchmark/C/Savina/src/parallelism/GuidedSearch.lf

@@ -60,13 +60,14 @@
 
 target CCpp {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     build-type : RelWithDebInfo,
     cmake-include: "GuidedSearch/GuidedSearch.cmake",

benchmark/C/Savina/src/parallelism/MatMul.lf

@@ -8,13 +8,14 @@
 
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     cmake-include: "../lib/matrix.cmake",
     files: ["../lib/matrix.c", "../include/matrix.h"],

benchmark/C/Savina/src/parallelism/NQueens.lf

@@ -39,12 +39,14 @@
 
 target C{
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
+    threading: false,
     /// [[[end]]]
     logging: warn,
     cmake-include: "/lib/c/reactor-c/util/deque.cmake",

benchmark/C/Savina/src/parallelism/PiPrecision.lf

@@ -15,13 +15,14 @@
 
 target C {
     /* [[[cog
-      if (threaded_runtime=="True"):
-          cog.outl(f"threads: {threads},")
+      if (threading=="True"):
+          cog.outl("threading: true,")
+          cog.outl(f"workers: {workers},")
           cog.outl(f"scheduler: {scheduler},")
       else:
-          cog.outl("threads: 0,")
+          cog.outl("threading: false,")
     ]]] */
-    threads: 0,
+    threading: false,
     /// [[[end]]]
     cmake-include: "PiPrecision.cmake"
 };