Patmos and S4NoC 9

Author: EhsanKhodadad

.gitignore

@@ -11,3 +11,6 @@ cmake-build-release
 doc/html
 doc/latex
 doc/markdown/platform
+*.o
+*.bc
+*.elf

examples/patmos/s4noc_fed_lf/S4NoCFedLF/r1/Makefile

@@ -6,16 +6,29 @@ include $(REACTOR_UC_PATH)/make/patmos/patmos-lfc.mk
 # ---- Patmos specific configuration ----
 # Output directory
 BIN_DIR = $(CURDIR)/bin
-OUTPUT = $(BIN_DIR)/$(LF_MAIN)
+OBJ_DIR = $(CURDIR)/obj
+OUTPUT = $(BIN_DIR)/$(LF_MAIN).a
+# OBJECTS = $(patsubst %.c,$(OBJ_DIR)/%.o,$(SOURCES))
+OBJECTS = $(SOURCES:.c=.bc)
+
 all: $(OUTPUT)
- $(info Building $(LF_MAIN) federate $(LF_FED))
- $(info Output directory: $(BIN_DIR))
- $(info Output binary: $(OUTPUT))
+	$(info Building $(LF_MAIN) federate $(LF_FED))
+	$(info Output directory: $(BIN_DIR))
+	$(info Output binary: $(OUTPUT))
+	$(info Sources: $(SOURCES))
+	$(info Compiler: $(CC))
+	$(info Compiler flags: $(CFLAGS))
 
 # Build rule
-$(OUTPUT): $(SOURCES)
-	 mkdir -p $(BIN_DIR)
-	$(CC) $(SOURCES) $(CFLAGS) -o $(OUTPUT)
+$(OUTPUT): $(OBJECTS)
+	mkdir -p $(BIN_DIR)
+	$(CC) -c $(SOURCES) $(CFLAGS)
+	llvm-ar rcs $@ $(OBJECTS) 
+
+%.bc: %.c
+	mkdir -p $(OBJ_DIR)
+	$(CC) -emit-llvm -c $< -o $@ $(CFLAGS)
+
 # Clean rule
 clean:
 	 rm -rf $(BIN_DIR)

examples/patmos/s4noc_fed_lf/S4NoCFedLF/r2/Makefile

@@ -6,16 +6,29 @@ include $(REACTOR_UC_PATH)/make/patmos/patmos-lfc.mk
 # ---- Patmos specific configuration ----
 # Output directory
 BIN_DIR = $(CURDIR)/bin
-OUTPUT = $(BIN_DIR)/$(LF_MAIN)
+OBJ_DIR = $(CURDIR)/obj
+OUTPUT = $(BIN_DIR)/$(LF_MAIN).a
+# OBJECTS = $(patsubst %.c,$(OBJ_DIR)/%.o,$(SOURCES))
+OBJECTS = $(SOURCES:.c=.bc)
+
 all: $(OUTPUT)
- $(info Building $(LF_MAIN) federate $(LF_FED))
- $(info Output directory: $(BIN_DIR))
- $(info Output binary: $(OUTPUT))
+	$(info Building $(LF_MAIN) federate $(LF_FED))
+	$(info Output directory: $(BIN_DIR))
+	$(info Output binary: $(OUTPUT))
+	$(info Sources: $(SOURCES))
+	$(info Compiler: $(CC))
+	$(info Compiler flags: $(CFLAGS))
 
 # Build rule
-$(OUTPUT): $(SOURCES)
-	 mkdir -p $(BIN_DIR)
-	$(CC) $(SOURCES) $(CFLAGS) -o $(OUTPUT)
+$(OUTPUT): $(OBJECTS)
+	mkdir -p $(BIN_DIR)
+	$(CC) -c $(SOURCES) $(CFLAGS)
+	llvm-ar rcs $@ $(OBJECTS) 
+
+%.bc: %.c
+	mkdir -p $(OBJ_DIR)
+	$(CC) -emit-llvm -c $< -o $@ $(CFLAGS)
+
 # Clean rule
 clean:
 	 rm -rf $(BIN_DIR)

