Bitcode tests failure because of the change in r338787

[santosh]

Summary

llvm_multisource function change was not updated in Bitcode tests.

[santosh]

Deleting commented out lines.
Commented out old lines were not deleted.

[santosh]

All 377 Bitcode tests are failing because no .bc file is compiled before invoking the linker.

I will need help in submitting the change, if accepted.

[Meinersbur]

Looks like an obvious change, but r338787 is by @MatzeB I'd wait for his ok.

Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt

10–11

[nit] Can you indent the argument lines?

Bitcode/simd_ops/CMakeLists.txt

21–22

[nit] Indention is a bit off

[santosh]

Indentation corrected.

[santosh]

The same issue has been fixed in r339242

[Meinersbur]

Could you close the review if it's not needed anymore?

[santosh]

The issue has been fixed in r339242.

Bitcode/Benchmarks/Halide/bilateral_grid/CMakeLists.txt

 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}
+)
 
 
 
 

Bitcode/Benchmarks/Halide/blur/CMakeLists.txt

 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}
+)

Bitcode/Benchmarks/Halide/local_laplacian/CMakeLists.txt

 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}
+)

Bitcode/Regression/fft/CMakeLists.txt

 set(NO_REFERENCE_OUTPUT true)
 file(GLOB uosources ${CMAKE_CURRENT_SOURCE_DIR}/modules/*.bc)
 SET_SOURCE_FILES_PROPERTIES(${uosources} PROPERTIES LANGUAGE CXX)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc PROPERTIES LANGUAGE CXX)
 
 find_package(Threads)
 list(APPEND LDFLAGS ${CMAKE_THREAD_LIBS_INIT})
 foreach(lib ${CMAKE_DL_LIBS})
   list(APPEND LDFLAGS -l${lib})
 endforeach()
 
-set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc ${uosources})
-llvm_multisource(fft)
-
-
+#set(Source ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp ${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc ${uosources})
+llvm_multisource(fft
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp 
+  ${CMAKE_CURRENT_SOURCE_DIR}/x86_17.06.19_halide_runtime.bc 
+  ${uosources}
+)

Bitcode/Regression/vector_widen/CMakeLists.txt

 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc PROPERTIES LANGUAGE CXX)
 SET_SOURCE_FILES_PROPERTIES(${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc PROPERTIES LANGUAGE CXX)
 
 find_package(Threads)
 list(APPEND LDFLAGS ${CMAKE_THREAD_LIBS_INIT})
 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)
-
-
+#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
+  ${CMAKE_CURRENT_SOURCE_DIR}/driver.cpp 
+  ${CMAKE_CURRENT_SOURCE_DIR}/halide_runtime.bc 
+  ${CMAKE_CURRENT_SOURCE_DIR}/vector_widen.bc
+)

Bitcode/simd_ops/CMakeLists.txt

 add_library(simd_ops STATIC simd_ops.cpp ${ARCH}_halide_runtime.bc)
 target_link_libraries(simd_ops)
 test_suite_add_build_dependencies(simd_ops)
 set_target_properties(simd_ops PROPERTIES LINKER_LANGUAGE CXX)
 
 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)
+#  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})
+llvm_multisource(simd_ops_${namebc}
+  ${CMAKE_CURRENT_SOURCE_DIR}/simd_ops.cpp
+  ${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
+) 
 endforeach()