fpga config and download

Author: EhsanKhodadad

examples/patmos/s4noc_fed_lf/build.sh

@@ -24,5 +24,18 @@ popd
 mkdir -p $BIN_DIR
 
 patmos-clang -O2 -Wall -Wextra main.c ./$LF_MAIN/r1/bin/$LF_MAIN.a ./$LF_MAIN/r2/bin/$LF_MAIN.a -o $BIN_DIR/$LF_MAIN
-patemu $BIN_DIR/$LF_MAIN
+read -t 10 -p "Choose action: [e]mulate or [f]pga? (default: e) " action
+action=${action:-e}
+if [[ "$action" == "e" ]]; then
+    patemu $BIN_DIR/$LF_MAIN
+elif [[ "$action" == "f" ]]; then
+    if jtagconfig | grep -q "USB-Blaster"; then
+        mv $BIN_DIR/$LF_MAIN ~/t-crest/patmos/tmp/$LF_MAIN.elf
+        make -C ~/t-crest/patmos APP=$LF_MAIN config download
+    else
+        echo "JTAG not connected. Please connect USB-Blaster."
+    fi 
+else
+    echo "Invalid option. Please choose 'e' for emulate or 'f' for fpga."
+fi
 

lfc/core/src/main/kotlin/org/lflang/generator/uc/UcNetworkChannel.kt

@@ -402,8 +402,7 @@ class UcS4NocChannel(
   private val srcS4Noc = src
   private val destS4Noc = dest
 
-  override fun generateChannelCtorSrc() =
-      "S4NOCPollChannel_ctor(&self->channel, ${srcS4Noc.core});"
+  override fun generateChannelCtorSrc() = "S4NOCPollChannel_ctor(&self->channel, ${srcS4Noc.core});"
 
   override fun generateChannelCtorDest() =
       "S4NOCPollChannel_ctor(&self->channel, ${destS4Noc.core});"

src/platform/patmos/patmos.c

@@ -23,6 +23,7 @@ lf_ret_t PlatformPatmos_wait_until_interruptible(Platform *super, instant_t wake
   PlatformPatmos *self = (PlatformPatmos *)super;
 
   instant_t now = super->get_physical_time(super);
+  LF_DEBUG(PLATFORM, "PlatformPatmos_wait_until_interruptible: now: %llu sleeping until %llu", now, wakeup_time);
 
   // Do busy sleep
   do {
@@ -44,6 +45,7 @@ lf_ret_t PlatformPatmos_wait_until(Platform *super, instant_t wakeup_time) {
   }
 
   instant_t now = super->get_physical_time(super);
+  LF_DEBUG(PLATFORM, "PlatformPatmos_wait_until: now: %llu sleeping until %llu", now, wakeup_time);
 
   // Do busy sleep
   do {
@@ -59,11 +61,12 @@ lf_ret_t PlatformPatmos_wait_for(Platform *super, interval_t duration) {
 
   instant_t now = super->get_physical_time(super);
   instant_t wakeup = now + duration;
+  LF_DEBUG(PLATFORM, "PlatformPatmos_wait_for: now: %llu sleeping for %llu", now, duration);
 
   // Do busy sleep
   do {
     now = super->get_physical_time(super);
-  } while ((now < wakeup));
+  } while (now < wakeup);
 
   return LF_OK;
 }

src/platform/patmos/s4noc_channel.c

@@ -86,9 +86,10 @@ void S4NOCPollChannel_poll(NetworkChannel *untyped_self) {
 
   int value = *s4noc_data;
   int source = *s4noc_source;
-  S4NOC_CHANNEL_INFO("S4NOCPollChannel_poll: Received data 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 data 0x%08x (%c%c%c%c) from source %d", value,
+                     ((char *)&value)[0], ((char *)&value)[1], ((char *)&value)[2], ((char *)&value)[3], source);
+  // Get the receive channel for the source core
+  S4NOCPollChannel *receive_channel = s4noc_global_state.core_channels[source][get_cpuid()];
 
   ((int *)receive_channel->receive_buffer)[receive_channel->receive_buffer_index / 4] = value;
   receive_channel->receive_buffer_index += 4;
@@ -116,7 +117,7 @@ void S4NOCPollChannel_poll(NetworkChannel *untyped_self) {
 }
 
 void S4NOCPollChannel_ctor(S4NOCPollChannel *self, unsigned int destination_core) {
-  assert(self != NULL); 
+  assert(self != NULL);
 
   self->super.super.mode = NETWORK_CHANNEL_MODE_POLLED;
   self->super.super.expected_connect_duration = SEC(0);
@@ -135,4 +136,7 @@ void S4NOCPollChannel_ctor(S4NOCPollChannel *self, unsigned int destination_core
   self->federated_connection = NULL;
   self->state = NETWORK_CHANNEL_STATE_CONNECTED;
   self->destination_core = destination_core;
+  memset(self->receive_buffer, 0, S4NOC_CHANNEL_BUFFERSIZE);
+  memset(self->write_buffer, 0, S4NOC_CHANNEL_BUFFERSIZE);
+  
 }

test/platform/patmos/s4noc_channel_test/run.sh

@@ -1,7 +1,21 @@
 #!/bin/bash
-
+LF_MAIN=main
+BIN_DIR=./build
 # Make test
 make clean
 make all
-patemu ./build/*.elf
+read -t 10 -p "Choose action: [e]mulate or [f]pga? (default: e) " action
+action=${action:-e}
+if [[ "$action" == "e" ]]; then
+    patemu $BIN_DIR/$LF_MAIN.elf
+elif [[ "$action" == "f" ]]; then
+    if jtagconfig | grep -q "USB-Blaster"; then
+        mv $BIN_DIR/$LF_MAIN.elf ~/t-crest/patmos/tmp/$LF_MAIN.elf
+        make -C ~/t-crest/patmos APP=$LF_MAIN config download
+    else
+        echo "JTAG not connected. Please connect USB-Blaster."
+    fi 
+else
+    echo "Invalid option. Please choose 'e' for emulate or 'f' for fpga."
+fi