From abfa09752f5c4d1fa2ae9df5e4ee0c9d77b50f3e Mon Sep 17 00:00:00 2001
From: Sayak Biswas <sayakAMD>
Date: Tue, 28 Jun 2022 16:55:27 +0200
Subject: Cycles: enable Vega GPU/APU support

Enables Vega and Vega II GPUs as well as Vega APU, using changes in HIP code
to support 64-bit waves and a new HIP SDK version.

Tested with Radeon WX9100, Radeon VII GPUs and Ryzen 7 PRO 5850U with Radeon
Graphics APU.

Ref T96740, T91571

Differential Revision: https://developer.blender.org/D15242
---
 intern/cycles/util/math.h | 3 +++
 1 file changed, 3 insertions(+)

(limited to 'intern/cycles/util')

diff --git a/intern/cycles/util/math.h b/intern/cycles/util/math.h
index d1773970bab..f1f627588c5 100644
--- a/intern/cycles/util/math.h
+++ b/intern/cycles/util/math.h
@@ -793,6 +793,9 @@ ccl_device_inline uint popcount(uint x)
   return i & 1;
 }
 #  endif
+#elif defined(__KERNEL_HIP__)
+/* Use popcll to support 64-bit wave for pre-RDNA AMD GPUs */
+#  define popcount(x) __popcll(x)
 #elif !defined(__KERNEL_METAL__)
 #  define popcount(x) __popc(x)
 #endif
-- 
cgit v1.2.3