Skip to content

Commit f0f0d7f

Browse files
committed
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. llvm-svn: 339242
1 parent b7220b9 commit f0f0d7f

File tree

5 files changed

+23
-25
lines changed

5 files changed

+23
-25
lines changed
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
file(GLOB bcsources ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86_halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/bilateral_grid.bc)
22
SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
33

4-
set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
5-
64
test_img_input(rgb 0.1 10)
75
test_img_input(rgba 0.1 10)
86

9-
llvm_multisource(halide_bilateral_grid)
10-
11-
12-
13-
7+
llvm_multisource(halide_bilateral_grid
8+
${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
9+
${bcsources}
10+
)
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
file(GLOB bcsources ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86_halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/halide_blur.bc)
22
SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
33

4-
set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
5-
6-
llvm_multisource(halide_blur)
7-
4+
llvm_multisource(halide_blur
5+
${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
6+
${bcsources}
7+
)
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,10 @@
11
file(GLOB bcsources ${CMAKE_CURRENT_SOURCE_DIR}/../common/x86_halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/local_laplacian.bc)
22
SET_SOURCE_FILES_PROPERTIES(${bcsources} PROPERTIES LANGUAGE CXX)
33

4-
set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${bcsources})
5-
64
test_img_input(rgb 8 1 1 10)
75
test_img_input(rgba 8 1 1 10)
86

9-
llvm_multisource(halide_local_laplacian)
10-
11-
12-
13-
7+
llvm_multisource(halide_local_laplacian
8+
${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
9+
${bcsources}
10+
)

Bitcode/Regression/vector_widen/CMakeLists.txt

+5-4
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ foreach(lib ${CMAKE_DL_LIBS})
77
list(APPEND LDFLAGS -l${lib})
88
endforeach()
99

10-
set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc ${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc)
11-
llvm_multisource(widen_bug)
12-
13-
10+
llvm_multisource(widen_bug
11+
${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp
12+
${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc
13+
${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc
14+
)

Bitcode/simd_ops/CMakeLists.txt

+6-3
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ foreach(sourcebc ${uosources})
1919
string(REGEX REPLACE ".[cp]+$" "" pathbc ${sourcebc})
2020
string(REGEX REPLACE ".*/" "" namebc ${pathbc})
2121
string(REPLACE "." "" namebc ${namebc})
22-
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)
23-
llvm_multisource(simd_ops_${namebc})
24-
target_link_libraries(${PROG} simd_ops)
22+
llvm_multisource(simd_ops_${namebc}
23+
${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_halide_runtime.bc
24+
${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_tests/${namebc}.bc
25+
${CMAKE_CURRENT_SOURCE_DIR}/${ARCH}_scalar_tests/scalar_${namebc}.bc
26+
)
27+
target_link_libraries(simd_ops_${namebc} simd_ops)
2528
endforeach()

0 commit comments

Comments
 (0)