XCore target: Add target specific flags to root Makefiles.

The default value of XCORE_TARGET_NEEDS_MEMORY is 32 (MB). It should be noted that the XCore emulator's speed is affected by the size of memory. Also the amount of host memory required is several times XCore-image memory size. Thus running several large xcore-images in parallel may result in thrashing! The default of 32 will require ~300MB of host memory. As Makefile.config.in is included multiple times (viz: include $(LEVEL)/Makefile.config), the addition of XCORE_TARGET_FLAGS to X_TARGET_FLAGS is done in Makefile.test RUNTIMELIMIT is set to a default of 1 hour for the XCore emulator. Test that take around or more than 1 hour to run have their RUNTIMELIMIT extended. llvm-svn: 208667
victor-eds · May 13, 2014 · 2614032 · 2614032
1 parent afb609b
commit 2614032
Show file tree

Hide file tree

Showing 51 changed files with 264 additions and 1 deletion.
diff --git a/Makefile.config.in b/Makefile.config.in
@@ -139,6 +139,17 @@ ifeq ($(ARCH),THUMB)
 TEST_TARGET_FLAGS += -mthumb
 endif
 
+ifeq ($(ARCH),XCore)
+ifndef XCORE_TARGET_NEEDS_MEMORY
+# The default memory for all tests is 32MB (rather than the usual default of 64K).
+# (32MB target memory requires ~300MB of host memory)
+XCORE_TARGET_NEEDS_MEMORY := 32
+endif
+XCORE_TARGET_FLAGS := --target=xcore -fcommon -fexceptions -mcmodel=large
+XCORE_TARGET_FLAGS += -Wl,-target=XS1-L1,-Xmapper,--defsymbol,-Xmapper,CmdLineWords=400
+XCORE_TARGET_FLAGS += -Wl,-Xmapper,--image-size,-Xmapper,$$(($(XCORE_TARGET_NEEDS_MEMORY) * 0x100000)),-Xmapper,--image-base,-Xmapper,$$(($(XCORE_TARGET_NEEDS_MEMORY) * 0x100000))
+endif
+
 # PowerPC/Linux needs -ffp-contract=off so that:
 #     The outputs can be compared to gcc.
 #     The outputs match the reference outputs.

diff --git a/Makefile.programs b/Makefile.programs
@@ -67,8 +67,13 @@ DIFFPROG := $(PROGDIR)/DiffOutput.sh "$(FPCMP) $(TOLERANCEOPT)"
 # timeout.  This is overridable on the commandline or in tests makefiles.
 #
 ifndef RUNTIMELIMIT
+ifeq ($(ARCH),XCore)
+  # 1 hours
+  RUNTIMELIMIT := 3600
+else
   RUNTIMELIMIT := 500
 endif
+endif
 
 # If the program specified a REFERENCE_OUTPUT_FILE, they obviously want to
 # USE_REFERENCE_OUTPUT.

diff --git a/Makefile.tests b/Makefile.tests
@@ -23,6 +23,10 @@ include ${LEVEL}/Makefile.common
 # TARGET_FLAGS in the TEST.* makefiles doesn't work out.
 X_TARGET_FLAGS = $(TARGET_FLAGS) $(TEST_TARGET_FLAGS)
 
+ifeq ($(ARCH),XCore)
+X_TARGET_FLAGS += $(XCORE_TARGET_FLAGS)
+endif
+
 STATS = -stats -time-passes
 
 .PHONY: clean default

diff --git a/MultiSource/Applications/JM/ldecod/Makefile b/MultiSource/Applications/JM/ldecod/Makefile
@@ -5,6 +5,10 @@ LDFLAGS  = -lm $(TOOLLINKOPTS)
 
 RUN_OPTIONS = -i $(PROJ_SRC_DIR)/data/test.264 -o Output/test_dec.yuv -r $(PROJ_SRC_DIR)/data/test_rec.yuv
 
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
+
 include ../../../Makefile.multisrc
 
 clean::

