[test-suite] r339242 - Update bitcode tests to pass sources to llvm_multisource.

[Tim Northover via llvm-commits]

Author: tnorthover
Date: Wed Aug  8 06:28:12 2018
New Revision: 339242

URL: http://llvm.org/viewvc/llvm-project?rev=339242&view=rev
Log:
Update bitcode tests to pass sources to llvm_multisource.

Since these tests aren't built by default they accidentally got missed out when
Matthias refactored our CMake functions.


Modified:
    test-suite/trunk/Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt
    test-suite/trunk/Bitcode/Benchmarks/Halide/blur/CMakeLists.txt
    test-suite/trunk/Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt
    test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt
    test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt

Modified: test-suite/trunk/Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt?rev=339242&r1=339241&r2=339242&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt Wed Aug  8 06:28:12 2018
@@ -1,13 +1,10 @@
 file(GLOB bcsources ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86_halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/bilateral_grid.bc)
 SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
 
-set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
-
 test_img_input(rgb 0.1 10)
 test_img_input(rgba 0.1 10)
 
-llvm_multisource(halide_bilateral_grid)
-
-
-
-
+llvm_multisource(halide_bilateral_grid
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
+  ${bcsources}
+)

Modified: test-suite/trunk/Bitcode/Benchmarks/Halide/blur/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/Benchmarks/Halide/blur/CMakeLists.txt?rev=339242&r1=339241&r2=339242&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/Benchmarks/Halide/blur/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/Benchmarks/Halide/blur/CMakeLists.txt Wed Aug  8 06:28:12 2018
@@ -1,7 +1,7 @@
 file(GLOB bcsources ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86_halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/halide_blur.bc)
 SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
 
-set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
-
-llvm_multisource(halide_blur)
-
+llvm_multisource(halide_blur
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
+  ${bcsources}
+)

Modified: test-suite/trunk/Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt?rev=339242&r1=339241&r2=339242&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt Wed Aug  8 06:28:12 2018
@@ -1,13 +1,10 @@
 file(GLOB bcsources ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86_halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/local_laplacian.bc)
 SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
 
-set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
-
 test_img_input(rgb 8 1 1 10)
 test_img_input(rgba 8 1 1 10)
 
-llvm_multisource(halide_local_laplacian)
-
-
-
-
+llvm_multisource(halide_local_laplacian
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
+  ${bcsources}
+)

Modified: test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt?rev=339242&r1=339241&r2=339242&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/Regression/vector_widen/CMakeLists.txt Wed Aug  8 06:28:12 2018
@@ -7,7 +7,8 @@ foreach(lib ${CMAKE_DL_LIBS})
   list(APPEND LDFLAGS -l${lib})
 endforeach()
 
-set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc)
-llvm_multisource(widen_bug)
-
-
+llvm_multisource(widen_bug
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc
+  ${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc
+)

Modified: test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt?rev=339242&r1=339241&r2=339242&view=diff
==============================================================================
--- test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt (original)
+++ test-suite/trunk/Bitcode/simd_ops/CMakeLists.txt Wed Aug  8 06:28:12 2018
@@ -19,7 +19,10 @@ foreach(sourcebc ${uosources})
   string(REGEX REPLACE ".[cp]+$" "" pathbc ${sourcebc})
   string(REGEX REPLACE ".*/" "" namebc ${pathbc})
   string(REPLACE "." "" namebc ${namebc})
-  set(Source ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_tests/${namebc}.bc ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_scalar_tests/scalar_${namebc}.bc)
-  llvm_multisource(simd_ops_${namebc})
-  target_link_libraries(${PROG} simd_ops)
+  llvm_multisource(simd_ops_${namebc}
+    ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_halide_runtime.bc
+    ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_tests/${namebc}.bc
+    ${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_scalar_tests/scalar_${namebc}.bc
+  )
+  target_link_libraries(simd_ops_${namebc} simd_ops)
 endforeach()