SWDEV-345870 - Correct HIP path for new directory layout and removed the usage of HSA_PATH in hipcc #3065
Conversation
…the usage of HSA_PATH in hipcc With file reorganization, HIP installed in /opt/rocm-ver Use the install path rather than using backward compatible path. HSA_PATH is not at all required in hipcc and removed the same Change-Id: Ia461cb4da2c0e0967703033f5c2c79b67732f5b5
| # RealPath: /opt/rocm-ver/lib/cmake/hip-lang/hip-lang-config.cmake | ||
| # Go 4 level up to get IMPORT PREFIX | ||
| get_filename_component(_DIR "${CMAKE_CURRENT_LIST_FILE}" REALPATH) | ||
| get_filename_component(_IMPORT_PREFIX "${_DIR}/../../../../" ABSOLUTE) |
There was a problem hiding this comment.
This is what I found.
CMAKE_CURRENT_LIST_FILE: /opt/rocm-ver/lib/cmake/hip-lang/hip-lang-config.cmake
_DIR: /opt/rocm-ver/lib/cmake/hip-lang/hip-lang-config.cmake
_IMPORT_PREFIX: /opt/rocm-ver
It seems giving the desired _IMPORT_PREFIX value.
_DIR is no more a directory and "${_DIR}/../../../../" seems very strange to me.
Not clear to me why this is better than the old working lines.
There was a problem hiding this comment.
In the hip-runtime-amd package , the hip-lang-config.cmake is there in
/opt/rocm-ver/lib/cmake/hip-lang/hip-lang-config.cmake # actual file
/opt/rocm-ver/hip/lib/cmake/hip-lang/hip-lang-config.cmake # Soft link file for backward compatibility
The directory /opt/rocm-ver/hip/lib/cmake/hip-lang is not a soft link, but file is soft link
With the previous code, the _IMPORT_PREFIX may become /opt/rocm-ver/hip if run from backward compatibility path.
Agree that _DIR is now no more a directory. Will update the variable name
| #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") | ||
| file(GLOB HIP_CLANG_INCLUDE_SEARCH_PATHS "${_IMPORT_PREFIX}/llvm/lib/clang/*/include") |
There was a problem hiding this comment.
@gregrodgers This is what I mentioned about hip-lang never done properly. The hard coded llvm on the path clearly choked aomp. The correct way should locate the clang header files inlcude path based on the compiler not the full rocm root. This is actually done correctly below using HIP_COMPILER_INSTALL_PATH for CLANG_RT.
I gave the fix as https://github.com/ROCm-Developer-Tools/HIP/pull/2776/files
But the upstream keeps doing wrong and even worse.
With file reorganization, HIP installed in /opt/rocm-ver
Use the install path rather than using backward compatible path.
HSA_PATH is not at all required in hipcc and removed the same
Change-Id: Ia461cb4da2c0e0967703033f5c2c79b67732f5b5