Patmos and s4noc support: 6

EhsanKhodadad · EhsanKhodadad · commit 59c00dc72d78 · 2025-06-10T15:48:13.000+02:00
diff --git a/examples/patmos/hello_lf/Makefile b/examples/patmos/hello_lf/Makefile
@@ -11,12 +11,13 @@ endif
 
 # ---- Patmos specific configuration ----
 include ./src-gen/$(LF_MAIN)/Makefile
+include $(REACTOR_UC_PATH)/make/patmos/patmos-lfc.mk
 
-SRC = $(REACTOR_UC_PATH)/src/*.c
-SRC += $(patsubst %, $(SRC_GEN_PATH)/%, $(LFC_GEN_SOURCES) $(LFC_GEN_MAIN)) 
+SOURCES += $(patsubst %, $(SRC_GEN_PATH)/%, $(LFC_GEN_SOURCES) $(LFC_GEN_MAIN)) 
 
-INC = -I$(REACTOR_UC_PATH)/include -I$(REACTOR_UC_PATH)/external -I$(SRC_GEN_PATH)
-FLG = -DPLATFORM_PATMOS -DSCHEDULER_DYNAMIC -DEVENT_QUEUE_SIZE=$(EVENT_QUEUE_SIZE) -DREACTION_QUEUE_SIZE=$(REACTION_QUEUE_SIZE) -O2
+CFLAGS += -DSCHEDULER_DYNAMIC 
+CFLAGS += -DEVENT_QUEUE_SIZE=$(EVENT_QUEUE_SIZE) 
+CFLAGS += -DREACTION_QUEUE_SIZE=$(REACTION_QUEUE_SIZE) 
 
 # Output directory
 BIN_DIR = $(CURDIR)/bin
@@ -25,9 +26,9 @@ OUTPUT = $(BIN_DIR)/$(LF_MAIN)
 all: $(OUTPUT)
 
 # Build rule
-$(OUTPUT): $(SRC)
+$(OUTPUT): $(SOURCES)
 	mkdir -p $(BIN_DIR)
-	patmos-clang $(SRC) $(INC) $(FLG) -o $(OUTPUT) -Wno-everything
+	$(CC) $(SOURCES) $(CFLAGS) -o $(OUTPUT)
 
 clean:
 	rm -rf $(BIN_DIR) ./src-gen
diff --git a/include/reactor-uc/event.h b/include/reactor-uc/event.h
@@ -7,10 +7,10 @@
 #include <stdbool.h>
 
 #define EVENT_INIT(Tag, Trigger, Payload)                                                                              \
-  {.super.type = EVENT, .super.tag = Tag, .intended_tag = Tag, .trigger = Trigger, .super.payload = Payload}
+  { .super.type = EVENT, .super.tag = Tag, .intended_tag = Tag, .trigger = Trigger, .super.payload = Payload }
 
 #define SYSTEM_EVENT_INIT(Tag, Handler, Payload)                                                                       \
-  {.super.type = SYSTEM_EVENT, .super.tag = Tag, .super.payload = Payload, .handler = Handler}
+  { .super.type = SYSTEM_EVENT, .super.tag = Tag, .super.payload = Payload, .handler = Handler }
 
 typedef struct Trigger Trigger;
 typedef struct SystemEventHandler SystemEventHandler;
diff --git a/include/reactor-uc/platform/patmos/s4noc_channel.h b/include/reactor-uc/platform/patmos/s4noc_channel.h
@@ -32,7 +32,7 @@ struct S4NOCPollChannel {
 
   FederatedConnectionBundle *federated_connection;
   void (*receive_callback)(FederatedConnectionBundle *conn, const FederateMessage *message);
-  pthread_t worker_thread; 
+  pthread_t worker_thread;
 };
 
 void S4NOCPollChannel_ctor(S4NOCPollChannel *self, Environment *env, unsigned int destination_core);
diff --git a/include/reactor-uc/tag.h b/include/reactor-uc/tag.h
@@ -40,14 +40,19 @@
     .time = NEVER, .microstep = NEVER_MICROSTEP                                                                        \
   }
 // Need a separate initializer expression to comply with some C compilers
-#define NEVER_TAG_INITIALIZER {NEVER, NEVER_MICROSTEP}
+#define NEVER_TAG_INITIALIZER                                                                                          \
+  { NEVER, NEVER_MICROSTEP }
 #define FOREVER_TAG                                                                                                    \
   (tag_t) {                                                                                                            \
     .time = FOREVER, .microstep = FOREVER_MICROSTEP                                                                    \
   }
 // Need a separate initializer expression to comply with some C compilers
-#define FOREVER_TAG_INITIALIZER {FOREVER, FOREVER_MICROSTEP}
-#define ZERO_TAG (tag_t){.time = 0LL, .microstep = 0u}
+#define FOREVER_TAG_INITIALIZER                                                                                        \
+  { FOREVER, FOREVER_MICROSTEP }
+#define ZERO_TAG                                                                                                       \
+  (tag_t) {                                                                                                            \
+    .time = 0LL, .microstep = 0u                                                                                       \
+  }
 
 // Returns true if timeout has elapsed.
 #define CHECK_TIMEOUT(start, duration) (lf_time_physical() > ((start) + (duration)))
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
@@ -135,8 +135,8 @@ class UcFederatedTemplateGenerator(
   private fun generateFilesPatmos() {
     val make =
         """
-            |# Compiler and tools for PATMOS
-            |CC = patmos-clang
+            |LF_MAIN ?= ${mainDef.name}
+            |LF_FED ?= ${federate.name}
             |
             |# Paths
             |SRC_DIR = src-gen/${mainDef.name}/${federate.name}
@@ -145,9 +145,6 @@ class UcFederatedTemplateGenerator(
             |# Source files
             |SOURCES = $S(SRC_DIR)/*.c
             |
-            |# Compiler flags
-            |CFLAGS = -O2 -Wall -Wextra -Werror
-            |
             |# Output binary
             |OUTPUT = $S(BUILD_DIR)/${federate.name}.elf
             |
@@ -157,10 +154,8 @@ class UcFederatedTemplateGenerator(
             |	mkdir -p $S(BUILD_DIR)
             |	$S(CC) $S(CFLAGS) $S(SOURCES) -o $S(OUTPUT)
             |
-            |clean:
-            |	rm -rf $S(BUILD_DIR)
-            |
             |.PHONY: all clean
+            |include $S(REACTOR_UC_PATH)/make/patmos/patmos-lfc.mk
         """
             .trimMargin()
     FileUtil.writeToFile(make, projectRoot.resolve("Makefile"))
diff --git a/make/patmos/patmos-lfc.mk b/make/patmos/patmos-lfc.mk
@@ -5,10 +5,6 @@ ifndef LF_MAIN
   $(error LF_MAIN is not defined. Please define it!)
 endif
 
-# ifndef RIOTBASE
-#   $(error RIOTBASE is not defined. Please define it!)
-# endif
-
 # Check if this is a federated program
 ifdef LF_FED
   # Name of your application
@@ -29,8 +25,6 @@ endif
 ifeq ($(firstword $(MAKECMDGOALS)),clean)
   # Delete src-gen folder if build target is "clean"
   _ :=  $(shell rm -rf $(LF_SRC_GEN_PATH))
-
-#   include $(RIOTBASE)/Makefile.include
 else
   # Include the Makefile of the generated target application
   include $(LF_SRC_GEN_PATH)/Makefile
diff --git a/make/patmos/patmos.mk b/make/patmos/patmos.mk
@@ -2,6 +2,9 @@
 # This Makefile is used to build the Patmos platform for the Reactor-UC project.
 # It includes the necessary paths, sources, and compiler flags for the Patmos architecture.
 
+# Compiler and tools for PATMOS
+CC = patmos-clang
+
 # Includes
 CFLAGS += -I$(REACTOR_UC_PATH)/ 
 CFLAGS += -I$(REACTOR_UC_PATH)/include 
@@ -26,3 +29,8 @@ SOURCES += $(wildcard $(REACTOR_UC_PATH)/src/*.c)
 
 SOURCES += $(wildcard $(REACTOR_UC_PATH)/external/nanopb/*.c)
 SOURCES += $(REACTOR_UC_PATH)/external/proto/message.pb.c
+
+CFLAGS += -O2 
+CFLAGS += -Wall -Wextra
+CFLAGS += -DPLATFORM_PATMOS 
+            
diff --git a/src/platform/patmos/patmos.c b/src/platform/patmos/patmos.c
@@ -21,7 +21,6 @@ instant_t PlatformPatmos_get_physical_time(Platform *super) {
 lf_ret_t PlatformPatmos_wait_until_interruptible(Platform *super, instant_t wakeup_time) {
   PlatformPatmos *self = (PlatformPatmos *)super;
   self->async_event = false;
-  //super->leave_critical_section(super); // turing on interrupts
 
   instant_t now = super->get_physical_time(super);
 
@@ -30,8 +29,6 @@ lf_ret_t PlatformPatmos_wait_until_interruptible(Platform *super, instant_t wake
     now = super->get_physical_time(super);
   } while ((now < wakeup_time) && !self->async_event);
 
-  //super->enter_critical_section(super);
-
   if (self->async_event) {
     self->async_event = false;
     return LF_ERR;
@@ -44,8 +41,6 @@ lf_ret_t PlatformPatmos_wait_until_interruptible(Platform *super, instant_t wake
     return LF_OK;
   }
 
-  //super->leave_critical_section(super);
-
   return LF_OK;
 }
 
@@ -131,5 +126,5 @@ void Mutex_ctor(Mutex *super) {
   MutexPatmos *self = (MutexPatmos *)super;
   super->lock = MutexPatmos_lock;
   super->unlock = MutexPatmos_unlock;
-  //critical_section_init(&self->crit_sec);
-}
+  // critical_section_init(&self->crit_sec);
+}
diff --git a/src/platform/patmos/s4noc_channel.c b/src/platform/patmos/s4noc_channel.c
@@ -40,7 +40,7 @@ static lf_ret_t S4NOCPollChannel_send_blocking(NetworkChannel *untyped_self, con
 
   if (self->state == NETWORK_CHANNEL_STATE_CONNECTED) {
     int message_size = serialize_to_protobuf(message, self->write_buffer + 4, S4NOC_CHANNEL_BUFFERSIZE - 4);
-    
+
     *((int *)self->write_buffer) = message_size;
 
     int total_size = message_size + 4;
@@ -83,31 +83,31 @@ void S4NOCPollChannel_poll(NetworkChannel *untyped_self) {
 
   int value = *s4noc_data;
   int source = *s4noc_source;
-  S4NOC_CHANNEL_INFO("S4NOCPollChannel_poll: Received value 0x%08x (%c%c%c%c) from source %d", value, 
-    ((char *)&value)[0], ((char *)&value)[1], ((char *)&value)[2], ((char *)&value)[3], source);
-  S4NOCPollChannel *receive_channel = s4noc_global_state.core_channels[source][get_cpuid()]; // Get the receive channel for the source core
+  S4NOC_CHANNEL_INFO("S4NOCPollChannel_poll: Received value 0x%08x (%c%c%c%c) from source %d", value,
+                     ((char *)&value)[0], ((char *)&value)[1], ((char *)&value)[2], ((char *)&value)[3], source);
+  S4NOCPollChannel *receive_channel =
+      s4noc_global_state.core_channels[source][get_cpuid()]; // Get the receive channel for the source core
 
   ((int *)receive_channel->receive_buffer)[receive_channel->receive_buffer_index / 4] = value;
   receive_channel->receive_buffer_index += 4;
   S4NOC_CHANNEL_DEBUG("receive_buffer_index %d", receive_channel->receive_buffer_index);
   unsigned int expected_message_size = *((int *)receive_channel->receive_buffer);
   S4NOC_CHANNEL_DEBUG("Expected message size: %d", expected_message_size);
   if (receive_channel->receive_buffer_index >= expected_message_size + 4) {
-    int bytes_left = deserialize_from_protobuf(
-        &receive_channel->output,
-        receive_channel->receive_buffer + 4, // skip the 4-byte size header
-        expected_message_size                // only the message payload
+    int bytes_left = deserialize_from_protobuf(&receive_channel->output,
+                                               receive_channel->receive_buffer + 4, // skip the 4-byte size header
+                                               expected_message_size                // only the message payload
     );
     S4NOC_CHANNEL_DEBUG("Bytes Left after attempted to deserialize: %d", bytes_left);
 
     if (bytes_left >= 0) {
-        receive_channel->receive_buffer_index = bytes_left;
-        if (receive_channel->receive_callback != NULL) {
-            S4NOC_CHANNEL_DEBUG("calling user callback at %p!", receive_channel->receive_callback);
-            receive_channel->receive_callback(self->federated_connection, &receive_channel->output);
-        } else {
-            S4NOC_CHANNEL_WARN("No receive callback registered, dropping message");
-        }
+      receive_channel->receive_buffer_index = bytes_left;
+      if (receive_channel->receive_callback != NULL) {
+        S4NOC_CHANNEL_DEBUG("calling user callback at %p!", receive_channel->receive_callback);
+        receive_channel->receive_callback(self->federated_connection, &receive_channel->output);
+      } else {
+        S4NOC_CHANNEL_WARN("No receive callback registered, dropping message");
+      }
     }
   }
 }
@@ -132,5 +132,5 @@ void S4NOCPollChannel_ctor(S4NOCPollChannel *self, Environment *env, unsigned in
   self->receive_callback = NULL;
   self->federated_connection = NULL;
   self->state = NETWORK_CHANNEL_STATE_CONNECTED;
-  self->destination_core = destination_core; 
+  self->destination_core = destination_core;
 }
diff --git a/src/platform/pico/uart_channel.c b/src/platform/pico/uart_channel.c
@@ -9,10 +9,14 @@
 #define UART_CHANNEL_INFO(fmt, ...) LF_INFO(NET, "UartPolledChannel: " fmt, ##__VA_ARGS__)
 #define UART_CHANNEL_DEBUG(fmt, ...) LF_DEBUG(NET, "UartPolledChannel: " fmt, ##__VA_ARGS__)
 
-#define UART_OPEN_MESSAGE_REQUEST {0xC0, 0x18, 0x11, 0xC0, 0xDD}
-#define UART_OPEN_MESSAGE_RESPONSE {0xC0, 0xFF, 0x31, 0xC0, 0xDD}
-#define UART_MESSAGE_PREFIX {0xAA, 0xAA, 0xAA, 0xAA, 0xAA}
-#define UART_MESSAGE_POSTFIX {0xBB, 0xBB, 0xBB, 0xBB, 0xBD}
+#define UART_OPEN_MESSAGE_REQUEST                                                                                      \
+  { 0xC0, 0x18, 0x11, 0xC0, 0xDD }
+#define UART_OPEN_MESSAGE_RESPONSE                                                                                     \
+  { 0xC0, 0xFF, 0x31, 0xC0, 0xDD }
+#define UART_MESSAGE_PREFIX                                                                                            \
+  { 0xAA, 0xAA, 0xAA, 0xAA, 0xAA }
+#define UART_MESSAGE_POSTFIX                                                                                           \
+  { 0xBB, 0xBB, 0xBB, 0xBB, 0xBD }
 #define UART_CLOSE_MESSAGE {0x2, 0xF, 0x6, 0xC, 0x2};
 #define MINIMUM_MESSAGE_SIZE 10
 #define UART_CHANNEL_EXPECTED_CONNECT_DURATION MSEC(2500)
diff --git a/test/platform/patmos/hello/Makefile b/test/platform/patmos/hello/Makefile
diff --git a/test/platform/patmos/hello/hello.c b/test/platform/patmos/hello/hello.c
diff --git a/test/platform/patmos/hello/run.sh b/test/platform/patmos/hello/run.sh
diff --git a/test/platform/patmos/s4noc_channel_test/Makefile b/test/platform/patmos/s4noc_channel_test/Makefile
@@ -1,7 +1,5 @@
 # Makefile for building a simple Hello World program for the Patmos platform
 APP = main
-# Compiler and tools for PATMOS
-CC = patmos-clang
 
 include $(CURDIR)/../../../../make/patmos/patmos.mk
 # Paths
@@ -11,11 +9,10 @@ BUILD_DIR = $(CURDIR)/build
 # Source files
 SOURCES += $(SRC_DIR)/$(APP).c 
 
-CFLAGS += -O2 
-CFLAGS += -DPLATFORM_PATMOS 
 CFLAGS += -DNETWORK_CHANNEL_S4NOC 
 CFLAGS += -DSCHEDULER_DYNAMIC
 CFLAGS += -DFEDERATED
+CFLAGS += -DLF_LOG_LEVEL_ALL=LF_LOG_LEVEL_INFO
 
 # Output binary
 OUTPUT = $(BUILD_DIR)/$(APP).elf
diff --git a/test/platform/patmos/s4noc_channel_test/main.c b/test/platform/patmos/s4noc_channel_test/main.c
@@ -45,7 +45,6 @@ void tearDown(void) {
 }
 
 void receiver_callback_handler(FederatedConnectionBundle *self, const FederateMessage *_msg) {
-    LF_INFO(NET, "Receiver callback handler called");
     (void)self;
     const TaggedMessage *msg = &_msg->message.tagged_message;
     LF_INFO(NET,"Receiver: Received message with connection number %i and content %s\n", msg->conn_id,
@@ -72,7 +71,7 @@ void send_message(void) {
 void receive_message(void) {
     int tries = 0;
     do {
-        LF_WARN(NET, "Receiver: Polling for messages, tries: %i\n", tries);
+        LF_DEBUG(NET, "Receiver: Polling for messages, tries: %i\n", tries);
         tries++;
         ((PolledNetworkChannel *)&receiver_channel.super)->poll((PolledNetworkChannel *)&receiver_channel.super);
     } while (receiver_callback_called == false && tries < MAX_TRIES);
diff --git a/test/platform/patmos/s4noc_test/Makefile b/test/platform/patmos/s4noc_test/Makefile
diff --git a/test/platform/patmos/s4noc_test/main.c b/test/platform/patmos/s4noc_test/main.c
diff --git a/test/platform/patmos/s4noc_test/run.sh b/test/platform/patmos/s4noc_test/run.sh