diff --git a/MultiSource/Applications/lua/Makefile b/MultiSource/Applications/lua/Makefile
@@ -6,7 +6,10 @@ Source = lapi.c lcode.c ldebug.c ldo.c ldump.c lfunc.c lgc.c llex.c lmem.c\
 	 loslib.c ltablib.c lstrlib.c loadlib.c linit.c lua.c
 
 LDFLAGS += -lm
-ifneq ($(ARCH),XCore)
+
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 128
+else
 CPPFLAGS += -DLUA_USE_POSIX
 endif
 

diff --git a/MultiSource/Applications/minisat/Makefile b/MultiSource/Applications/minisat/Makefile
@@ -9,6 +9,9 @@ RUN_OPTIONS = -verbosity=0 $(PROJ_SRC_DIR)/small.cnf
 else
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS = -verbosity=0 $(PROJ_SRC_DIR)/long.cnf
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
 else
 RUN_OPTIONS = -verbosity=0 $(PROJ_SRC_DIR)/short.cnf
 endif

diff --git a/MultiSource/Applications/spiff/Makefile b/MultiSource/Applications/spiff/Makefile
@@ -9,5 +9,11 @@ RUN_OPTIONS = $(PROJ_SRC_DIR)/Sample.3 $(PROJ_SRC_DIR)/Sample.4
 #RUN_OPTIONS = ./one ./two
 # you get the idea...
 
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+XCORE_TARGET_NEEDS_MEMORY = 1024
+endif
+endif
+
 include ../../Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/ASCI_Purple/SMG2000/Makefile b/MultiSource/Benchmarks/ASCI_Purple/SMG2000/Makefile
@@ -12,6 +12,9 @@ ifdef SMALL_PROBLEM_SIZE
 RUN_OPTIONS ="-n 30 15 30 -c 0.1 1.0 10.0"
 else
 RUN_OPTIONS ="-n 100 40 100 -c 0.1 1.0 10.0"
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 256
+endif
 endif
 
 include	../../../Makefile.multisrc
diff --git a/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/Makefile b/MultiSource/Benchmarks/ASC_Sequoia/AMGmk/Makefile
@@ -5,4 +5,11 @@ PROG     = AMGmk
 LIBS += -lm
 LDFLAGS += -lm
 
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+# XCore takes over 1 hour.
+RUNTIMELIMIT:=7200
+endif
+endif
+
 include	../../../Makefile.multisrc
diff --git a/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/Makefile b/MultiSource/Benchmarks/ASC_Sequoia/CrystalMk/Makefile
@@ -5,4 +5,11 @@ PROG     = CrystalMk
 LIBS += -lm
 LDFLAGS += -lm
 
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+endif
+
 include	../../../Makefile.multisrc
diff --git a/MultiSource/Benchmarks/Bullet/Makefile b/MultiSource/Benchmarks/Bullet/Makefile
@@ -3,8 +3,13 @@ PROG = bullet
 CPPFLAGS += -I$(PROJ_SRC_DIR)/include -DNO_TIME
 LDFLAGS = -lstdc++ -lm
 
+ifeq ($(ARCH),XCore)
+# Use default RUNTIMELIMIT for the XCore.
+XCORE_TARGET_NEEDS_MEMORY := 64
+else
 # This test can take more than the default 500s timeout on Thumb1
 RUNTIMELIMIT:=1000
+endif
 
 include $(LEVEL)/Makefile.config
 

diff --git a/MultiSource/Benchmarks/Fhourstones-3.1/Makefile b/MultiSource/Benchmarks/Fhourstones-3.1/Makefile
@@ -11,4 +11,8 @@ else
 STDIN_FILENAME = $(PROJ_SRC_DIR)/inputs
 endif
 
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
+
 include	../../Makefile.multisrc
diff --git a/MultiSource/Benchmarks/NPB-serial/is/Makefile b/MultiSource/Benchmarks/NPB-serial/is/Makefile
@@ -5,6 +5,10 @@ LDFLAGS  =
 
 ifdef SMALL_PROBLEM_SIZE
 CPPFLAGS = -DSMALL_PROBLEM_SIZE
