[test-suite] r261470 - A number of cmake configuration fixes for SPEC.
Kristof Beyls via llvm-commits
llvm-commits at lists.llvm.org
Sun Feb 21 05:14:34 PST 2016
Author: kbeyls
Date: Sun Feb 21 07:14:34 2016
New Revision: 261470
URL: http://llvm.org/viewvc/llvm-project?rev=261470&view=rev
Log:
A number of cmake configuration fixes for SPEC.
These changes were needed to make the spec 2000 and spec 2006 benchmark
compile correctly on the following platforms, that I used for testing:
- Ubuntu 12.04LTS x86_64, gcc 4.7
- Ubuntu 12.04LTS x86_64, clang 3.5
- Debian linux AArch64 v8.0, clang 3.7
- Debian linux AArch32 v8.0, clang 3.7
- OSX Yosemite x86_64, Xcode clang 7.0.0
Differential Revision: http://reviews.llvm.org/D16688
Modified:
test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/252.eon/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/255.vortex/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2000/300.twolf/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/400.perlbench/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/445.gobmk/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt
test-suite/trunk/External/SPEC/CINT2006/464.h264ref/CMakeLists.txt
Modified: test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt?rev=261470&r1=261469&r2=261470&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CFP2000/CMakeLists.txt Sun Feb 21 07:14:34 2016
@@ -1,3 +1,4 @@
+list(APPEND LDFLAGS -lm)
list(APPEND CPPFLAGS -DSPEC_CPU2000)
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
list(APPEND CPPFLAGS -DSPEC_CPU2000_LP64)
Modified: test-suite/trunk/External/SPEC/CINT2000/252.eon/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/252.eon/CMakeLists.txt?rev=261470&r1=261469&r2=261470&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/252.eon/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/252.eon/CMakeLists.txt Sun Feb 21 07:14:34 2016
@@ -1,9 +1,10 @@
-list(APPEND CPPFLAGS -include errno.h -DHAS_ERRLIST -DUSE_STRERROR -DSPEC_STDCPP)
+list(APPEND CPPFLAGS -include errno.h -include string.h -DHAS_ERRLIST -DUSE_STRERROR -DSPEC_STDCPP)
if(ARCH STREQUAL "PowerPC")
list(APPEND CPPFLAGS -DFMAX_IS_DOUBLE)
endif()
list(APPEND CXXFLAGS -fno-exceptions -Wno-deprecated -fpermissive)
list(APPEND LDFLAGS -lm)
+
include_directories(${BENCHMARK_DIR}/src)
# There's more sourcefiles in the directory than necessary so enumerate the ones
Modified: test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt?rev=261470&r1=261469&r2=261470&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/253.perlbmk/CMakeLists.txt Sun Feb 21 07:14:34 2016
@@ -31,6 +31,10 @@ set(SourceNames
MD5.c
md5c.c
)
+
+list(APPEND CPPFLAGS -DSPEC_CPU2000_NEED_BOOL)
+list(APPEND LDFLAGS -lm)
+
if(TARGET_OS STREQUAL "Win32")
list(APPEND SourceNames nt_perlmain.c win32.c win32sck.c perllib.c)
list(APPEND CPPFLAGS -DSPEC_CPU2000_NTOS -DWIN32 -D_CONSOLE)
@@ -40,6 +44,7 @@ else()
list(APPEND SourceNames unix_perlmain.c)
list(APPEND CPPFLAGS -DSPEC_CPU2000_LINUX)
endif()
+list(APPEND CPPFLAGS -std=gnu89)
include(TestBigEndian)
test_big_endian(IS_BIGENDIAN)
Modified: test-suite/trunk/External/SPEC/CINT2000/255.vortex/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/255.vortex/CMakeLists.txt?rev=261470&r1=261469&r2=261470&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/255.vortex/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/255.vortex/CMakeLists.txt Sun Feb 21 07:14:34 2016
@@ -1,3 +1,5 @@
+list(APPEND LDFLAGS -lm)
+
macro(test_input run_type input outfile)
llvm_test_run(RUN_TYPE ${run_type}
WORKDIR ${CMAKE_CURRENT_BINARY_DIR}/data/${run_type}/input
Modified: test-suite/trunk/External/SPEC/CINT2000/300.twolf/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2000/300.twolf/CMakeLists.txt?rev=261470&r1=261469&r2=261470&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2000/300.twolf/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2000/300.twolf/CMakeLists.txt Sun Feb 21 07:14:34 2016
@@ -1,3 +1,4 @@
+list(APPEND CPPFLAGS -DHAVE_SIGNED_CHAR)
list(APPEND LDFLAGS -lm)
list(APPEND CFLAGS -Wno-return-type)
Modified: test-suite/trunk/External/SPEC/CINT2006/400.perlbench/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/400.perlbench/CMakeLists.txt?rev=261470&r1=261469&r2=261470&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/400.perlbench/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/400.perlbench/CMakeLists.txt Sun Feb 21 07:14:34 2016
@@ -2,6 +2,7 @@ list(APPEND CPPFLAGS -DPERL_CORE -DI_TIM
list(APPEND CFLAGS -std=gnu89)
# We want reproducible builds
list(APPEND CPPFLAGS -D__DATE__="XXX" -D__TIME__="XXX")
+list(APPEND LDFLAGS -lm)
include_directories(${BENCHMARK_DIR}/src)
Modified: test-suite/trunk/External/SPEC/CINT2006/445.gobmk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/445.gobmk/CMakeLists.txt?rev=261470&r1=261469&r2=261470&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/445.gobmk/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/445.gobmk/CMakeLists.txt Sun Feb 21 07:14:34 2016
@@ -1,4 +1,5 @@
list(APPEND CPPFLAS -DWANT_STDC_PROTO)
+list(APPEND LDFLAGS -lm)
set(Source "")
foreach(dir IN ITEMS
Modified: test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt?rev=261470&r1=261469&r2=261470&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/456.hmmer/CMakeLists.txt Sun Feb 21 07:14:34 2016
@@ -1,3 +1,5 @@
+list(APPEND LDFLAGS -lm)
+
macro(test_input run_type input output)
# The benchmark modifies the data file, need to copy a fresh one
llvm_test_run(RUN_TYPE ${run_type} EXECUTABLE cp -f
Modified: test-suite/trunk/External/SPEC/CINT2006/464.h264ref/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/External/SPEC/CINT2006/464.h264ref/CMakeLists.txt?rev=261470&r1=261469&r2=261470&view=diff
==============================================================================
--- test-suite/trunk/External/SPEC/CINT2006/464.h264ref/CMakeLists.txt (original)
+++ test-suite/trunk/External/SPEC/CINT2006/464.h264ref/CMakeLists.txt Sun Feb 21 07:14:34 2016
@@ -1,6 +1,5 @@
-if(ARCH STREQUAL "PowerPC" AND TARGET_OS STREQUAL "Linux")
- list(APPEND CFLAGS -fsigned-char)
-endif()
+list(APPEND LDFLAGS -lm)
+list(APPEND CFLAGS -fsigned-char)
macro(test_input run_type leading level)
llvm_test_run(RUN_TYPE ${run_type}
More information about the llvm-commits
mailing list