From 835bde481b10faf3d6db7a2c0862c7fd047a5aa3 Mon Sep 17 00:00:00 2001 From: agunashe <86270081+agunashe@users.noreply.github.com> Date: Thu, 10 Feb 2022 08:27:05 -0800 Subject: [PATCH] SWDEV-1 - hip change for Windows applications hipInfo (#2471) BLDSPPT-3818 Change-Id: I624786a0d79678fbd850f0b8bedc7314731a77f4 --- samples/1_Utils/hipInfo/CMakeLists.txt | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/samples/1_Utils/hipInfo/CMakeLists.txt b/samples/1_Utils/hipInfo/CMakeLists.txt index 4314467527..6192c8ecff 100644 --- a/samples/1_Utils/hipInfo/CMakeLists.txt +++ b/samples/1_Utils/hipInfo/CMakeLists.txt @@ -18,10 +18,18 @@ # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN # THE SOFTWARE. +# hipcc.bat fails to qualify as a valid compiler for CMAKE_CXX_COMPILER_ID = ROCMClang +# so the simple compiler test is skipped and forced to use hipcc.bat as compiler +set(CMAKE_C_COMPILER_WORKS 1) +set(CMAKE_CXX_COMPILER_WORKS 1) + project(hipInfo) cmake_minimum_required(VERSION 3.10) +# flag is set to ON in compute build for windows +option(HIPINFO_INTERNAL_BUILD "Enable building hipInfo from compute" OFF) + if (NOT DEFINED ROCM_PATH ) set ( ROCM_PATH "/opt/rocm" CACHE STRING "Default ROCM installation directory." ) endif () @@ -29,6 +37,12 @@ endif () # Search for rocm in common locations list(APPEND CMAKE_PREFIX_PATH ${ROCM_PATH}/hip ${ROCM_PATH}) +# need to set rocm_path for windows +# since clang and hip are two different folders during build/install step +if (WIN32 AND HIPINFO_INTERNAL_BUILD) + set (CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} --rocm-path=${HIP_PATH}") +endif() + # Find hip find_package(hip) @@ -42,3 +56,10 @@ add_executable(hipInfo hipInfo.cpp) # Link with HIP target_link_libraries(hipInfo hip::host) + +# Used only when make install is called +# when hipInfo is built as part of compute project +# hipInfo.exe will be installed to install/hip/bin path +if (WIN32 AND HIPINFO_INTERNAL_BUILD) + install(FILES ${PROJECT_BINARY_DIR}/hipInfo.exe DESTINATION .) +endif()