[Bf-blender-cvs] [e11c899e715] blender-v3.3-release: Cycles: disable Metal inlining optimization on Apple GPUs

Brecht Van Lommel noreply at git.blender.org
Thu Aug 18 20:16:50 CEST 2022


Commit: e11c899e715b01f65b0a3b9b99cd69cf460209b1
Author: Brecht Van Lommel
Date:   Wed Aug 17 18:31:52 2022 +0200
Branches: blender-v3.3-release
https://developer.blender.org/rBe11c899e715b01f65b0a3b9b99cd69cf460209b1

Cycles: disable Metal inlining optimization on Apple GPUs

This gave a 1.1x speedup, however also leads to very long compile times
that make it seems like Blender has stopped working.

This can be brought back in the future behind an option that users can
explicitly enabled.

Fix T100102

Ref D14923, D14763, T92212

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

M	intern/cycles/kernel/device/metal/compat.h

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

diff --git a/intern/cycles/kernel/device/metal/compat.h b/intern/cycles/kernel/device/metal/compat.h
index 80ee8ef5b57..674de554f61 100644
--- a/intern/cycles/kernel/device/metal/compat.h
+++ b/intern/cycles/kernel/device/metal/compat.h
@@ -29,11 +29,12 @@ using namespace metal::raytracing;
 
 /* Qualifiers */
 
-#if defined(__KERNEL_METAL_APPLE__)
+/* Inline everything for Apple GPUs. This gives ~1.1x speedup and 10% spill
+ * reduction for integator_shade_surface. However it comes at the cost of
+ * longer compile times (~4.5 minutes on M1 Max) and is disabled for that
+ * reason, until there is a user option to manually enable it. */
 
-/* Inline everything for Apple GPUs.
- * This gives ~1.1x speedup and 10% spill reduction for integator_shade_surface
- * at the cost of longer compile times (~4.5 minutes on M1 Max). */
+#if 0  // defined(__KERNEL_METAL_APPLE__)
 
 #  define ccl_device __attribute__((always_inline))
 #  define ccl_device_inline __attribute__((always_inline))



More information about the Bf-blender-cvs mailing list