[Bf-blender-cvs] [2f89ddc0437] cycles-hip-binaries: Cycles: eliminate HIP architectures that fail to build

[Brecht Van Lommel]

Commit: 2f89ddc0437761d6edfc98031dd2b2e790d66196
Author: Brecht Van Lommel
Date:   Fri Oct 22 14:03:01 2021 +0200
Branches: cycles-hip-binaries
https://developer.blender.org/rB2f89ddc0437761d6edfc98031dd2b2e790d66196

Cycles: eliminate HIP architectures that fail to build

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

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

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

diff --git a/CMakeLists.txt b/CMakeLists.txt
index cbe34c4e188..2c08ca9e6ec 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -443,7 +443,7 @@ mark_as_advanced(WITH_CUDA_DYNLOAD)
 # AMD HIP
 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 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")
+set(CYCLES_HIP_BINARIES_ARCH gfx801 gfx803 gfx810 gfx900 gfx902 gfx904 gfx906 gfx908 gfx909 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 c7b9e6cb3be..f38c5dba705 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 > 7) || (major == 7 && minor >= 0);
+  return (major > 8) || (major == 8 && minor >= 1);
 }
 
 CCL_NAMESPACE_END