cmake: Specify reference outputs in llvm_test_data()

Specify reference outputs in llvm_test_data() so they get copied to the
builddir and used from there.

Differential Revision: https://reviews.llvm.org/D51048

git-svn-id: https://llvm.org/svn/llvm-project/test-suite/trunk@341255 91177308-0d34-0410-b5e6-96231b3b80d8

7 files changed, 48 insertions, 22 deletions

diff --git a/MicroBenchmarks/ImageProcessing/AnisotropicDiffusion/CMakeLists.txt b/MicroBenchmarks/ImageProcessing/AnisotropicDiffusion/CMakeLists.txt
index ace592c6..0e52a7a6 100644
--- a/MicroBenchmarks/ImageProcessing/AnisotropicDiffusion/CMakeLists.txt
+++ b/MicroBenchmarks/ImageProcessing/AnisotropicDiffusion/CMakeLists.txt
@@ -3,10 +3,13 @@ set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
 list(APPEND CXXFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
 list(APPEND LDFLAGS -lm)
 
-llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/anisotropicDiffusionOutput.txt")
-llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/anisotropicDiffusionOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/anisotropicDiffusion.reference_output")
+llvm_test_verify_hash_program_output(anisotropicDiffusionOutput.txt)
+llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+  ${FPCMP} anisotropicDiffusion.reference_output anisotropicDiffusionOutput.txt
+)
 
 llvm_test_run(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 llvm_test_executable(AnisotropicDiffusion ../utils/ImageHelper.cpp ../utils/glibc_compat_rand.c main.cpp anisotropicDiffusionKernel.c)
+llvm_test_data(AnisotropicDiffusion anisotropicDiffusion.reference_output)
 
 target_link_libraries(AnisotropicDiffusion benchmark)
diff --git a/MicroBenchmarks/ImageProcessing/BilateralFiltering/CMakeLists.txt b/MicroBenchmarks/ImageProcessing/BilateralFiltering/CMakeLists.txt
index c262a55e..fd0fafa8 100644
--- a/MicroBenchmarks/ImageProcessing/BilateralFiltering/CMakeLists.txt
+++ b/MicroBenchmarks/ImageProcessing/BilateralFiltering/CMakeLists.txt
@@ -2,10 +2,13 @@ set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
 list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
 list(APPEND LDFLAGS -lm)
 
-llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/bilateralFilterOutput.txt")
-llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/bilateralFilterOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/bilateralFilter.reference_output")
+llvm_test_verify_hash_program_output(bilateralFilterOutput.txt)
+llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+  ${FPCMP} bilateralFilter.reference_output bilateralFilterOutput.txt
+)
 
 llvm_test_run(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 llvm_test_executable(BilateralFilter ../utils/ImageHelper.cpp ../utils/glibc_compat_rand.c main.cpp bilateralFilterKernel.c)
+llvm_test_data(BilateralFilter bilateralFilter.reference_output)
 
 target_link_libraries(BilateralFilter benchmark)
diff --git a/MicroBenchmarks/ImageProcessing/Blur/CMakeLists.txt b/MicroBenchmarks/ImageProcessing/Blur/CMakeLists.txt
index 22d6ad67..291d2401 100644
--- a/MicroBenchmarks/ImageProcessing/Blur/CMakeLists.txt
+++ b/MicroBenchmarks/ImageProcessing/Blur/CMakeLists.txt
@@ -3,13 +3,18 @@ set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
 list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
 list(APPEND LDFLAGS -lm)
 
-llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/boxBlurOutput.txt")
-llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/boxBlurOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/boxBlur.reference_output")
+llvm_test_verify_hash_program_output(boxBlurOutput.txt)
+llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+  ${FPCMP} boxBlur.reference_output boxBlurOutput.txt
+)
 
-llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/gaussianBlurOutput.txt")
-llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/gaussianBlurOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/gaussianBlur.reference_output")
+llvm_test_verify_hash_program_output(gaussianBlurOutput.txt)
+llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+  ${FPCMP} gaussianBlur.reference_output gaussianBlurOutput.txt
+)
 
 llvm_test_run(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 llvm_test_executable(blur ../utils/ImageHelper.cpp ../utils/glibc_compat_rand.c main.cpp boxBlurKernel.c gaussianBlurKernel.c)
+llvm_test_data(blur boxBlur.reference_output gaussianBlur.reference_output)
 
 target_link_libraries(blur benchmark)
diff --git a/MicroBenchmarks/ImageProcessing/Dilate/CMakeLists.txt b/MicroBenchmarks/ImageProcessing/Dilate/CMakeLists.txt
index e5e2552b..559135ca 100644
--- a/MicroBenchmarks/ImageProcessing/Dilate/CMakeLists.txt
+++ b/MicroBenchmarks/ImageProcessing/Dilate/CMakeLists.txt
@@ -1,11 +1,14 @@
 set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
 list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
 
-llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/dilateOutput.txt")
-llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/dilateOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/dilate.reference_output")
+llvm_test_verify_hash_program_output(dilateOutput.txt)
+llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+  ${FPCMP} dilate.reference_output dilateOutput.txt
+)
 
 llvm_test_run(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 
 llvm_test_executable(Dilate ../utils/ImageHelper.cpp ../utils/glibc_compat_rand.c main.cpp dilateKernel.c)
+llvm_test_data(Dilate dilate.reference_output)
 
 target_link_libraries(Dilate benchmark)
diff --git a/MicroBenchmarks/ImageProcessing/Dither/CMakeLists.txt b/MicroBenchmarks/ImageProcessing/Dither/CMakeLists.txt
index b89b7d85..46276d55 100644
--- a/MicroBenchmarks/ImageProcessing/Dither/CMakeLists.txt
+++ b/MicroBenchmarks/ImageProcessing/Dither/CMakeLists.txt
@@ -2,13 +2,18 @@ set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
 list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
 list(APPEND LDFLAGS -lm)
 
-llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/orderedOutput.txt")
-llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/orderedOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/orderedDither.reference_output")
+llvm_test_verify_hash_program_output(orderedOutput.txt)
+llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+  ${FPCMP} orderedDither.reference_output orderedOutput.txt
+)
 
-llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/floydOutput.txt")
-llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/floydOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/floydDither.reference_output")
+llvm_test_verify_hash_program_output(floydOutput.txt)
+llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+  ${FPCMP} floydDither.reference_output floydOutput.txt
+)
 
 llvm_test_run(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 llvm_test_executable(Dither main.cpp orderedDitherKernel.c  floydDitherKernel.c ../utils/ImageHelper.cpp ../utils/glibc_compat_rand.c)
+llvm_test_data(Dither orderedDither.reference_output floydDither.reference_output)
 
 target_link_libraries(Dither benchmark)
diff --git a/MicroBenchmarks/ImageProcessing/Interpolation/CMakeLists.txt b/MicroBenchmarks/ImageProcessing/Interpolation/CMakeLists.txt
index 8e393cec..ad5d0d42 100644
--- a/MicroBenchmarks/ImageProcessing/Interpolation/CMakeLists.txt
+++ b/MicroBenchmarks/ImageProcessing/Interpolation/CMakeLists.txt
@@ -1,13 +1,18 @@
 set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
 list(APPEND CXXFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
 
-llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/bicubicOutput.txt")
-llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/bicubicOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/bicubic.reference_output")
+llvm_test_verify_hash_program_output(bicubicOutput.txt)
+llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+  ${FPCMP} bicubic.reference_output bicubicOutput.txt
+)
 
-llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/bilinearOutput.txt")
-llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/bilinearOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/bilinear.reference_output")
+llvm_test_verify_hash_program_output(bilinearOutput.txt)
+llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+  ${FPCMP} bilinear.reference_output bilinearOutput.txt
+)
 
 llvm_test_run(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
 llvm_test_executable(Interpolation bicubicKernel.c bilinearKernel.c main.cpp ../utils/ImageHelper.cpp ../utils/glibc_compat_rand.c)
+llvm_test_data(Interpolation bicubic.reference_output bilinear.reference_output)
 
 target_link_libraries(Interpolation benchmark)
diff --git a/MicroBenchmarks/harris/CMakeLists.txt b/MicroBenchmarks/harris/CMakeLists.txt
index c4717d2f..541460bb 100644
--- a/MicroBenchmarks/harris/CMakeLists.txt
+++ b/MicroBenchmarks/harris/CMakeLists.txt
@@ -1,8 +1,10 @@
 list(APPEND CPPFLAGS -std=c++11 -ffast-math)
 
-set(REFERENCE_OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/harris.reference_output)
-llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/output.txt")
-llvm_test_verify("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/output.txt ${REFERENCE_OUTPUT}")
+llvm_test_verify_hash_program_output(output.txt)
+llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+  ${FPCMP} harris.reference_output output.txt
+)
 llvm_test_run(WORKDIR ${CMAKE_CURRENT_BINARY_DIR})
-llvm_test_executable(harris harrisKernel.cpp  main.cpp)
+llvm_test_executable(harris harrisKernel.cpp main.cpp)
 target_link_libraries(harris benchmark)
+llvm_test_data(harris harris.reference_output)