This is an archive of the discontinued LLVM Phabricator instance.

Differential D50379

New ImageProcessing tests were failing becuase c++ flags are used in c flags.
ClosedPublic

Authored by santosh on Aug 7 2018, 3:23 AM.

Details

Reviewers
Meinersbur
• proton0001
Summary

clang was invoked on .c files. CPPFLAGS were used in clang which has -std=c++11, a c++ flag,, which is not supported.

Diff Detail

Event Timeline

santosh created this revision.Aug 7 2018, 3:23 AM
Herald added a subscriber: mgorny. · View Herald TranscriptAug 7 2018, 3:23 AM
Harbormaster completed remote builds in B21176: Diff 159475.Aug 7 2018, 3:23 AM
santosh edited the summary of this revision. (Show Details)Aug 7 2018, 4:59 AM
santosh retitled this revision from New ImageProcessing tests were failing becuase c++11 flag is used in compiler. to New ImageProcessing tests were failing becuase c++ flags are used in c flags..
santosh updated this revision to Diff 159487.Aug 7 2018, 5:10 AM

Just added test Microbenchmark test Interpolation has the same issue.

Meinersbur accepted this revision.Aug 7 2018, 8:28 AM

Thank you. LGTM.

This revision is now accepted and ready to land.Aug 7 2018, 8:28 AM
Meinersbur added a comment.Aug 7 2018, 8:30 AM

@santosh Do you need someone to commit?

santosh added a comment.Aug 7 2018, 8:51 AM
In D50379#1190907, @Meinersbur wrote:

@santosh Do you need someone to commit?

Yes. Thanks.

Meinersbur closed this revision.Aug 7 2018, 12:31 PM
Meinersbur added a subscriber: proton.

Seems that @proton already fixed this as part of rL339154. Closing this review. In any case, I want to thank you for opening it!

proton added a comment.Aug 7 2018, 1:02 PM

Thank you for the solution Santosh, It seems like my GitHub account was actually linked to some other account on Phabricator which I was not aware of, so I didn't get any notification for this patch on this account. I will try to get that account removed so that this won't happen in future.

Revision Contents

PathSize
MicroBenchmarks/
ImageProcessing/
AnisotropicDiffusion/
3 lines
Blur/
3 lines
Dither/
3 lines

Diff 159475

MicroBenchmarks/ImageProcessing/AnisotropicDiffusion/CMakeLists.txt

set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils) set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS} -std=c++11) list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
list(APPEND CXX_FLAGS -std=c++11)
llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/anisotropicDiffusionOutput.txt") 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("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/anisotropicDiffusionOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/anisotropicDiffusion.reference_output")
llvm_test_run(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) 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_executable(AnisotropicDiffusion ../utils/ImageHelper.cpp ../utils/glibc_compat_rand.c main.cpp anisotropicDiffusionKernel.c)
target_link_libraries(AnisotropicDiffusion benchmark) target_link_libraries(AnisotropicDiffusion benchmark)

MicroBenchmarks/ImageProcessing/Blur/CMakeLists.txt

set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils) set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS} -std=c++11) list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
list(APPEND CXX_FLAGS -std=c++11)
llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/boxBlurOutput.txt") 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("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/boxBlurOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/boxBlur.reference_output")
llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/gaussianBlurOutput.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("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/gaussianBlurOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/gaussianBlur.reference_output")
llvm_test_run(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) 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_executable(blur ../utils/ImageHelper.cpp ../utils/glibc_compat_rand.c main.cpp boxBlurKernel.c gaussianBlurKernel.c)
target_link_libraries(blur benchmark) target_link_libraries(blur benchmark)

MicroBenchmarks/ImageProcessing/Dither/CMakeLists.txt

set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils) set(IMAGEPROC_UTILS MicroBenchmarks/ImageProcessing/utils)
list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS} -std=c++11) list(APPEND CPPFLAGS -I ${CMAKE_SOURCE_DIR}/${IMAGEPROC_UTILS})
list(APPEND CXX_FLAGS -std=c++11)
llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/orderedOutput.txt") 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("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/orderedOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/orderedDither.reference_output")
llvm_test_verify("${CMAKE_SOURCE_DIR}/HashProgramOutput.sh ${CMAKE_CURRENT_BINARY_DIR}/floydOutput.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("${FPCMP} ${CMAKE_CURRENT_BINARY_DIR}/floydOutput.txt ${CMAKE_CURRENT_SOURCE_DIR}/floydDither.reference_output")
llvm_test_run(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}) 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_executable(Dither main.cpp orderedDitherKernel.c floydDitherKernel.c ../utils/ImageHelper.cpp ../utils/glibc_compat_rand.c)
target_link_libraries(Dither benchmark) target_link_libraries(Dither benchmark)