+else
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 512
+endif
 endif
 
 include $(LEVEL)/MultiSource/Makefile.multisrc

diff --git a/MultiSource/Benchmarks/Olden/health/Makefile b/MultiSource/Benchmarks/Olden/health/Makefile
@@ -13,6 +13,9 @@ ifdef SMALL_PROBLEM_SIZE
 RUN_OPTIONS = 8 15 1
 else
 RUN_OPTIONS = 9 20 1
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
 endif
 endif
 

diff --git a/MultiSource/Benchmarks/Olden/perimeter/Makefile b/MultiSource/Benchmarks/Olden/perimeter/Makefile
@@ -10,6 +10,9 @@ ifdef SMALL_PROBLEM_SIZE
 RUN_OPTIONS = 9
 else
 RUN_OPTIONS = 10
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
 endif
 endif
 

diff --git a/MultiSource/Benchmarks/Olden/treeadd/Makefile b/MultiSource/Benchmarks/Olden/treeadd/Makefile
@@ -8,6 +8,9 @@ ifdef SMALL_PROBLEM_SIZE
 RUN_OPTIONS = 20
 else
 RUN_OPTIONS = 22
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 128
+endif
 endif
 
 include $(LEVEL)/MultiSource/Makefile.multisrc

diff --git a/MultiSource/Benchmarks/Olden/tsp/Makefile b/MultiSource/Benchmarks/Olden/tsp/Makefile
@@ -10,6 +10,9 @@ ifdef SMALL_PROBLEM_SIZE
 RUN_OPTIONS = 102400
 else
 RUN_OPTIONS = 1024000
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
 endif
 endif
 

diff --git a/MultiSource/Benchmarks/Olden/voronoi/Makefile b/MultiSource/Benchmarks/Olden/voronoi/Makefile
@@ -12,6 +12,9 @@ ifdef SMALL_PROBLEM_SIZE
 RUN_OPTIONS = 10000 20 32 7
 else
 RUN_OPTIONS = 100000 20 32 7
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 64
+endif
 endif
 endif
 HASH_PROGRAM_OUTPUT = 1

diff --git a/MultiSource/Benchmarks/SciMark2-C/Makefile b/MultiSource/Benchmarks/SciMark2-C/Makefile
@@ -3,8 +3,16 @@ PROG       = scimark2
 CPPFLAGS   = 
 LDFLAGS    = -lm
 
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+# XCore target takes over 9hours to complete a medium sized problem.
+RUNTIMELIMIT := 50000
+# Ignore 'LARGE_PROBLEM_SIZE' requests
+endif
+else
 ifdef LARGE_PROBLEM_SIZE
 RUN_OPTIONS = -large
 endif
+endif
 
 include	../../Makefile.multisrc
diff --git a/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/Makefile b/MultiSource/Benchmarks/TSVC/ControlFlow-dbl/Makefile
@@ -4,5 +4,11 @@ PROG     = ControlFlow-dbl
 LDFLAGS  = -lm
 CFLAGS += -std=gnu99
 RUN_OPTIONS = 2325 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/Makefile b/MultiSource/Benchmarks/TSVC/ControlLoops-dbl/Makefile
@@ -4,5 +4,11 @@ PROG     = ControlLoops-dbl
 LDFLAGS  = -lm
 CFLAGS += -std=gnu99
 RUN_OPTIONS = 1640 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/TSVC/Expansion-dbl/Makefile b/MultiSource/Benchmarks/TSVC/Expansion-dbl/Makefile
@@ -4,5 +4,11 @@ PROG     = Expansion-dbl
 LDFLAGS  = -lm
 CFLAGS += -std=gnu99
 RUN_OPTIONS = 4160 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/Makefile b/MultiSource/Benchmarks/TSVC/GlobalDataFlow-dbl/Makefile
@@ -4,5 +4,11 @@ PROG     = GlobalDataFlow-dbl
 LDFLAGS  = -lm
 CFLAGS += -std=gnu99
 RUN_OPTIONS = 3450 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/Makefile b/MultiSource/Benchmarks/TSVC/InductionVariable-dbl/Makefile
