[SPEC2017] Fix image_validator build when cross-compiling.

[fhahn]

Summary

When cross-compiling and running benchmarks on a different device,
verification happens on-device, but currently the image validator
binaries are built for the host system.

This breaks verification, because the host binary cannot necessarily be
executed on-device (e.g. cross-compiling for ARM64 on X86 and executing
on a ARM64 device).

I tested this with cross-compiling to ARM64 and it works as expected.
When not cross-compiling, the behavior should not change.

[Meinersbur]

Thank you. May have been forgotten from D51080/D61597

[Meinersbur]

Like fpcmp. maybe call the validator ${VALIDATOR}-target. Host and target executables exist for fpcmp and at this point I am not sure why.

[fhahn]

Add -target suffix.

[fhahn]

In D95358#2519994, @Meinersbur wrote:

Like fpcmp. maybe call the validator ${VALIDATOR}-target. Host and target executables exist for fpcmp and at this point I am not sure why.

Not sure about fcmp, it seems like only the -target one should be needed. timeit also has target and host versions, but I think those are needed, as we also run timeit on the host to measure compile-time. I added the -target suffix to the image validate target

[Meinersbur]

In D95358#2522834, @fhahn wrote:

Not sure about fcmp, it seems like only the -target one should be needed. timeit also has target and host versions, but I think those are needed, as we also run timeit on the host to measure compile-time. I added the -target suffix to the image validate target

At the time I added the SPEC 2017 files, I copied the approach taken for fpcmp, and It think at that time the VERIFY: lines were meant to be executed on the host (executing the RUN: via the TEST_SUITE_REMOTE_CLIENT option). Things have changed since them and since I used fpcmp as a template, the validator should follow its changes.

[fhahn]

Thanks for taking a look!

External/SPEC/SpecCPU2017.cmake

 endmacro ()
 
 
 # Compare an image file to a reference image.
 macro(speccpu2017_validate_image _imgfile _cmpfile _outfile)
   cmake_parse_arguments(_carg "" "RUN_TYPE" "SUITE_TYPE" ${ARGN})
 
   set(VALIDATOR imagevalidate_${BENCHMARK_NO})
-  if (NOT TARGET ${VALIDATOR}-host)
+  if (NOT TARGET ${VALIDATOR})
     file(GLOB_RECURSE _validator_sources "${SRC_DIR}/image_validator/*.c")
-    llvm_add_host_executable(
-      ${VALIDATOR}-host ${VALIDATOR} ${_validator_sources}
-      LDFLAGS -lm
-      CPPFLAGS -DSPEC
-    )
+
+    add_executable(${VALIDATOR} ${_validator_sources})
+    target_link_libraries(${VALIDATOR} m)
+    set_target_properties(${VALIDATOR} PROPERTIES COMPILE_FLAGS "-DSPEC")
+    add_dependencies(${VALIDATOR} timeit-target)
   endif ()
 
   if ((NOT DEFINED _carg_SUITE_TYPE) OR (${BENCHMARK_SUITE_TYPE} IN_LIST _carg_SUITE_TYPE))
     get_filename_component(_basename "${_imgfile}" NAME_WE)
     get_filename_component(_ext "${_imgfile}" EXT)
     llvm_test_verify(
       cd "${RUN_${_carg_RUN_TYPE}_DIR}" &&
       "${CMAKE_CURRENT_BINARY_DIR}/${VALIDATOR}" ${_carg_UNPARSED_ARGUMENTS}
if (_sources)
     endforeach()
   else ()
     file(GLOB_RECURSE _sources
       ${SRC_DIR}/*.c ${SRC_DIR}/*.cpp ${SRC_DIR}/*.cc ${SRC_DIR}/*.C)
   endif ()
 
   llvm_test_executable(${PROG} ${_sources})
 
-  if (TARGET ${VALIDATOR}-host)
-    add_dependencies(${PROG} ${VALIDATOR}-host)
+  if (TARGET ${VALIDATOR})
+    add_dependencies(${PROG} ${VALIDATOR})
   endif ()
 endmacro()
 
 
 # Copy the input data to the rundir.
 #
 # Can often be avoided by either passing an absolute path to the file in the
 # input dir, or using the input dir as working directory and specify the output