encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dawn_native/metal: Round workgroup memory size to 16 bytes 

The documentation for setThreadgroupMemoryLength states:
  length - The size of the threadgroup memory, in bytes. Must be a multiple of 16 bytes.

This is the likely cause of a number of CTS flakes for 'webgpu:shader,execution,zero_init:compute,zero_init:storageClass="workgroup";*'

Bug: dawn:1277
Change-Id: Ib8c271fccacac6e68cdf0ddb5c6b5a41756173b5
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/78801
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Ben Clayton <bclayton@chromium.org>
This commit is contained in:
Ben Clayton 2022-02-01 16:53:21 +00:00 committed by Dawn LUCI CQ
parent 6f39141309
commit 7d37677a03
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/dawn_native/metal/ComputePipelineMTL.mm
View File

@ -14,6 +14,7 @@
#include "dawn_native/metal/ComputePipelineMTL.h" #include "dawn_native/metal/ComputePipelineMTL.h"
#include "common/Math.h"
#include "dawn_native/CreatePipelineAsyncTask.h" #include "dawn_native/CreatePipelineAsyncTask.h"
#include "dawn_native/metal/DeviceMTL.h" #include "dawn_native/metal/DeviceMTL.h"
#include "dawn_native/metal/ShaderModuleMTL.h" #include "dawn_native/metal/ShaderModuleMTL.h"
@ -62,7 +63,9 @@ namespace dawn::native::metal {
if (mWorkgroupAllocations[i] == 0) { if (mWorkgroupAllocations[i] == 0) {
continue; continue;
} }
[encoder setThreadgroupMemoryLength:mWorkgroupAllocations[i] atIndex:i]; // Size must be a multiple of 16 bytes.
uint32_t rounded = Align<uint32_t>(mWorkgroupAllocations[i], 16);
[encoder setThreadgroupMemoryLength:rounded atIndex:i];
} }
} }