Patmos and S4NoC: 8

EhsanKhodadad · EhsanKhodadad · commit bb641024c198 · 2025-06-19T14:37:17.000+02:00
diff --git a/examples/patmos/hello_lf/Makefile b/examples/patmos/hello_lf/Makefile
@@ -10,10 +10,8 @@ ifeq ($(firstword $(MAKECMDGOALS)),all)
 endif
 
 # ---- Patmos specific configuration ----
-include ./src-gen/$(LF_MAIN)/Makefile
 include $(REACTOR_UC_PATH)/make/patmos/patmos-lfc.mk 
 
-CFLAGS += -DSCHEDULER_DYNAMIC 
 CFLAGS += -DEVENT_QUEUE_SIZE=$(EVENT_QUEUE_SIZE) 
 CFLAGS += -DREACTION_QUEUE_SIZE=$(REACTION_QUEUE_SIZE) 
 
diff --git a/examples/patmos/s4noc_fed_lf/S4NoCFedLF/r1/Makefile b/examples/patmos/s4noc_fed_lf/S4NoCFedLF/r1/Makefile
@@ -0,0 +1,21 @@
+LF_MAIN ?= S4NoCFedLF
+LF_FED ?= r1
+
+include $(REACTOR_UC_PATH)/make/patmos/patmos-lfc.mk
+
+# ---- Patmos specific configuration ----
+# Output directory
+BIN_DIR = $(CURDIR)/bin
+OUTPUT = $(BIN_DIR)/$(LF_MAIN)
+all: $(OUTPUT)
+ $(info Building $(LF_MAIN) federate $(LF_FED))
+ $(info Output directory: $(BIN_DIR))
+ $(info Output binary: $(OUTPUT))
+
+# Build rule
+$(OUTPUT): $(SOURCES)
+	 mkdir -p $(BIN_DIR)
+	$(CC) $(SOURCES) $(CFLAGS) -o $(OUTPUT)
+# Clean rule
+clean:
+	 rm -rf $(BIN_DIR)
diff --git a/examples/patmos/s4noc_fed_lf/S4NoCFedLF/r1/run_lfc.sh b/examples/patmos/s4noc_fed_lf/S4NoCFedLF/r1/run_lfc.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+LF_MAIN=S4NoCFedLF
+
+$REACTOR_UC_PATH/lfc/bin/lfc-dev ../../src/$LF_MAIN.lf -n -o .
diff --git a/examples/patmos/s4noc_fed_lf/S4NoCFedLF/r2/Makefile b/examples/patmos/s4noc_fed_lf/S4NoCFedLF/r2/Makefile
@@ -0,0 +1,21 @@
+LF_MAIN ?= S4NoCFedLF
+LF_FED ?= r2
+
+include $(REACTOR_UC_PATH)/make/patmos/patmos-lfc.mk
+
+# ---- Patmos specific configuration ----
+# Output directory
+BIN_DIR = $(CURDIR)/bin
+OUTPUT = $(BIN_DIR)/$(LF_MAIN)
+all: $(OUTPUT)
+ $(info Building $(LF_MAIN) federate $(LF_FED))
+ $(info Output directory: $(BIN_DIR))
+ $(info Output binary: $(OUTPUT))
+
+# Build rule
+$(OUTPUT): $(SOURCES)
+	 mkdir -p $(BIN_DIR)
+	$(CC) $(SOURCES) $(CFLAGS) -o $(OUTPUT)
+# Clean rule
+clean:
+	 rm -rf $(BIN_DIR)
diff --git a/examples/patmos/s4noc_fed_lf/S4NoCFedLF/r2/run_lfc.sh b/examples/patmos/s4noc_fed_lf/S4NoCFedLF/r2/run_lfc.sh
@@ -0,0 +1,5 @@
+#!/usr/bin/env bash
+
+LF_MAIN=S4NoCFedLF
+
+$REACTOR_UC_PATH/lfc/bin/lfc-dev ../../src/$LF_MAIN.lf -n -o .
diff --git a/examples/patmos/s4noc_fed_lf/build.sh b/examples/patmos/s4noc_fed_lf/build.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+LF_MAIN=S4NoCFedLF
+
+# Generate configuration templates 
+rm -rf $LF_MAIN
+$REACTOR_UC_PATH/lfc/bin/lfc-dev --gen-fed-templates src/$LF_MAIN.lf
+
+
+# Generate and build r1 sources
+pushd ./$LF_MAIN/r1
+    ./run_lfc.sh
+    make clean
+    make all 
+popd
+
+# Generate and build r2 sources
+pushd ./$LF_MAIN/r2
+    ./run_lfc.sh
+    make clean
+    make all 
+popd
+
diff --git a/examples/patmos/s4noc_fed_lf/src/S4NoCFedLF.lf b/examples/patmos/s4noc_fed_lf/src/S4NoCFedLF.lf
@@ -32,13 +32,13 @@ reactor Dst {
   =}
 }
 