examples/patmos/s4noc_fed_lf/build.sh

@@ -1,22 +1,24 @@
 #!/bin/bash
 LF_MAIN=S4NoCFedLF
-
-# Generate configuration templates 
+BIN_DIR=bin
+# 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
 
+mkdir -p $BIN_DIR
+patmos-clang 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

examples/patmos/s4noc_fed_lf/main.c

@@ -0,0 +1,3 @@
+int main(void) {
+  return 0;
+}

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

@@ -143,17 +143,28 @@ class UcFederatedTemplateGenerator(
             |# ---- Patmos specific configuration ----
             |# Output directory
             |BIN_DIR = $(CURDIR)/bin
-            |OUTPUT = $(BIN_DIR)/$(LF_MAIN)
+            |OBJ_DIR = $(CURDIR)/obj
+            |OUTPUT = $(BIN_DIR)/$(LF_MAIN).a
+            |# OBJECTS = $(patsubst %.c,$(OBJ_DIR)/%.o,$(SOURCES))
+            |OBJECTS = $(SOURCES:.c=.bc)
             |
             |all: $(OUTPUT)
-            | $(info Building $(LF_MAIN) federate $(LF_FED))
-            | $(info Output directory: $(BIN_DIR))
-            | $(info Output binary: $(OUTPUT))
+            |	$(info Building $(LF_MAIN) federate $(LF_FED))
+            |	$(info Output directory: $(BIN_DIR))
+            |	$(info Output binary: $(OUTPUT))
+            |	$(info Sources: $(SOURCES))
+            |	$(info Compiler: $(CC))
+            |	$(info Compiler flags: $(CFLAGS))
             |
             |# Build rule
-            |$(OUTPUT): $(SOURCES)
-            |	 mkdir -p $(BIN_DIR)
-            |	 $(CC) $(SOURCES) $(CFLAGS) -o $(OUTPUT)
+            |$(OUTPUT): $(OBJECTS)
+            |	mkdir -p $(BIN_DIR)
+            |	$(CC) -c $(SOURCES) $(CFLAGS)
+            |	llvm-ar rcs $@ $(OBJECTS) 
+            |
+            |%.bc: %.c
+            |	mkdir -p $(OBJ_DIR)
+            |	$(CC) -emit-llvm -c $< -o $@ $(CFLAGS)
             |
             |# Clean rule
             |clean:

make/patmos/patmos-lfc.mk

@@ -28,14 +28,17 @@ ifeq ($(firstword $(MAKECMDGOALS)),clean)
   # Delete src-gen folder if build target is "clean"
   _ :=  $(shell rm -rf $(LF_SRC_GEN_PATH))
 else
+
   # Include the Makefile of the generated target application
   include $(LF_SRC_GEN_PATH)/Makefile
 
   # Include generated c files
   SOURCES += $(patsubst %, $(LF_SRC_GEN_PATH)/%, $(LFC_GEN_SOURCES))
 
   # Include generated main file
-  SOURCES += $(LF_SRC_GEN_PATH)/${LFC_GEN_MAIN}
+  ifndef LF_FED
+    SOURCES += $(LF_SRC_GEN_PATH)/${LFC_GEN_MAIN} 
+  endif
 
   # Include generated h files
   CFLAGS += -I$(LF_SRC_GEN_PATH)

make/patmos/patmos.mk

@@ -18,7 +18,6 @@ CFLAGS += -I$(REACTOR_UC_PATH)/external/nanopb/pb
 
 CFLAGS += -I$(REACTOR_UC_PATH)/external/proto
 
-
 CFLAGS += -I$(REACTOR_UC_PATH)/external/Unity/src
 CFLAGS += -I$(REACTOR_UC_PATH)/test/unit