@@ -4,5 +4,11 @@ PROG     = InductionVariable-dbl
 LDFLAGS  = -lm
 CFLAGS += -std=gnu99
 RUN_OPTIONS = 9100 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/Makefile b/MultiSource/Benchmarks/TSVC/LinearDependence-dbl/Makefile
@@ -4,5 +4,11 @@ PROG     = LinearDependence-dbl
 LDFLAGS  = -lm
 CFLAGS += -std=gnu99
 RUN_OPTIONS = 3570 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/Makefile b/MultiSource/Benchmarks/TSVC/LoopRerolling-dbl/Makefile
@@ -4,5 +4,11 @@ PROG     = LoopRerolling-dbl
 LDFLAGS  = -lm
 CFLAGS += -std=gnu99
 RUN_OPTIONS = 5260 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/Makefile b/MultiSource/Benchmarks/TSVC/NodeSplitting-dbl/Makefile
@@ -4,5 +4,11 @@ PROG     = NodeSplitting-dbl
 LDFLAGS  = -lm
 CFLAGS += -std=gnu99
 RUN_OPTIONS = 10000 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/Makefile b/MultiSource/Benchmarks/TSVC/NodeSplitting-flt/Makefile
@@ -4,5 +4,11 @@ PROG     = NodeSplitting-flt
 LDFLAGS  = -lm
 CFLAGS += -std=gnu99
 RUN_OPTIONS = 10000 5
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/Makefile b/MultiSource/Benchmarks/TSVC/StatementReordering-dbl/Makefile
@@ -4,5 +4,11 @@ PROG     = StatementReordering-dbl
 LDFLAGS  = -lm
 CFLAGS += -std=gnu99
 RUN_OPTIONS = 20000 14
+
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
diff --git a/MultiSource/Benchmarks/Trimaran/netbench-crc/Makefile b/MultiSource/Benchmarks/Trimaran/netbench-crc/Makefile
@@ -8,6 +8,9 @@ ifdef SMALL_PROBLEM_SIZE
 RUN_OPTIONS = 1000
 else
 RUN_OPTIONS = 12000
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 256
+endif
 endif
 endif
 

diff --git a/MultiSource/Benchmarks/mafft/Makefile b/MultiSource/Benchmarks/mafft/Makefile
@@ -12,6 +12,13 @@ STDIN_FILENAME = $(PROJ_SRC_DIR)/pyruvate_decarboxylase.fasta
 LDFLAGS = -lm
 FP_TOLERANCE = 0.00001
 HASH_PROGRAM_OUTPUT = 1
+
+ifeq ($(ARCH),XCore)
+XCORE_TARGET_NEEDS_MEMORY := 256
+# XCore takes ~2 hours.
+RUNTIMELIMIT:=10800
+endif
+
 include $(LEVEL)/MultiSource/Makefile.multisrc
 
 clean::

diff --git a/MultiSource/Benchmarks/nbench/Makefile b/MultiSource/Benchmarks/nbench/Makefile
@@ -6,8 +6,13 @@ LDFLAGS  =
 
 include	../../Makefile.multisrc
 
+ifeq ($(ARCH),XCore)
+# XCore takes ~1 hour.
+RUNTIMELIMIT:=7200
+else
 # This test can take more than the default 500s timeout at -O0.
 RUNTIMELIMIT:=750
+endif
 
 # Always copy NNET.DAT so it's available with SRCDIR != OBJDIR builds.
 # FIXME: Hack

diff --git a/SingleSource/Benchmarks/CoyoteBench/Makefile b/SingleSource/Benchmarks/CoyoteBench/Makefile
@@ -1,5 +1,13 @@
 LEVEL = ../../..
 LDFLAGS += -lm -lstdc++
 
+ifeq ($(ARCH),XCore)
+ifndef SMALL_PROBLEM_SIZE
+XCORE_TARGET_NEEDS_MEMORY := 128
+# XCore takes ~1.25 hour.
+RUNTIMELIMIT:=7200
+endif
+endif
+
 include $(LEVEL)/SingleSource/Makefile.singlesrc