Add CMakeLists for External/{Nurbs|Povray|skidmarks10|HMMER}

[MatzeB]

Summary

Adds a way to configure the location of test-suite externals and adds CMakeLists for Nurbs, Povray, skidmarks10 and HMMER.

[jmolloy]

Hi Matthias,

Thanks for pushing this forward. I've got some comments below.

Cheers,

James

CMakeLists.txt

59 ↗

(On Diff #39882)

Don't we want something like this instead?:

if(CMAKE_SIZEOF_VOID_P EQUAL 8)
  set(TMP_LP64 TRUE)
else()
  set(TMP_LP64 FALSE)
endif()
set(ARCH_LP64 ${TMP_LP64} CACHE BOOL "Does the target architecture has 64-bit pointers?")

I'll defer to Chris B on this

73 ↗

(On Diff #39882)

I'd prefer if we had a "LLVM_" prefix on all variables we expect to be set by the user. Can we stick to that, like in the other projects' builds?

External/CMakeLists.txt

1 ↗

(On Diff #39882)

I think this relies on a CMake module from LLVM, not from test-suite, so it'll fail unless we're in /projects.

Just doing "add_subdirectory()" several times isn't much harder.

[beanz]

CMakeLists.txt

59 ↗

(On Diff #39882)

Why does this need to be cached at all?

I generally prefer not using cached variables unless there is a really good reason because CMake has no cache invalidation.

73 ↗

(On Diff #39882)

Rather than LLVM, I would suggest prefixing with TEST_SUITE.

I think each project should have its own prefix. Also, with r252747 variables that start with TEST_SUITE will automatically be passed from the top-level CMake invocation into the sub-project configuration.

External/CMakeLists.txt

1 ↗

(On Diff #39882)

llvm_add_subdirectories actually comes from test-suite, so this is fine.

[MatzeB]

CMakeLists.txt

59 ↗

(On Diff #39882)

My goal here was not so much the caching but more about giving the user control over these settings. Though I guess the proper design would be to only give a variable to the user to override the auto detection instead of saving the result of the auto detection in the cache.

Anyway I agree that in this specific instance it's probably best to not make it cached at all.

73 ↗

(On Diff #39882)

TEST_SUITE_ prefix sounds good.

External/CMakeLists.txt

1 ↗

(On Diff #39882)

I can change the layout to this to give more of a "one-item in each line" feeling which should be good for subdirectories.

llvm_add_subdirectories(
  HMMER
  Nurbs
  Povray
  skidmarks10
)

[MatzeB]

Adapted to review feedback.

test-suite/trunk/CMakeLists.txt

 add_subdirectory(tools)
 
 # Now that the tools have been created, use tools/timeit to time all other compilations.
 set(CMAKE_C_COMPILE_OBJECT "${CMAKE_BINARY_DIR}/tools/timeit --summary <OBJECT>.time ${CMAKE_C_COMPILE_OBJECT}")
 set(CMAKE_CXX_COMPILE_OBJECT "${CMAKE_BINARY_DIR}/tools/timeit --summary <OBJECT>.time ${CMAKE_CXX_COMPILE_OBJECT}")
 
 add_subdirectory(SingleSource)
 add_subdirectory(MultiSource)
+add_subdirectory(External)
 
 # Produce lit.site.cfg
 configure_file("${CMAKE_SOURCE_DIR}/lit.site.cfg.in" "${CMAKE_BINARY_DIR}/lit.site.cfg")

test-suite/trunk/External/CMakeLists.txt

+set(TEST_SUITE_EXTERNALS_DIR "" CACHE PATH
+    "Directory containing test-suite external benchmark sources")
+
+# Find path containing an external benchmark and set PATHVAR to it.
+# Specifically this:
+# - Adds a CACHE variable for PATHVAR
+# - If PATHVAR is unset set it to the first existing directory in this list:
+#   - ${TEST_SUITE_EXTERNALS_DIR}/${NAME}
+#   - ${CMAKE_SOURCE_DIR}/test-suite-externals/${NAME}
+macro(llvm_externals_find PATHVAR NAME DESCRIPTION)
+  set(${PATHVAR} "" CACHE PATH "Directory containing ${DESCRIPTION} sourcecode")
+  if(TEST_SUITE_EXTERNALS_DIR AND NOT ${PATHVAR} AND
+     IS_DIRECTORY "${TEST_SUITE_EXTERNALS_DIR}/${NAME}")
+    set(${PATHVAR} "${TEST_SUITE_EXTERNALS_DIR}/${NAME}")
+  endif()
+  if(NOT ${PATHVAR} AND
+     IS_DIRECTORY "${CMAKE_SOURCE_DIR}/test-suite-externals/${NAME}")
+    set(${PATHVAR} "${CMAKE_SOURCE_DIR}/test-suite-externals/${NAME}")
+  endif()
+  if(${PATHVAR})
+    message(STATUS "Found ${DESCRIPTION}: ${${PATHVAR}}")
+  endif()
+endmacro()
+
+llvm_add_subdirectories(
+  HMMER
+  Nurbs
+  Povray
+  skidmarks10
+)

test-suite/trunk/External/HMMER/CMakeLists.txt

+llvm_externals_find(TEST_SUITE_HMMER_ROOT "hmmer" "HMMER 2.3.2")
+
+if(TEST_SUITE_HMMER_ROOT)
+  set(PROG hmmcalibrate)
+  FILE(GLOB Source ${TEST_SUITE_HMMER_ROOT}/*.c)
+  list(APPEND CPPFLAGS -DSSE2 -pthread)
+  list(APPEND LDFLAGS -pthread)
+  if(ARCH STREQUAL "PowerPC")
+    list(APPEND TARGET_FLAGS -maltivec)
+    list(APPEND LCCFLAGS -maltivec)
+  endif()
+
+  if(DEFINED LARGE_PROBLEM_SIZE)
+    llvm_test_run(--fixed 400 --cpu 1 --num 200000 --seed 1158818515 ${TEST_SUITE_HMMER_ROOT}/globin.hmm)
+  else()
+    llvm_test_run(--fixed 400 --cpu 1 --num 80000 --seed 1158818515 ${TEST_SUITE_HMMER_ROOT}/globin.hmm)
+  endif()
+  llvm_multisource()
+endif()

test-suite/trunk/External/Nurbs/CMakeLists.txt

+llvm_externals_find(TEST_SUITE_NURBS_ROOT "nurbs" "Nurbs")
+
+if(TEST_SUITE_NURBS_ROOT)
+  set(PROG nurbs)
+  file(GLOB Source ${TEST_SUITE_NURBS_ROOT}/*.cpp)
+  list(APPEND LDFLAGS -lstdc++)
+  list(APPEND LIBS -lstdc++)
+  if(CMAKE_SIZEOF_VOID_P EQUAL 8)
+    list(APPEND CPPFLAGS -DDWORD_IS_ULL)
+  endif()
+
+  llvm_test_run(/k all timed /t 500 /vsteps 192 /usteps 192 /vcp 20 /ucp 20)
+  llvm_test_verify(${CMAKE_BINARY_DIR}/tools/fpcmp
+    %o
+    ${CMAKE_CURRENT_SOURCE_DIR}/nurbs.reference_output
+  )
+
+  llvm_multisource()
+endif()

test-suite/trunk/External/Povray/CMakeLists.txt

+llvm_externals_find(TEST_SUITE_POVRAY_ROOT "povray31" "POV-Ray 3.1")
+
+if(TEST_SUITE_POVRAY_ROOT)
+  set(PROG povray)
+
+  file(GLOB Source
+    ${TEST_SUITE_POVRAY_ROOT}/source/*.c
+    ${TEST_SUITE_POVRAY_ROOT}/source/libpng/*.c
+  )
+  list(REMOVE_ITEM Source
+    ${TEST_SUITE_POVRAY_ROOT}/source/libpng/ansi2knr.c
+    ${TEST_SUITE_POVRAY_ROOT}/source/libpng/pngtest.c
+    ${TEST_SUITE_POVRAY_ROOT}/source/libpng/example.c
+  )
+
+  list(APPEND CPPFLAGS
+    -I${TEST_SUITE_POVRAY_ROOT}/source
+    -I${TEST_SUITE_POVRAY_ROOT}/source/unix
+    -I${TEST_SUITE_POVRAY_ROOT}/source/libpng
+    -DPREFIX='"${CMAKE_CURRENT_BINARY_DIR}"'
+    -DSYSCONFDIR='"${CMAKE_CURRENT_BINARY_DIR}"'
+  )
+  list(APPEND LIBS -lz -lm)
+  list(APPEND LDFLAGS -lz -lm)
+
+  llvm_test_run(
+    -I${TEST_SUITE_POVRAY_ROOT}/scenes/advanced/chess2.pov
+    -L${TEST_SUITE_POVRAY_ROOT}/include
+    -GA$<.junk -O-
+  )
+  llvm_test_verify(${CMAKE_BINARY_DIR}/tools/fpcmp
+    %o
+    ${CMAKE_CURRENT_SOURCE_DIR}/povray.reference_output
+  )
+
+  llvm_multisource()
+endif()

test-suite/trunk/External/skidmarks10/CMakeLists.txt

+llvm_externals_find(TEST_SUITE_SKIDMARKS10_ROOT "skidmarks10" "Skidmarks 10")
+
+if(TEST_SUITE_SKIDMARKS10_ROOT)
+  set(PROG skidmarks)
+  file(GLOB Source ${TEST_SUITE_SKIDMARKS10_ROOT}/source/*.c)
+  list(APPEND CPPFLAGS -I${TEST_SUITE_SKIDMARKS10_ROOT}/source)
+  if(ARCH STREQUAL "x86")
+    list(APPEND CPPFLAGS -msse3)
+  endif()
+
+  llvm_test_run(0 ${TEST_SUITE_SKIDMARKS10_ROOT}/golden)
+  llvm_test_verify(${CMAKE_BINARY_DIR}/tools/fpcmp
+    %o
+    ${CMAKE_CURRENT_SOURCE_DIR}/skidmarks.reference_output
+  )
+  llvm_multisource()
+endif()