-main reactor {
+federated reactor {
   @interface_s4noc(core=0)
   r1 = new Src(id=42)
 
   @interface_s4noc(core=1)
   r2 = new Dst()
   
-  @link(left="0", right="1")
+  // @link(left="0", right="1")
   r1.out -> r2.in
 }
diff --git a/examples/patmos/s4noc_lf/Makefile b/examples/patmos/s4noc_lf/Makefile
diff --git a/examples/patmos/s4noc_lf/build.sh b/examples/patmos/s4noc_lf/build.sh
diff --git a/examples/pico/buildAll.sh b/examples/pico/buildAll.sh
@@ -1,4 +1,9 @@
 #!/bin/env bash
 set -e
-cmake -Bbuild
-cmake --build build
+
+if [ -z "$PICO_SDK_PATH" ]; then
+  echo "Error: PICO_SDK_PATH is not defined. Please set it before running this script."
+else
+  cmake -Bbuild
+  cmake --build build
+fi
diff --git a/examples/riot/blinky/Makefile b/examples/riot/blinky/Makefile
diff --git a/examples/riot/blinky/build.sh b/examples/riot/blinky/build.sh
diff --git a/examples/riot/blinky/main.c b/examples/riot/blinky/main.c
diff --git a/include/reactor-uc/platform/patmos/s4noc_channel.h b/include/reactor-uc/platform/patmos/s4noc_channel.h
@@ -35,6 +35,6 @@ struct S4NOCPollChannel {
   pthread_t worker_thread;
 };
 
-void S4NOCPollChannel_ctor(S4NOCPollChannel *self, Environment *env, unsigned int destination_core);
+void S4NOCPollChannel_ctor(S4NOCPollChannel *self, unsigned int destination_core);
 
 #endif
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedProjectTemplateGenerator.kt b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcFederatedProjectTemplateGenerator.kt
@@ -132,7 +132,36 @@ class UcFederatedTemplateGenerator(
     FileUtil.writeToFile(cmake, projectRoot.resolve("CMakeLists.txt"))
   }
 
-  private fun generateFilesPatmos() {}
+  private fun generateFilesPatmos() {
+    val make =
+        """
+            |LF_MAIN ?= ${mainDef.name}
+            |LF_FED ?= ${federate.name}
+            |
+            |include $S(REACTOR_UC_PATH)/make/patmos/patmos-lfc.mk
+            |
+            |# ---- Patmos specific configuration ----
+            |# Output directory
+            |BIN_DIR = $(CURDIR)/bin
+            |OUTPUT = $(BIN_DIR)/$(LF_MAIN)
+            |
+            |all: $(OUTPUT)
+            | $(info Building $(LF_MAIN) federate $(LF_FED))
+            | $(info Output directory: $(BIN_DIR))
+            | $(info Output binary: $(OUTPUT))
+            |
+            |# Build rule
+            |$(OUTPUT): $(SOURCES)
+            |	 mkdir -p $(BIN_DIR)
+            |	 $(CC) $(SOURCES) $(CFLAGS) -o $(OUTPUT)
+            |
+            |# Clean rule
+            |clean:
+            |	 rm -rf $(BIN_DIR)
+        """
+            .trimMargin()
+    FileUtil.writeToFile(make, projectRoot.resolve("Makefile"))
+  }
 
   fun generateFiles() {
     if (Files.exists(projectRoot)) {
diff --git a/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcNetworkChannel.kt b/lfc/core/src/main/kotlin/org/lflang/generator/uc/UcNetworkChannel.kt
@@ -404,13 +404,13 @@ class UcS4NocChannel(
   private val destS4Noc = dest
 
   override fun generateChannelCtorSrc() =
-      "S4NocChannel_ctor(&self->channel, ${if (serverLhs) srcS4Noc.core else destS4Noc.core});"
+      "S4NOCPollChannel_ctor(&self->channel, ${if (serverLhs) srcS4Noc.core else destS4Noc.core});"
 
   override fun generateChannelCtorDest() =
-      "S4NocChannel_ctor(&self->channel, ${if (serverLhs) srcS4Noc.core else destS4Noc.core});"
+      "S4NOCPollChannel_ctor(&self->channel, ${if (serverLhs) srcS4Noc.core else destS4Noc.core});"
 
   override val codeType: String
-    get() = "S4NocChannel"
+    get() = "S4NOCPollChannel"
 }
 
 class UcCustomChannel(
diff --git a/make/patmos/patmos-lfc.mk b/make/patmos/patmos-lfc.mk
@@ -7,12 +7,14 @@ endif
 
 # Check if this is a federated program
 ifdef LF_FED
+  $(info Building federated program: $(LF_MAIN) with federation: $(LF_FED))
   # Name of your application
   APPLICATION ?= $(LF_MAIN)-$(LF_FED)
 
   # Path of generated lf c-code
   LF_SRC_GEN_PATH ?= $(CURDIR)/src-gen/$(LF_MAIN)/$(LF_FED)
 else
+  $(info Building non-federated program: $(LF_MAIN))
   # Name of your application
   APPLICATION ?= $(LF_MAIN)
 
diff --git a/make/patmos/patmos.mk b/make/patmos/patmos.mk
@@ -33,4 +33,6 @@ SOURCES += $(REACTOR_UC_PATH)/external/proto/message.pb.c
 CFLAGS += -O2 
 CFLAGS += -Wall -Wextra
 CFLAGS += -DPLATFORM_PATMOS 
-            
+CFLAGS += -DNETWORK_CHANNEL_S4NOC 
+CFLAGS += -DSCHEDULER_DYNAMIC
+CFLAGS += -DFEDERATED
diff --git a/src/platform/patmos/s4noc_channel.c b/src/platform/patmos/s4noc_channel.c
@@ -112,9 +112,8 @@ void S4NOCPollChannel_poll(NetworkChannel *untyped_self) {
   }
 }
 
-void S4NOCPollChannel_ctor(S4NOCPollChannel *self, Environment *env, unsigned int destination_core) {
-  assert(self != NULL);
-  assert(env != NULL);
+void S4NOCPollChannel_ctor(S4NOCPollChannel *self, unsigned int destination_core) {
+  assert(self != NULL); 
 
   self->super.super.mode = NETWORK_CHANNEL_MODE_POLLED;
   self->super.super.expected_connect_duration = SEC(0);
diff --git a/test/platform/patmos/s4noc_channel_test/Makefile b/test/platform/patmos/s4noc_channel_test/Makefile
@@ -9,9 +9,6 @@ BUILD_DIR = $(CURDIR)/build
 # Source files
 SOURCES += $(SRC_DIR)/$(APP).c 
 
-CFLAGS += -DNETWORK_CHANNEL_S4NOC 
-CFLAGS += -DSCHEDULER_DYNAMIC
-CFLAGS += -DFEDERATED
 CFLAGS += -DLF_LOG_LEVEL_ALL=LF_LOG_LEVEL_INFO
 
 # Output binary
diff --git a/test/platform/patmos/s4noc_channel_test/main.c b/test/platform/patmos/s4noc_channel_test/main.c
@@ -26,11 +26,14 @@ NetworkChannel *receiver = (NetworkChannel *)&receiver_channel.super;
 bool receiver_callback_called = false;
 
 void setUp(void) {
+    /* init environment */
     FederatedEnvironment_ctor(&fed_env, &parent, NULL, false, net_bundles, 2, &startup_coordinator, NULL);
 
-    S4NOCPollChannel_ctor(&sender_channel, &fed_env.super, DESTINATION_CORE);
-    S4NOCPollChannel_ctor(&receiver_channel, &fed_env.super, SOURCE_CORE);
+    /* init channel */
+    S4NOCPollChannel_ctor(&sender_channel, DESTINATION_CORE);
+    S4NOCPollChannel_ctor(&receiver_channel, SOURCE_CORE);
 
+    /* init bundles */
     FederatedConnectionBundle_ctor(&sender_bundle, &parent, sender, NULL, NULL, 0, NULL, NULL, 0, 0);
     FederatedConnectionBundle_ctor(&receiver_bundle, &parent, receiver, NULL, NULL, 0, NULL, NULL, 0, 0);
 

Original file line number	Diff line number	Diff line change
`@@ -32,13 +32,13 @@ reactor Dst {`
`32`	`32`	`=}`
`33`	`33`	`}`
`34`	`34`
`35`		`-main reactor {`
	`35`	`+federated reactor {`
`36`	`36`	`@interface_s4noc(core=0)`
`37`	`37`	`r1 = new Src(id=42)`
`38`	`38`
`39`	`39`	`@interface_s4noc(core=1)`
`40`	`40`	`r2 = new Dst()`
`41`	`41`
`42`		`- @link(left="0", right="1")`
	`42`	`+ // @link(left="0", right="1")`
`43`	`43`	`r1.out -> r2.in`
`44`	`44`	`}`