This is an archive of the discontinued LLVM Phabricator instance.

Differential D134674

[mlir] Correctly handle HIP_PATH when ROCM_PATH is set
ClosedPublic

Authored by krzysz00 on Sep 26 2022, 1:48 PM.

Details

Reviewers
mehdi_amini
nikic
jpienaar
Commits
rGbd77e1c82724: [mlir] Correctly handle HIP_PATH when ROCM_PATH is set
Summary

With the CMake file as written, if code elsewhere had set ROCM_PATH,
then HIP_PATH would not be set, breaking the rest of the ROCm
execution utility handling.

Diff Detail

Event Timeline

krzysz00 created this revision.Sep 26 2022, 1:48 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 26 2022, 1:48 PM
Herald added subscribers: zero9178, bzcheeseman, sdasgup3 and 20 others. · View Herald Transcript
krzysz00 requested review of this revision.Sep 26 2022, 1:48 PM
Herald added a project: Restricted Project. · View Herald TranscriptSep 26 2022, 1:48 PM
Herald added subscribers: stephenneuendorffer, nicolasvasilache. · View Herald Transcript
krzysz00 added reviewers: mehdi_amini, nikic, jpienaar.Sep 26 2022, 1:50 PM
Harbormaster completed remote builds in B188781: Diff 463011.Sep 26 2022, 2:18 PM
mehdi_amini accepted this revision.Sep 26 2022, 8:29 PM
This revision is now accepted and ready to land.Sep 26 2022, 8:29 PM
Closed by commit rGbd77e1c82724: [mlir] Correctly handle HIP_PATH when ROCM_PATH is set (authored by krzysz00). · Explain WhySep 27 2022, 7:33 AM
This revision was automatically updated to reflect the committed changes.
krzysz00 added a commit: rGbd77e1c82724: [mlir] Correctly handle HIP_PATH when ROCM_PATH is set.

Revision Contents

PathSize
mlir/
lib/
ExecutionEngine/
2 lines

Diff 463231

mlir/lib/ExecutionEngine/CMakeLists.txt

Show First 20 Lines • Show All 183 Lines • ▼ Show 20 Lines
if(MLIR_ENABLE_ROCM_RUNNER) if(MLIR_ENABLE_ROCM_RUNNER)
# Configure ROCm support. # Configure ROCm support.
if (NOT DEFINED ROCM_PATH) if (NOT DEFINED ROCM_PATH)
if (NOT DEFINED ENV{ROCM_PATH}) if (NOT DEFINED ENV{ROCM_PATH})
set(ROCM_PATH "/opt/rocm" CACHE PATH "Path to which ROCm has been installed") set(ROCM_PATH "/opt/rocm" CACHE PATH "Path to which ROCm has been installed")
else() else()
set(ROCM_PATH $ENV{ROCM_PATH} CACHE PATH "Path to which ROCm has been installed") set(ROCM_PATH $ENV{ROCM_PATH} CACHE PATH "Path to which ROCm has been installed")
endif() endif()
set(HIP_PATH "${ROCM_PATH}/hip" CACHE PATH "Path to which HIP has been installed")
endif() endif()
set(HIP_PATH "${ROCM_PATH}/hip" CACHE PATH "Path to which HIP has been installed")
set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH}) set(CMAKE_MODULE_PATH "${HIP_PATH}/cmake" ${CMAKE_MODULE_PATH})
find_package(HIP) find_package(HIP)
if (NOT HIP_FOUND) if (NOT HIP_FOUND)
message(SEND_ERROR "Building mlir with ROCm support requires a working ROCm and HIP install") message(SEND_ERROR "Building mlir with ROCm support requires a working ROCm and HIP install")
else() else()
message(STATUS "ROCm HIP version: ${HIP_VERSION}") message(STATUS "ROCm HIP version: ${HIP_VERSION}")
endif() endif()
▲ Show 20 Lines • Show All 81 Lines • Show Last 20 Lines