Added support for configuring SPEC95.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@11295 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/Makefile.config.in b/Makefile.config.in
index 81e2b63..c88bf88 100644 (file)
--- a/Makefile.config.in
+++ b/Makefile.config.in
@@ -84,11 +84,13 @@ BYTECODE_REPOSITORY := @BCR@
 #      Set the USE_SPEC variable to enable the use of the SPEC benchmarks.
 #      You must provide the SPEC benchmarks on your own.
 @USE_SPEC@
+@USE_SPEC95@
 
 # Path to the SPEC benchmarks.  If you have the SPEC benchmarks, place the
 # path here.
 #SPEC_ROOT := /home/vadve/shared/benchmarks/speccpu2000/benchspec
 SPEC_ROOT := @SPEC_ROOT@
+SPEC95_ROOT := @SPEC95_ROOT@
 
 # Path to the PAPI code.  This is used by the reoptimizer only.
 #PAPIDIR := /home/vadve/shared/papi-2.3.4.1

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 29bda2e..e001275 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -55,6 +55,7 @@ AC_CONFIG_MAKEFILE(test/Programs/TEST.micro.Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/External/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile.spec)
+AC_CONFIG_MAKEFILE(test/Programs/External/SPEC/Makefile.spec95)
 AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile)
 AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Makefile.multisrc)
 AC_CONFIG_MAKEFILE(test/Programs/MultiSource/Benchmarks/FreeBench/analyzer/test.in)
@@ -281,7 +282,7 @@ else
        AC_SUBST(ENABLE_OPTIMIZED,[[ENABLE_OPTIMIZED=1]])
 fi
 
-dnl Spec Benchmarks
+dnl Spec 2000 Benchmarks
 AC_ARG_ENABLE(spec2000,AC_HELP_STRING([--enable-spec2000],[Compile SPEC 2000 benchmarks (default is NO)]),,enableval=no)
 if test ${enableval} = "no"
 then
@@ -303,6 +304,28 @@ else
        AC_SUBST(USE_SPEC,[[USE_SPEC=1]])
 fi
 
+dnl Spec 95 Benchmarks
+AC_ARG_ENABLE(spec95,AC_HELP_STRING([--enable-spec95],[Compile SPEC 95 benchmarks (default is NO)]),,enableval=no)
+if test ${enableval} = "no"
+then
+       if test -d /home/vadve/shared/benchmarks/spec95_sparcv9/benchspec
+       then
+               AC_SUBST(SPEC95_ROOT,[/home/vadve/shared/benchmarks/spec95_sparcv9/benchspec])
+               AC_SUBST(USE_SPEC95,[[USE_SPEC95=1]])
+       else
+               AC_SUBST(USE_SPEC95,[[]])
+               AC_SUBST(SPEC95_ROOT,[])
+       fi
+else
+       if test ${enableval} = ""
+       then
+               AC_SUBST(SPEC95_ROOT,[/home/vadve/shared/benchmarks/spec95_sparcv9/benchspec])
+       else
+               AC_SUBST(SPEC95_ROOT,[${enableval}])
+       fi
+       AC_SUBST(USE_SPEC95,[[USE_SPEC95=1]])
+fi
+
 dnl Precompiled Bytecode Option
 AC_ARG_ENABLE(precompiled_bytecode,AC_HELP_STRING([--enable-precompiled_bytecode],[Use pre-compiled bytecode (default is NO)]),,enableval=no)
 if test ${enableval} = "no"