Make hip-lang-config.cmake.in more robust. #2776
Open
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ye-luo
commented
Jun 29, 2022
| #need _IMPORT_PREFIX to be set #FILE_REORG_BACKWARD_COMPATIBILITY | ||
| file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/../llvm/lib/clang/*/include") | ||
| file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${_IMPORT_PREFIX}/llvm/lib/clang/*/include") | ||
| find_path(HIP_CLANG_INCLUDE_PATH __clang_cuda_math.h |
There was a problem hiding this comment.
Since __clang_cuda_math.h is used for device compilation.
isn't it better to have it following the compiler installation?
| HINTS ${HIP_CLANG_INCLUDE_SEARCH_PATHS} | ||
| ${HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG} | ||
| NO_DEFAULT_PATH) | ||
| get_filename_component(HIP_CLANG_INCLUDE_PATH "${HIP_CLANG_INCLUDE_PATH}" DIRECTORY) |
There was a problem hiding this comment.
This line break case 1 CLANGRT_BUILTINS-NOTFOUND.
It removes "include" and make HIP_CLANG_INCLUDE_PATH just wrong and line 109 bad.
Thus removed.
| @@ -99,6 +89,21 @@ if (NOT HSA_HEADER) | |||
| endif() | |||
|
|
|||
| get_filename_component(HIP_COMPILER_INSTALL_PATH ${CMAKE_HIP_COMPILER} DIRECTORY) | |||
| # locate device compilation include path HIP_CLANG_INCLUDE_PATH | |||
| # generic case | |||
| file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/include") | |||
There was a problem hiding this comment.
This line should take care CMAKE_HIP_COMPILER
/usr/lib/aomp/bin/clang++
/soft/llvm/main-20220627/bin/clang++
/opt/rocm/llvm/bin/clang++
| # generic case | ||
| file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${HIP_COMPILER_INSTALL_PATH}/../lib/clang/*/include") | ||
| # <ROCM_PATH>/bin/amdclang++ | ||
| file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS_REORG "${HIP_COMPILER_INSTALL_PATH}/../llvm/lib/clang/*/include") |
There was a problem hiding this comment.
Only this one is unique for the soft link being used.
| NO_DEFAULT_PATH) | ||
|
|
||
| if (NOT HIP_CLANG_INCLUDE_PATH) | ||
| message (FATAL_ERROR "Incorrect HIP_CLANG_INCLUDE_PATH. __clang_cuda_math.h not found!") |
This was referenced Jun 29, 2022
|
#3065 keeps doing in the wrong way. |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Still need to address #2433
Make the following two cases work with https://github.com/ye-luo/cmake_gpu/tree/master/test_rocm
Case 1.
Case 2 AOMP or upstream clang doesn't use ROCm layout.