Cr8-xyz/blender
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix Cycles HIP binaries always recompiling

Browse Source
This commit is contained in:
Brecht Van Lommel
2021-10-22 14:14:03 +02:00
parent 269f4a3024
commit c4b02bb6bc
1 changed files with 5 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
intern/cycles/kernel/CMakeLists.txt
View File

@@ -500,20 +500,17 @@ if(WITH_CYCLES_HIP_BINARIES AND WITH_CYCLES_DEVICE_HIP)
) )
set(hip_fatbins) set(hip_fatbins)
macro(CYCLES_HIP_KERNEL_ADD arch prev_arch name flags sources experimental) macro(CYCLES_HIP_KERNEL_ADD arch name flags sources experimental)
set(format "fatbin") set(format "fatbin")
set(hip_file ${name}_${arch}.${format}) set(hip_file ${name}_${arch}.${format})
set(kernel_sources ${sources}) set(kernel_sources ${sources})
if(NOT ${prev_arch} STREQUAL "none")
set(kernel_sources ${kernel_sources} ${name}_${prev_arch}.fatbin)
endif()
set(hip_kernel_src "/device/hip/${name}.cpp") set(hip_kernel_src "/device/hip/${name}.cpp")
if(WIN32) if(WIN32)
set(hip_command ${CMAKE_COMMAND}) set(hip_command ${CMAKE_COMMAND})
set(hip_flags set(hip_flags
-E env "HIP_PATH=${HIP_ROOT_DIR}" "PATH=${HIP_PERL_PATH}" -E env "HIP_PATH=${HIP_ROOT_DIR}" "PATH=${HIP_PERL_DIR}"
${HIP_HIPCC_EXECUTABLE}.bat) ${HIP_HIPCC_EXECUTABLE}.bat)
else() else()
set(hip_command ${HIP_HIPCC_EXECUTABLE}) set(hip_command ${HIP_HIPCC_EXECUTABLE})
@@ -547,18 +544,17 @@ if(WITH_CYCLES_HIP_BINARIES AND WITH_CYCLES_DEVICE_HIP)
set(hip_flags ${hip_flags} -D __KERNEL_DEBUG__) set(hip_flags ${hip_flags} -D __KERNEL_DEBUG__)
endif() endif()
add_custom_target( add_custom_command(
${hip_file} OUTPUT ${hip_file}
COMMAND ${hip_command} ${hip_flags} COMMAND ${hip_command} ${hip_flags}
DEPENDS ${kernel_sources}) DEPENDS ${kernel_sources})
delayed_install("${CMAKE_CURRENT_BINARY_DIR}" "${hip_file}" ${CYCLES_INSTALL_PATH}/lib) delayed_install("${CMAKE_CURRENT_BINARY_DIR}" "${hip_file}" ${CYCLES_INSTALL_PATH}/lib)
list(APPEND hip_fatbins ${hip_file}) list(APPEND hip_fatbins ${hip_file})
endmacro() endmacro()
set(prev_arch "none")
foreach(arch ${CYCLES_HIP_BINARIES_ARCH}) foreach(arch ${CYCLES_HIP_BINARIES_ARCH})
# Compile regular kernel # Compile regular kernel
CYCLES_HIP_KERNEL_ADD(${arch} ${prev_arch} kernel "" "${hip_sources}" FALSE) CYCLES_HIP_KERNEL_ADD(${arch} kernel "" "${hip_sources}" FALSE)
endforeach() endforeach()
add_custom_target(cycles_kernel_hip ALL DEPENDS ${hip_fatbins}) add_custom_target(cycles_kernel_hip ALL DEPENDS ${hip_fatbins})