[llvm-commits] [test-suite] r109658 - in /test-suite/trunk: External/Makefile External/skidmarks10/ External/skidmarks10/Makefile Makefile.config.in autoconf/configure.ac

[Eric Christopher]

Author: echristo
Date: Wed Jul 28 16:05:43 2010
New Revision: 109658

URL: http://llvm.org/viewvc/llvm-project?rev=109658&view=rev
Log:
Add support for the External "skidmarks" test.

Added:
    test-suite/trunk/External/skidmarks10/
    test-suite/trunk/External/skidmarks10/Makefile
Modified:
    test-suite/trunk/External/Makefile
    test-suite/trunk/Makefile.config.in
    test-suite/trunk/autoconf/configure.ac

Modified: test-suite/trunk/External/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/Makefile?rev=109658&r1=109657&r2=109658&view=diff
==============================================================================
--- test-suite/trunk/External/Makefile (original)
+++ test-suite/trunk/External/Makefile Wed Jul 28 16:05:43 2010
@@ -8,7 +8,7 @@
 #
 # Create the list of directories to compile
 #
-PARALLEL_DIRS := SPEC Povray Namd FPGrowth BoxedSim
+PARALLEL_DIRS := SPEC Povray Namd FPGrowth BoxedSim skidmarks10
 
 ifneq (,$(findstring x86,$(ARCH)))
 # Nurbs uses SSE and only works on x86 and x86_64.

Added: test-suite/trunk/External/skidmarks10/Makefile
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/skidmarks10/Makefile?rev=109658&view=auto
==============================================================================
--- test-suite/trunk/External/skidmarks10/Makefile (added)
+++ test-suite/trunk/External/skidmarks10/Makefile Wed Jul 28 16:05:43 2010
@@ -0,0 +1,21 @@
+LEVEL = ../..
+include $(LEVEL)/Makefile.config
+
+PROG = skidmarks
+
+DISABLE_JIT = 1
+DISABLE_CBE = 1
+
+SourceDir := $(SKIDMARKS10_ROOT)/source
+RUN_OPTIONS = 0 $(SKIDMARKS10_ROOT)/golden
+
+CPPFLAGS += -I$(SKIDMARKS10_ROOT)/source
+
+# skidmarks requires sse3 on x86
+ifneq (,$(findstring x86,$(ARCH)))
+CPPFLAGS += -msse3
+endif
+
+# TODO: We may want to set more flags than the default run here.
+
+include $(LEVEL)/MultiSource/Makefile.multisrc

Modified: test-suite/trunk/Makefile.config.in
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Makefile.config.in?rev=109658&r1=109657&r2=109658&view=diff
==============================================================================
--- test-suite/trunk/Makefile.config.in (original)
+++ test-suite/trunk/Makefile.config.in Wed Jul 28 16:05:43 2010
@@ -121,6 +121,10 @@
 @USE_HMMER@
 HMMER_ROOT := @HMMER_ROOT@
 
+# Path to the Skidmarks source code
+ at USE_SKIDMARKS10@
+SKIDMARKS10_ROOT := @SKIDMARKS10_ROOT@
+
 # Disable LLC diffs for testing.
 @DISABLE_LLC_DIFFS@
 

Modified: test-suite/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/autoconf/configure.ac?rev=109658&r1=109657&r2=109658&view=diff
==============================================================================
--- test-suite/trunk/autoconf/configure.ac (original)
+++ test-suite/trunk/autoconf/configure.ac Wed Jul 28 16:05:43 2010
@@ -41,6 +41,7 @@
 AC_CONFIG_MAKEFILE(External/SPEC/CINT2000/Makefile)
 AC_CONFIG_MAKEFILE(External/SPEC/CFP95/Makefile)
 AC_CONFIG_MAKEFILE(External/SPEC/CINT95/Makefile)
+AC_CONFIG_MAKEFILE(External/skidmarks10/Makefile)
 AC_CONFIG_MAKEFILE(MultiSource/Makefile)
 AC_CONFIG_MAKEFILE(MultiSource/Makefile.multisrc)
 AC_CONFIG_MAKEFILE(SingleSource/Makefile)
@@ -79,6 +80,7 @@
 EXTERNAL_BENCHMARK(alp,${LLVM_EXTERNALS}/alp)
 EXTERNAL_BENCHMARK(nurbs,${LLVM_EXTERNALS}/nurbs)
 EXTERNAL_BENCHMARK(hmmer,${LLVM_EXTERNALS}/hmmer)
+EXTERNAL_BENCHMARK(skidmarks10,${LLVM_EXTERNALS}/skidmarks10)
 
 dnl LLC Diff Option
 AC_ARG_ENABLE(llc_diffs,