Merge pull request #2178 from lf-lang/rp2040-multicore

Rp2040 multithreaded target support
lf-lang · May 29, 2024 · a20b36a · a20b36a
2 parents 9e909a8 + 2de8269
commit a20b36a
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 18 deletions.
diff --git a/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java b/core/src/main/java/org/lflang/generator/c/CCmakeGenerator.java
@@ -394,7 +394,8 @@ CodeBuilder generateCMakeCode(
 
     if (!targetConfig.get(SingleThreadedProperty.INSTANCE)
         && platformOptions.platform() != Platform.ZEPHYR
-        && platformOptions.platform() != Platform.FLEXPRET) {
+        && platformOptions.platform() != Platform.FLEXPRET
+        && platformOptions.platform() != Platform.RP2040) {
       // If threaded computation is requested, add the threads option.
       cMakeCode.pr("# Find threads and link to it");
       cMakeCode.pr("find_package(Threads REQUIRED)");
@@ -558,9 +559,9 @@ private static String setUpMainTargetRp2040(
     code.pr("pico_sdk_init()");
     code.newLine();
     code.pr("add_subdirectory(core)");
-    code.pr("target_link_libraries(core PUBLIC pico_stdlib)");
-    code.pr("target_link_libraries(core PUBLIC pico_multicore)");
-    code.pr("target_link_libraries(core PUBLIC pico_sync)");
+    code.pr("target_link_libraries(reactor-c PUBLIC pico_stdlib)");
+    code.pr("target_link_libraries(reactor-c PUBLIC pico_multicore)");
+    code.pr("target_link_libraries(reactor-c PUBLIC pico_sync)");
     code.newLine();
     code.pr("set(LF_MAIN_TARGET " + executableName + ")");
 

diff --git a/core/src/main/java/org/lflang/target/property/PlatformProperty.java b/core/src/main/java/org/lflang/target/property/PlatformProperty.java
@@ -115,9 +115,6 @@ protected PlatformOptions fromString(String string, MessageReporter reporter) {
   public void validate(TargetConfig config, MessageReporter reporter) {
     var platform = config.get(PlatformProperty.INSTANCE).platform;
     switch (platform) {
-      case RP2040:
-        validateRP2040(config, reporter);
-        break;
       case FLEXPRET:
         validateFlexPRET(config, reporter);
         break;
@@ -129,15 +126,6 @@ public void validate(TargetConfig config, MessageReporter reporter) {
     }
   }
 
-  private void validateRP2040(TargetConfig config, MessageReporter reporter) {
-    var singleThreaded = config.get(SingleThreadedProperty.INSTANCE);
-    if (!singleThreaded) {
-      reporter
-          .at(config.lookup(this), Literals.KEY_VALUE_PAIR__VALUE)
-          .error("Platform " + Platform.RP2040 + " does not support threading.");
-    }
-  }
-
   private void validateFlexPRET(TargetConfig config, MessageReporter reporter) {
     var platform = config.get(PlatformProperty.INSTANCE);
     var board = platform.board();

diff --git a/core/src/main/java/org/lflang/target/property/type/PlatformType.java b/core/src/main/java/org/lflang/target/property/type/PlatformType.java
@@ -14,7 +14,7 @@ public enum Platform {
     AUTO,
     ARDUINO, // FIXME: not multithreaded
     NRF52("Nrf52", true),
-    RP2040("Rp2040", false),
+    RP2040("Rp2040", true),
     LINUX("Linux", true),
     MAC("Darwin", true),
     ZEPHYR("Zephyr", true),

diff --git a/core/src/main/resources/lib/c/reactor-c b/core/src/main/resources/lib/c/reactor-c
+1 −1		core/federated/network/net_util.c
+12 −0		low_level_platform/api/platform/lf_rp2040_support.h
+6 −0		low_level_platform/impl/CMakeLists.txt
+0 −5		low_level_platform/impl/src/lf_linux_support.c
+109 −5		low_level_platform/impl/src/lf_rp2040_support.c