[test-suite, CUDA] Update CUDA test suite cmake files.

[tra]

Summary

This should unbreak CUDA buildbots affected by D51048.

The problem is that CUDA test suite is generating multiple
test executables that all use the same reference output file
and that resulted in multiple compilation jobs attempting to
create the same symlink at the same time.

This patch adds a SUFFIX parameter to make it possible to append
a suffix to the target file name and that allows us to avoid name clashes.

[MatzeB]

LGTM, sorry for the breakage.

cmake/modules/TestSuite.cmake

23 ↗

(On Diff #163942)

maybe call this DEST_SUFFIX to make it clear the suffix is applied to the destination filename?

[MatzeB]

cmake/modules/TestSuite.cmake

28–31 ↗

(On Diff #163942)

As the default is undefined/empty suffix anyway, can't you use ${_LTDARGS_SUFFIX} directly below? Or go with a simple set(SUFFIX ${_LTDAGS_SUFFIX} without the if here?

[tra]

Updated the changes according to Matthias' comments.

[tra]

In D51663#1224057, @MatzeB wrote:

LGTM, sorry for the breakage.

No problem. Thank you for the diff with the potential fix. It helped sorting this out.

test-suite/trunk/External/CUDA/CMakeLists.txt

macro(cuda_glob Var)
   set(${Var} ${FileList})
 endmacro(cuda_glob)
 
 macro(create_one_local_test_f Name FileGlob FilterRegex)
   if (${VariantSuffix} MATCHES ${FilterRegex})
     cuda_glob(_sources ${FileGlob})
     set(_executable ${Name}-${VariantSuffix})
     set(_executable_path ${CMAKE_CURRENT_BINARY_DIR}/${_executable})
+    llvm_test_run()
+    set(REFERENCE_OUTPUT)
     # Verify reference output if it exists.
     if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${Name}.reference_output)
-      llvm_test_traditional(${Name})
+      set(REFERENCE_OUTPUT ${Name}.reference_output)
+      llvm_test_verify(WORKDIR ${CMAKE_CURRENT_BINARY_DIR}
+        ${FPCMP} %o ${REFERENCE_OUTPUT}-${VariantSuffix}
+      )
+      llvm_test_executable(${_executable} ${_sources})
+      llvm_test_data(${_executable}
+                     DEST_SUFFIX "-${VariantSuffix}"
+                     ${REFERENCE_OUTPUT})
     else()
-      # otherwise just run the executable.
-      llvm_test_run()
-    endif()
       llvm_test_executable(${_executable} ${_sources})
+    endif()
     target_compile_options(${_executable} PUBLIC ${VariantCPPFLAGS})
     if(VariantLibs)
       target_link_libraries(${_executable} ${VariantLibs})
     endif()
     add_dependencies(cuda-tests-simple-${VariantSuffix} ${_executable})
     # Local tests are presumed to be fast.
     list(APPEND CUDA_SIMPLE_TEST_TARGETS ${_executable}.test)
   endif()

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

 option(TEST_SUITE_COPY_DATA "Always copy benchmark data to builddir"
        ${_DEFAULT_TEST_SUITE_COPY_DATA})
 mark_as_advanced(TEST_SUITE_COPY_DATA)
 
 # Copies files and directories to be used as benchmark input data to the
 # directory of the benchmark executable.
 # Paths are interepreted relative to CMAKE_CURRENT_SOURCE_DIR by default but
 # this can be changed with the SOURCE_DIR argument.
+# If DEST_SUFFIX is specified, it's appended to the destination file names.
 function(llvm_test_data target)
-  cmake_parse_arguments(_LTDARGS "MUST_COPY" "SOURCE_DIR" "" ${ARGN})
+  cmake_parse_arguments(_LTDARGS "MUST_COPY" "SOURCE_DIR;DEST_SUFFIX" "" ${ARGN})
   set(SOURCE_DIR ${CMAKE_CURRENT_SOURCE_DIR})
   if(_LTDARGS_SOURCE_DIR)
     set(SOURCE_DIR ${_LTDARGS_SOURCE_DIR})
   endif()
+  set(SUFFIX ${_LTDARGS_DEST_SUFFIX})
   foreach(file ${_LTDARGS_UNPARSED_ARGUMENTS})
     set(full_path ${SOURCE_DIR}/${file})
     if(_LTDARGS_MUST_COPY OR TEST_SUITE_COPY_DATA)
       if(IS_DIRECTORY ${full_path})
-        llvm_copy_dir(${target} $<TARGET_FILE_DIR:${target}>/${file} ${full_path})
+        llvm_copy_dir(${target} $<TARGET_FILE_DIR:${target}>/${file}${SUFFIX} ${full_path})
       else()
-        llvm_copy(${target} $<TARGET_FILE_DIR:${target}>/${file} ${full_path})
+        llvm_copy(${target} $<TARGET_FILE_DIR:${target}>/${file}${SUFFIX} ${full_path})
       endif()
     else()
       get_filename_component(file_subdir ${file} DIRECTORY)
       if(file_subdir)
         llvm_make_directory(${target} ${file_subdir})
       endif()
-      llvm_create_symlink(${target} $<TARGET_FILE_DIR:${target}>/${file} ${full_path})
+      llvm_create_symlink(${target} $<TARGET_FILE_DIR:${target}>/${file}${SUFFIX} ${full_path})
     endif()
   endforeach()
 endfunction()
 
 function(llvm_test_executable_no_test target)
   add_executable(${target} ${ARGN})
   append_target_flags(COMPILE_FLAGS ${target} ${CFLAGS})
   append_target_flags(COMPILE_FLAGS ${target} ${CPPFLAGS})