Rename fpcmp and timeit custom targets to {fpcmp,timeit}-host.

[jlebar]

Summary

Ninja is displeased with the binary name matching the custom target name. We get

ninja: warning: multiple rules generate tools/fpcmp. builds involving this target will not be correct; continuing anyway [-w dupbuild=warn]
ninja: warning: multiple rules generate tools/timeit. builds involving this target will not be correct; continuing anyway [-w dupbuild=warn]

followed by many build errors because test-suite-bins/tools/timeit does not exist:

Building CXX object SingleSource/Regression/C++/CMakeFiles/2003-05-14-array-init.dir/2003-05-14-array-init.cpp.o
FAILED: /usr/local/google/home/jlebar/llvm/release/test-suite-bins/tools/timeit --summary SingleSource/Regression/C++/CMakeFiles/2003-05-14-array-init.dir/2003-05-14-array-init.cpp.o.time /usr/local/google/home/jlebar/llvm/release/./bin/clang++   -DNDEBUG  -O3 -DNDEBUG   -w -MMD -MT SingleSource/Regression/C++/CMakeFiles/2003-05-14-array-init.dir/2003-05-14-array-init.cpp.o -MF SingleSource/Regression/C++/CMakeFiles/2003-05-14-array-init.dir/2003-05-14-array-init.cpp.o.d -o SingleSource/Regression/C++/CMakeFiles/2003-05-14-array-init.dir/2003-05-14-array-init.cpp.o -c /usr/local/google/home/jlebar/llvm/src/projects/test-suite/SingleSource/Regression/C++/2003-05-14-array-init.cpp
/bin/sh: /usr/local/google/home/jlebar/llvm/release/test-suite-bins/tools/timeit: No such file or directory

[MatzeB]

Yes I am seeing the same problem here but didn't figure out a fix yet. LGTM.

[MatzeB]

In D16146#326001, @MatzeB wrote:

Yes I am seeing the same problem here but didn't figure out a fix yet. LGTM.

Hmm these changes make ninja compile fpcmp and timeit again for me but I still get the warning from ninja about multiple rules to generate tools/XXX.

[jlebar]

In D16146#326123, @MatzeB wrote:

In D16146#326001, @MatzeB wrote:

Yes I am seeing the same problem here but didn't figure out a fix yet. LGTM.

Hmm these changes make ninja compile fpcmp and timeit again for me but I still get the warning from ninja about multiple rules to generate tools/XXX.

Sorry, race condition, saw this only right after I submitted. Did you start from a completely clean objdir?

[MatzeB]

In D16146#326126, @jlebar wrote:

In D16146#326123, @MatzeB wrote:

In D16146#326001, @MatzeB wrote:

Yes I am seeing the same problem here but didn't figure out a fix yet. LGTM.

Hmm these changes make ninja compile fpcmp and timeit again for me but I still get the warning from ninja about multiple rules to generate tools/XXX.

Sorry, race condition, saw this only right after I submitted. Did you start from a completely clean objdir?

Well the commit still improves the situation so no problem. I think the issue disappears for me if I do not mention the full path at the add_custom_command OUTPUT anymore. I will prepare a patch.

test-suite/trunk/cmake/modules/SingleMultiSource.cmake

foreach(source ${sources})
     if(${name_idx} EQUAL -1)
       get_unique_exe_name(source_exename ${source})
       add_executable(${source_exename} ${source})
       append_cflags(${source_exename} CFLAGS)
       append_cflags(${source_exename} CPPFLAGS)
       append_cflags(${source_exename} CXXFLAGS)
       append_ldflags(${source_exename} LDFLAGS)
       llvm_add_test(${name} ${source_exename})
-      add_dependencies(${source_exename} timeit timeit-target fpcmp)
+      add_dependencies(${source_exename} timeit-host timeit-target fpcmp-host)
     endif()
   endforeach()
 endmacro()
 
 # llvm_multisource - configure the current directory as a MultiSource subdirectory -
 # i.e. there is one test and it consists of all sources in the directory (or a curated
 # list, if Source is defined).
 macro(llvm_multisource)
if(${name_idx} EQUAL -1)
     include_directories(${CMAKE_CURRENT_BINARY_DIR})
     get_unique_exe_name(source_exename "${PROG}.c")
     add_executable(${source_exename} ${sources})
     append_cflags(${source_exename} CFLAGS)
     append_cflags(${source_exename} CPPFLAGS)
     append_cflags(${source_exename} CXXFLAGS)
     append_ldflags(${source_exename} LDFLAGS)
     llvm_add_test(${PROG} ${source_exename})
-    add_dependencies(${source_exename} timeit timeit-target fpcmp)
+    add_dependencies(${source_exename} timeit-host timeit-target fpcmp-host)
   endif()
   endif()
 endmacro()
 
 macro(llvm_test_run)
   CMAKE_PARSE_ARGUMENTS(ARGS "" "RUN_TYPE;EXECUTABLE;WORKDIR" "" ${ARGN})
   # If no executable is specified use $EXECUTABLE$ placeholder which will be
   # replaced later.

test-suite/trunk/tools/CMakeLists.txt

 add_executable(timeit-target ${CMAKE_CURRENT_SOURCE_DIR}/timeit.c)
 
 # FIXME: Replicate Makefile.tools's logic for determining whether to use fpcmp/fpcmp.sh
 
 # Note that we have to compile fpcmp and timeit for the host machine even when
 # cross compiling to a different target. We use custom rules doing "cc file.c"
 # as an ad-hoc solution for now. A proper solution would probably be based on
 # ExternalProject_Add(); See also http://reviews.llvm.org/D15004
 
 set(TEST_SUITE_HOST_CC "cc" CACHE STRING "C compiler targetting the host")
 mark_as_advanced(TEST_SUITE_HOST_CC)
-add_custom_target(fpcmp
+add_custom_target(fpcmp-host
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/fpcmp)
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/fpcmp
   COMMAND ${TEST_SUITE_HOST_CC} ${CMAKE_CURRENT_SOURCE_DIR}/fpcmp.c -o ${CMAKE_CURRENT_BINARY_DIR}/fpcmp
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/fpcmp.c
 )
-add_custom_target(timeit
+add_custom_target(timeit-host
     DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/timeit)
 add_custom_command(OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/timeit
   COMMAND ${TEST_SUITE_HOST_CC} ${CMAKE_CURRENT_SOURCE_DIR}/timeit.c -o ${CMAKE_CURRENT_BINARY_DIR}/timeit
   DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/timeit.c
 )