encounter/dawn-cmake
1
0
Fork 0
mirror of https://github.com/encounter/dawn-cmake.git synced 2025-07-07 13:45:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

MaxLimitTests: workaround i32 maximum for size annotation

Browse Source 
by clamping the binding size for uniform buffers and using
a dynamically sized array for storage buffers

Bug: dawn:685, dawn:1172
Change-Id: I2222b98d7c2a67cdb420441837e2acfaa8185c73
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/67566
Auto-Submit: Austin Eng <enga@chromium.org>
Commit-Queue: Austin Eng <enga@chromium.org>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
This commit is contained in:
Austin Eng 2021-10-28 02:49:54 +00:00 committed by Dawn LUCI CQ
parent f33afcdba6
commit 1de83e56f7
1 changed files with 23 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/tests/end2end/MaxLimitTests.cpp
View File

@ -15,6 +15,7 @@
#include "tests/DawnTest.h" #include "tests/DawnTest.h"
#include "common/Math.h" #include "common/Math.h"
#include "common/Platform.h"
#include "utils/WGPUHelpers.h" #include "utils/WGPUHelpers.h"
class MaxLimitTests : public DawnTest { class MaxLimitTests : public DawnTest {
@ -101,6 +102,9 @@ TEST_P(MaxLimitTests, MaxBufferBindingSize) {
// The uniform buffer layout used in this test is not supported on ES. // The uniform buffer layout used in this test is not supported on ES.
DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES()); DAWN_TEST_UNSUPPORTED_IF(IsOpenGLES());
// TODO(crbug.com/dawn/1172)
DAWN_SUPPRESS_TEST_IF(IsWindows() && IsVulkan() && IsIntel());
for (wgpu::BufferUsage usage : {wgpu::BufferUsage::Storage, wgpu::BufferUsage::Uniform}) { for (wgpu::BufferUsage usage : {wgpu::BufferUsage::Storage, wgpu::BufferUsage::Uniform}) {
uint64_t maxBufferBindingSize; uint64_t maxBufferBindingSize;
std::string shader; std::string shader;
@ -112,8 +116,10 @@ TEST_P(MaxLimitTests, MaxBufferBindingSize) {
maxBufferBindingSize = maxBufferBindingSize =
std::min(maxBufferBindingSize, uint64_t(2) * 1024 * 1024 * 1024); std::min(maxBufferBindingSize, uint64_t(2) * 1024 * 1024 * 1024);
// With WARP or on 32-bit platforms, such large buffer allocations often fail. // With WARP or on 32-bit platforms, such large buffer allocations often fail.
#ifndef DAWN_PLATFORM_32BIT #ifdef DAWN_PLATFORM_32_BIT
DAWN_TEST_UNSUPPORTED_IF(IsWindows()); if (IsWindows()) {
continue;
}
#endif #endif
if (IsWARP()) { if (IsWARP()) {
maxBufferBindingSize = maxBufferBindingSize =
@ -121,11 +127,7 @@ TEST_P(MaxLimitTests, MaxBufferBindingSize) {
} }
shader = R"( shader = R"(
[[block]] struct Buf { [[block]] struct Buf {
value0 : u32; values : array<u32>;
// padding such that value0 and value1 are the first and last bytes of the memory.
[[size()" +
std::to_string(maxBufferBindingSize - 8) + R"()]] padding : u32;
value1 : u32;
}; };
[[block]] struct Result { [[block]] struct Result {
@ -138,13 +140,18 @@ TEST_P(MaxLimitTests, MaxBufferBindingSize) {
[[stage(compute), workgroup_size(1,1,1)]] [[stage(compute), workgroup_size(1,1,1)]]
fn main() { fn main() {
result.value0 = buf.value0; result.value0 = buf.values[0];
result.value1 = buf.value1; result.value1 = buf.values[arrayLength(&buf.values) - 1u];
} }
)"; )";
break; break;
case wgpu::BufferUsage::Uniform: case wgpu::BufferUsage::Uniform:
maxBufferBindingSize = GetSupportedLimits().limits.maxUniformBufferBindingSize; maxBufferBindingSize = GetSupportedLimits().limits.maxUniformBufferBindingSize;
// Clamp to not exceed the maximum i32 value for the WGSL [[size(x)]] annotation.
maxBufferBindingSize = std::min(maxBufferBindingSize,
uint64_t(std::numeric_limits<int32_t>::max()) + 8);
shader = R"( shader = R"(
[[block]] struct Buf { [[block]] struct Buf {
value0 : u32; value0 : u32;
@ -176,7 +183,7 @@ TEST_P(MaxLimitTests, MaxBufferBindingSize) {
device.PushErrorScope(wgpu::ErrorFilter::OutOfMemory); device.PushErrorScope(wgpu::ErrorFilter::OutOfMemory);
wgpu::BufferDescriptor bufDesc; wgpu::BufferDescriptor bufDesc;
bufDesc.size = maxBufferBindingSize; bufDesc.size = Align(maxBufferBindingSize, 4);
bufDesc.usage = usage | wgpu::BufferUsage::CopyDst; bufDesc.usage = usage | wgpu::BufferUsage::CopyDst;
wgpu::Buffer buffer = device.CreateBuffer(&bufDesc); wgpu::Buffer buffer = device.CreateBuffer(&bufDesc);
@ -217,8 +224,12 @@ TEST_P(MaxLimitTests, MaxBufferBindingSize) {
wgpu::CommandBuffer commands = encoder.Finish(); wgpu::CommandBuffer commands = encoder.Finish();
queue.Submit(1, &commands); queue.Submit(1, &commands);
EXPECT_BUFFER_U32_EQ(value0, resultBuffer, 0); EXPECT_BUFFER_U32_EQ(value0, resultBuffer, 0)
EXPECT_BUFFER_U32_EQ(value1, resultBuffer, 4); << "maxBufferBindingSize=" << maxBufferBindingSize << "; offset=" << 0
<< "; usage=" << usage;
EXPECT_BUFFER_U32_EQ(value1, resultBuffer, 4)
<< "maxBufferBindingSize=" << maxBufferBindingSize << "; offset=" << value1Offset
<< "; usage=" << usage;
} }
} }