[Bf-blender-cvs] [3426c513d83] cycles_oneapi: Cycles: remove inline-threshold workaround

[Xavier Hallade]

Commit: 3426c513d83ec9575f6673da4e2da20e934a1248
Author: Xavier Hallade
Date:   Thu May 26 09:13:26 2022 +0200
Branches: cycles_oneapi
https://developer.blender.org/rB3426c513d83ec9575f6673da4e2da20e934a1248

Cycles: remove inline-threshold workaround

we achieve the same compiler speedup by adjusting inlining for specific
methods, those already defined to be force inlined and those declared
inline in kernel/geom/primitive.h

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

M	intern/cycles/kernel/CMakeLists.txt
M	intern/cycles/kernel/device/oneapi/compat.h

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

diff --git a/intern/cycles/kernel/CMakeLists.txt b/intern/cycles/kernel/CMakeLists.txt
index 0a8f05f033d..ed73289ae15 100644
--- a/intern/cycles/kernel/CMakeLists.txt
+++ b/intern/cycles/kernel/CMakeLists.txt
@@ -728,7 +728,6 @@ if(WITH_CYCLES_DEVICE_ONEAPI)
       -ffast-math
       -DNDEBUG
       -O2
-      -mllvm -inlinedefault-threshold=400
       -o ${cycles_kernel_oneapi_lib}
       -I${CMAKE_CURRENT_SOURCE_DIR}/..
       -I${LEVEL_ZERO_INCLUDE_DIR}
diff --git a/intern/cycles/kernel/device/oneapi/compat.h b/intern/cycles/kernel/device/oneapi/compat.h
index d4f15d95875..e5049a7ffe4 100644
--- a/intern/cycles/kernel/device/oneapi/compat.h
+++ b/intern/cycles/kernel/device/oneapi/compat.h
@@ -37,7 +37,7 @@
 #define ccl_noinline
 #define ccl_inline_constant const constexpr
 #define ccl_static_constant const
-#define ccl_device_forceinline inline
+#define ccl_device_forceinline __attribute__((always_inline))
 #define ccl_device_noinline ccl_device ccl_noinline
 #define ccl_device_noinline_cpu ccl_device
 #define ccl_device_inline_method ccl_device
@@ -187,8 +187,6 @@ ccl_always_inline float3 make_float3(float x)
 #define fmodf(x, y) sycl::fmod((x), (y))
 #define lgammaf(x) sycl::lgamma((x))
 
-#define __forceinline inline
-
 /* Types */
 #include "util/half.h"
 #include "util/types.h"