Patmos and s4noc support

Author: EhsanKhodadad

src/platform/patmos/s4noc_channel.c

@@ -44,6 +44,7 @@ static lf_ret_t S4NOCPollChannel_send_blocking(NetworkChannel *untyped_self, con
     *((int *)self->write_buffer) = message_size;
 
     int total_size = message_size + 4;
+    *s4noc_dest = self->destination_core;
     int bytes_send = 0;
     while (bytes_send < total_size) {
       *s4noc_data = ((int *)self->write_buffer)[bytes_send / 4];
@@ -69,20 +70,20 @@ static void S4NOCPollChannel_register_receive_callback(NetworkChannel *untyped_s
 
 void S4NOCPollChannel_poll(NetworkChannel *untyped_self) {
   S4NOCPollChannel *self = (S4NOCPollChannel *)untyped_self;
-  LF_INFO(NET, "S4NOCPollChannel_poll called");
+  S4NOC_CHANNEL_INFO("S4NOCPollChannel_poll called");
 
   volatile _IODEV int *s4noc_status = (volatile _IODEV int *)PATMOS_IO_S4NOC;
   volatile _IODEV int *s4noc_data = (volatile _IODEV int *)(PATMOS_IO_S4NOC + 4);
   volatile _IODEV int *s4noc_source = (volatile _IODEV int *)(PATMOS_IO_S4NOC + 8);
 
   if (((*s4noc_status) & 0x02) == 0) {
-    LF_INFO(NET, "S4NOCPollChannel_poll: No data available");
+    S4NOC_CHANNEL_INFO("S4NOCPollChannel_poll: No data available");
     return;
   }
 
   int value = *s4noc_data;
   int source = *s4noc_source;
-  LF_INFO(NET, "S4NOCPollChannel_poll: Received value 0x%08x (%c%c%c%c) from source %d", value, 
+  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
 

test/platform/patmos/s4noc_channel_test/main.c

@@ -7,7 +7,8 @@
 #define MESSAGE_CONTENT "Hello S4NOC"
 #define MESSAGE_CONNECTION_ID 42
 #define SOURCE_CORE 1
-#define DESTINATION_CORE 0
+#define DESTINATION_CORE 2
+#define MAX_TRIES 10
 
 Reactor parent;
 FederatedEnvironment fed_env;
@@ -34,6 +35,7 @@ void setUp(void) {
     FederatedConnectionBundle_ctor(&receiver_bundle, &parent, receiver, NULL, NULL, 0, NULL, NULL, 0, 0);
 
     s4noc_global_state.core_channels[SOURCE_CORE][DESTINATION_CORE] = &receiver_channel;
+    s4noc_global_state.core_channels[DESTINATION_CORE][SOURCE_CORE] = &sender_channel;
 
 }
 
@@ -63,30 +65,41 @@ void send_message(void) {
     const char *message = MESSAGE_CONTENT;
     memcpy(port_message->payload.bytes, message, sizeof(MESSAGE_CONTENT)); // NOLINT
     port_message->payload.size = sizeof(MESSAGE_CONTENT);
-    LF_INFO(NET, "Sender: Sending message with connection number %i and content %s\n", port_message->conn_id,
-           (char *)port_message->payload.bytes);
+    LF_INFO(NET, "Sender: Sending message with connection number %i and content %s\n", port_message->conn_id, (char *)port_message->payload.bytes);
     TEST_ASSERT_OK(sender->send_blocking(sender, &msg));
 }
 
+void receive_message(void) {
+    int tries = 0;
+    do {
+        LF_WARN(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);
+}
+
 void test_sender_send_and_receiver_recv(void) {
     TEST_ASSERT_OK(sender->open_connection(sender));
     TEST_ASSERT_OK(receiver->open_connection(receiver));
 
     receiver->register_receive_callback(receiver, receiver_callback_handler, NULL);
 
     if(pthread_create(&sender_channel.worker_thread, NULL, send_message, NULL)) {
-        LF_INFO(NET,"Error creating thread\n");
+        LF_ERR(NET,"Error creating thread\n");
+        return;
+    }
+    if(pthread_create(&receiver_channel.worker_thread, NULL, receive_message, NULL)) {
+        LF_ERR(NET,"Error creating thread\n");
         return;
     }
     if (pthread_join(sender_channel.worker_thread, NULL)) {
-        LF_INFO(NET,"Error joining thread\n");
+        LF_ERR(NET,"Error joining thread\n");
+        return;
+    }
+    if (pthread_join(receiver_channel.worker_thread, NULL)) {
+        LF_ERR(NET,"Error joining thread\n");
         return;
     }
-
-    do {
-        LF_INFO(NET, "Receiver: Waiting for callback to be called\n");
-        ((PolledNetworkChannel *)&receiver_channel.super)->poll((PolledNetworkChannel *)&receiver_channel.super);
-    } while(!receiver_callback_called);
 
     TEST_ASSERT_TRUE(receiver_callback_called);
 }
@@ -95,4 +108,4 @@ int main(void) {
     UNITY_BEGIN();
     RUN_TEST(test_sender_send_and_receiver_recv);
     return UNITY_END();
-}
+}

test/platform/patmos/s4noc_test/main.c

@@ -5,6 +5,9 @@
 #include <machine/rtc.h>
 #include <pthread.h>
 
+#define SOURCE_CORE 1
+#define DESTINATION_CORE 2
+
 typedef int64_t instant_t;
 typedef int64_t interval_t;
 
@@ -54,7 +57,7 @@ void sender_function() {
     volatile _IODEV int *s4noc_data   = (volatile _IODEV int *) (PATMOS_IO_S4NOC + 4);
     volatile _IODEV int *s4noc_dest   = (volatile _IODEV int *) (PATMOS_IO_S4NOC + 8);
 
-    *s4noc_dest = 2;
+    *s4noc_dest = DESTINATION_CORE;
     for (int i = 0; i < MAX_ITER; i++) { 
         int status = (*s4noc_status) & 0x01; 
         while (status == 0) {