Changeset 717 for branches/fault_tolerance/platform/tsar_generic_iob/Makefile

Timestamp:

Jun 23, 2014, 4:02:53 PM (10 years ago)

Author:

cfuguet

Message:

fault_tolerance/tsar_generic_iob:

• introducing the vci_iopic component on the IOX interconnect.

• the input hardware interrupts on cluster(0,0) from the external peripherals have been removed because they are connected to the vci_iopic component.

• Replacing "ad-hoc" dspin_tsar router by standard dspin_router on the RAM interconnect. To do so, in IO clusters (clusters with IOB) two crossbars are implemented:

+ One for commands which interconnects MEMC and IOB to the

local interface of RAM CMD dspin_router.

+ One for responses which interconnects local interface of RAM

RSP dspin_router to MEMC and IOB.

• Considering case of mono cluster platform: Only one IOB must be instantiated.

• Modifying IOX memory segments used by IOX network for routing:

+ bugfix: all segments of IOX interconnect must have

global id = 0.

+ Adding XICU segments with special attribute. This

attribute is used by IOB to determine if a command coming
from external DMA peripheral should be routed
through INT or RAM networks.

+ Using bit 32 of physical address to determine if an

external DMA command should be routed through IOB0
or IOB1.

File:

• branches/fault_tolerance/platform/tsar_generic_iob/Makefile (modified) (4 diffs)

branches/fault_tolerance/platform/tsar_generic_iob/Makefile

@@ -1 @@
-SOCLIB_CC := soclib-cc
-RM        := rm -rf
-CP        := cp -f
-MAKE      := make
-TARGET    := simul.x
-ARGS      ?=
+ARGS           ?=
+SOCLIB_CC      := soclib-cc
+RM             := rm -rf
+CP             := cp -f
+MAKE           := make
+CONFIG_DIR     := $(PWD)/conf
 
-all: $(TARGET) preloader tags
+TARGET         := simul.x
+
+all: $(TARGET) tags
 
 # create simulator
@@ -13 +15 @@
 SRCS += tsar_iob_cluster/caba/source/src/tsar_iob_cluster.cpp
 INCS := tsar_iob_cluster/caba/source/include/tsar_iob_cluster.h
+INCS += $(CONFIG_DIR)/hard_config.h
 INCS += top.desc
 INCS += soclib.conf
 
-$(TARGET): $(SRCS) $(INCS)
+$(TARGET): $(SRCS) $(INCS) soclib.conf
         $(SOCLIB_CC) -P -p top.desc -I. -o simul.x
 
 # create preloader
 
-MESHSIZE       := 4c1p
-PRELOADER_CONF := $(PWD)/conf/preloader_$(MESHSIZE)
 PRELOADER_PATH := $(TSARPATH)/trunk/softs/tsar_boot
-PRELOADER_ARGS := "PLATFORM_DIR=$(PRELOADER_CONF) USE_DT=0 SOCLIB=1"
+PRELOADER_ARGS := "PLATFORM_DIR=$(CONFIG_DIR) USE_DT=0 SOCLIB=1"
 PRELOADER_NAME ?= soft/soft.elf
 
@@ -35 +36 @@
 # run simulator
 
-SIMULATOR_ARGS  = -SOFT $(PRELOADER_NAME)
-SIMULATOR_ARGS += -DISK soft/disk.dmg
-SIMULATOR_ARGS += -XSIZE 2 -YSIZE 2 -NPROCS 1
+SOFT           ?= $(PRELOADER_NAME)
+DISK           ?= /dev/null
+
+SIMULATOR_ARGS  = -SOFT $(SOFT)
+SIMULATOR_ARGS += -DISK $(DISK)
 SIMULATOR_ARGS += $(ARGS)
 
-run: $(TARGET) $(PRELOADER_NAME)
+run: $(TARGET) $(SOFT)
         ./$< $(SIMULATOR_ARGS)
 
-# create tags file with ctags
+# create tags file with cscope
+tags: cscope.out
 
-tags:
-        $(SOCLIB_CC) -p top.desc --tags --tags-type=ctags --tags-output=$@
+cscope.out:
+        $(SOCLIB_CC) -p top.desc --tags --tags-type=cscope --tags-output=$@
 
 # clean targets
 
 clean:
+        $(SOCLIB_CC) -X 
         $(SOCLIB_CC) -x -p top.desc -I.
-        $(RM) *.o *.x tty* term*
+        $(RM) *.o *.x mtty_*
 
 clean-soft:
-        $(RM) $(PRELOADER_NAME)
+        $(RM) $(SOFT)
 
 clean-tags:
@@ -66 +71 @@
 
 
-.PHONY: tags preloader clean clean-soft clean-preloader
+.PHONY: tags simul.x preloader clean clean-soft clean-preloader