[all-commits] [llvm/llvm-project] d50044: [CUDA] Improve clang's ability to detect recent CU...

[Artem Belevich via All-commits]

  Branch: refs/heads/release/11.x
  Home:   https://github.com/llvm/llvm-project
  Commit: d50044e809d2c15c56df0ea808f047a2c81d7344
      https://github.com/llvm/llvm-project/commit/d50044e809d2c15c56df0ea808f047a2c81d7344
  Author: Artem Belevich <tra at google.com>
  Date:   2020-11-20 (Fri, 20 Nov 2020)

  Changed paths:
    M clang/lib/Driver/ToolChains/Cuda.cpp
    A clang/test/Driver/Inputs/CUDA_111/usr/local/cuda/bin/.keep
    A clang/test/Driver/Inputs/CUDA_111/usr/local/cuda/include/.keep
    A clang/test/Driver/Inputs/CUDA_111/usr/local/cuda/lib/.keep
    A clang/test/Driver/Inputs/CUDA_111/usr/local/cuda/lib64/.keep
    A clang/test/Driver/Inputs/CUDA_111/usr/local/cuda/nvvm/libdevice/libdevice.10.bc
    M clang/test/Driver/cuda-version-check.cu

  Log Message:
  -----------
  [CUDA] Improve clang's ability to detect recent CUDA versions.

CUDA-11.1 does not carry version.txt which causes clang to assume that it's
CUDA-7.0, which used to be the only CUDA version w/o version.txt.

In order to tell CUDA-7.0 apart from the new versions, clang now probes for the
presence of libdevice.10.bc which is not present in the old CUDA versions.

This should keep Clang working for CUDA-11.1.

PR47332: https://bugs.llvm.org/show_bug.cgi?id=47332

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

(cherry picked from commit 65d206484c54177641d4b11d42cab1f1acc8c0c7)


  Commit: 06f479cba3a09ef47326ea69e719d2aa1c0fba4c
      https://github.com/llvm/llvm-project/commit/06f479cba3a09ef47326ea69e719d2aa1c0fba4c
  Author: Artem Belevich <tra at google.com>
  Date:   2020-11-20 (Fri, 20 Nov 2020)

  Changed paths:
    M clang/include/clang/Basic/DiagnosticDriverKinds.td
    M clang/lib/Driver/ToolChains/Cuda.cpp
    M clang/lib/Driver/ToolChains/Cuda.h
    A clang/test/Driver/Inputs/CUDA_102/usr/local/cuda/bin/.keep
    A clang/test/Driver/Inputs/CUDA_102/usr/local/cuda/include/.keep
    A clang/test/Driver/Inputs/CUDA_102/usr/local/cuda/lib/.keep
    A clang/test/Driver/Inputs/CUDA_102/usr/local/cuda/lib64/.keep
    A clang/test/Driver/Inputs/CUDA_102/usr/local/cuda/nvvm/libdevice/libdevice.10.bc
    A clang/test/Driver/Inputs/CUDA_102/usr/local/cuda/version.txt
    A clang/test/Driver/Inputs/CUDA_111/usr/local/cuda/include/cuda.h
    M clang/test/Driver/cuda-version-check.cu

  Log Message:
  -----------
  [CUDA] Extract CUDA version from cuda.h if version.txt is not found

If CUDA version can not be determined based on version.txt file, attempt to find
CUDA_VERSION macro in cuda.h.

This is a follow-up to D89752,

Differntial Revision: https://reviews.llvm.org/D89832

(cherry picked from commit e7fe125b776bf08d95e60ff3354a5c836218a0e6)


Compare: https://github.com/llvm/llvm-project/compare/0874e7ef66cc...06f479cba3a0