[llvm-commits] CVS: llvm-test/autoconf/configure.ac

[Reid Spencer]

Changes in directory llvm-test/autoconf:

configure.ac updated: 1.41 -> 1.42
---
Log message:

For PR919: http://llvm.org/PR919 :
1. Eliminate the --with options for individual external benchmarks. 
2. Implement directory checking for external benchmarks within the m4 macro,
   not in the mainline configure.ac.
3. Extend the EXTERNAL_BENCHMARK macro to accept a 3rd, optional, argument
   which specifies a file or directory that must exist in the benchmark's
   root directory in order for the check to succeed.
4. Specify that the CINT2000 directory must exist for SPEC CPU2000
5. Specify that the CPU2006 directory must exist for SPEC CPU2006


---
Diffs of the changes:  (+2 -31)

 configure.ac |   33 ++-------------------------------
 1 files changed, 2 insertions(+), 31 deletions(-)


Index: llvm-test/autoconf/configure.ac
diff -u llvm-test/autoconf/configure.ac:1.41 llvm-test/autoconf/configure.ac:1.42
--- llvm-test/autoconf/configure.ac:1.41	Fri Jan  5 01:05:12 2007
+++ llvm-test/autoconf/configure.ac	Thu Jan 18 16:12:40 2007
@@ -72,8 +72,8 @@
 
 dnl Configure the default locations of the external benchmarks
 EXTERNAL_BENCHMARK(spec95,${LLVM_EXTERNALS}/spec95/benchspec)
-EXTERNAL_BENCHMARK(spec2000,${LLVM_EXTERNALS}/speccpu2000/benchspec)
-EXTERNAL_BENCHMARK(spec2006,${LLVM_EXTERNALS}/speccpu2006/benchspec)
+EXTERNAL_BENCHMARK(spec2000,${LLVM_EXTERNALS}/speccpu2000/benchspec,[CINT2000])
+EXTERNAL_BENCHMARK(spec2006,${LLVM_EXTERNALS}/speccpu2006/benchspec,[CPU2006])
 EXTERNAL_BENCHMARK(povray,${LLVM_EXTERNALS}/povray31)
 EXTERNAL_BENCHMARK(namd,${LLVM_EXTERNALS}/spec_namd)
 EXTERNAL_BENCHMARK(sweep3d,${LLVM_EXTERNALS}/sweep3d)
@@ -82,35 +82,6 @@
 EXTERNAL_BENCHMARK(nurbs,${LLVM_EXTERNALS}/nurbs)
 EXTERNAL_BENCHMARK(hmmer,${LLVM_EXTERNALS}/hmmer)
 
-dnl Check that the paths of provided external benchmark dirs make sense
-if test -n "$SPEC2006_ROOT" ; then
-  if test -d "$SPEC2006_ROOT" ; then
-    if test `basename "$SPEC2006_ROOT"` != "benchspec"; then
-      AC_MSG_ERROR([SPEC 2006 directory must end in 'benchspec'])
-    fi
-  else
-    AC_MSG_ERROR([SPEC 2006 option must specify a directory])
-  fi
-fi
-if test -n "$SPEC2000_ROOT" ; then
-  if test -d "$SPEC2000_ROOT" ; then
-    if test `basename "$SPEC2000_ROOT"` != "benchspec"; then
-      AC_MSG_ERROR([SPEC 2000 directory must end in 'benchspec'])
-    fi
-  else
-    AC_MSG_ERROR([SPEC 2000 option must specify a directory])
-  fi
-fi
-if test -n "$SPEC95_ROOT" ; then
-  if test -d "$SPEC95_ROOT" ; then
-    if test `basename ${SPEC95_ROOT}` != "benchspec"; then
-      AC_MSG_ERROR([SPEC 95 directory must end in 'benchspec'])
-    fi
-  else
-    AC_MSG_ERROR([SPEC 95 option must specify a directory])
-  fi
-fi
-
 dnl LLC Diff Option
 AC_ARG_ENABLE(llc_diffs,
   AS_HELP_STRING(--enable-llc_diffs,