[Bf-blender-cvs] [01f39ef89d4] cycles-hip-binaries: Cycles: test building for many HIP architectures

[Brecht Van Lommel]

Commit: 01f39ef89d40bd8dfced3efbe1c9007a0c6532cc
Author: Brecht Van Lommel
Date:   Fri Oct 22 12:55:58 2021 +0200
Branches: cycles-hip-binaries
https://developer.blender.org/rB01f39ef89d40bd8dfced3efbe1c9007a0c6532cc

Cycles: test building for many HIP architectures

Most of these will likely not work, but let's see what happens.

===================================================================

M	CMakeLists.txt
M	intern/cycles/device/hip/util.h

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 558e1545c4d..cbe34c4e188 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -441,9 +441,9 @@ mark_as_advanced(WITH_CYCLES_CUDA_BUILD_SERIAL)
 mark_as_advanced(WITH_CUDA_DYNLOAD)
 
 # AMD HIP
-option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" OFF)
+option(WITH_CYCLES_DEVICE_HIP        "Enable Cycles AMD HIP support" ON)
 option(WITH_CYCLES_HIP_BINARIES      "Build Cycles AMD HIP binaries" OFF)
-set(CYCLES_HIP_BINARIES_ARCH gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 gfx1034 CACHE STRING "AMD HIP architectures to build binaries for")
+set(CYCLES_HIP_BINARIES_ARCH gfx700 gfx701 gfx702 gfx703 gfx704 gfx705 gfx801 gfx802 gfx803 gfx805 gfx810 gfx900 gfx902 gfx904 gfx906 gfx908 gfx909 gfx90a gfx1010 gfx1011 gfx1012 gfx1030 gfx1031 gfx1032 CACHE STRING "AMD HIP architectures to build binaries for")
 mark_as_advanced(WITH_CYCLES_DEVICE_HIP)
 mark_as_advanced(CYCLES_HIP_BINARIES_ARCH)
 
diff --git a/intern/cycles/device/hip/util.h b/intern/cycles/device/hip/util.h
index f3194ecaa77..c7b9e6cb3be 100644
--- a/intern/cycles/device/hip/util.h
+++ b/intern/cycles/device/hip/util.h
@@ -64,7 +64,7 @@ static inline bool hipSupportsDevice(const int hipDevId)
   hipDeviceGetAttribute(&major, hipDeviceAttributeComputeCapabilityMajor, hipDevId);
   hipDeviceGetAttribute(&minor, hipDeviceAttributeComputeCapabilityMinor, hipDevId);
 
-  return (major > 10) || (major == 10 && minor >= 3);
+  return (major > 7) || (major == 7 && minor >= 0);
 }
 
 CCL_NAMESPACE_END