From ca8a54ed35265083f023dde832156be818c9d22c Mon Sep 17 00:00:00 2001 From: Austin Eng Date: Wed, 11 May 2022 18:28:46 +0000 Subject: [PATCH] Raise base maxComputeWorkgroupStorageSize limit. 16352 -> 16384 Bug: dawn:1410 Change-Id: I0ad4873474614bcd62638583bf905ff2742eaae2 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/89821 Reviewed-by: Loko Kung Commit-Queue: Loko Kung --- src/dawn/native/Limits.cpp | 2 +- src/dawn/tests/unittests/LimitsTests.cpp | 4 ++-- webgpu-cts/expectations.txt | 6 ++++++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/dawn/native/Limits.cpp b/src/dawn/native/Limits.cpp index 2ee5d69e6b..65af8dfaaa 100644 --- a/src/dawn/native/Limits.cpp +++ b/src/dawn/native/Limits.cpp @@ -23,7 +23,7 @@ // TODO(crbug.com/dawn/685): // For now, only expose these tiers until metrics can determine better ones. #define LIMITS_WORKGROUP_STORAGE_SIZE(X) \ - X(Maximum, maxComputeWorkgroupStorageSize, 16352, 32768, 49152, 65536) + X(Maximum, maxComputeWorkgroupStorageSize, 16384, 32768, 49152, 65536) #define LIMITS_STORAGE_BUFFER_BINDING_SIZE(X) \ X(Maximum, maxStorageBufferBindingSize, 134217728, 1073741824, 2147483647, 4294967295) diff --git a/src/dawn/tests/unittests/LimitsTests.cpp b/src/dawn/tests/unittests/LimitsTests.cpp index 3cc3cbe6ad..b0b0044928 100644 --- a/src/dawn/tests/unittests/LimitsTests.cpp +++ b/src/dawn/tests/unittests/LimitsTests.cpp @@ -34,7 +34,7 @@ TEST(Limits, ReifyDefaultLimits_PopulatesDefault) { limits.maxStorageBufferBindingSize = wgpu::kLimitU64Undefined; dawn::native::Limits reified = dawn::native::ReifyDefaultLimits(limits); - EXPECT_EQ(reified.maxComputeWorkgroupStorageSize, 16352u); + EXPECT_EQ(reified.maxComputeWorkgroupStorageSize, 16384u); EXPECT_EQ(reified.maxStorageBufferBindingSize, 134217728ul); } @@ -137,7 +137,7 @@ TEST(Limits, ApplyLimitTiers) { SetLimitsStorageBufferBindingSizeTier3(&limitsStorageBufferBindingSizeTier3); auto SetLimitsComputeWorkgroupStorageSizeTier1 = [](dawn::native::Limits* limits) { - limits->maxComputeWorkgroupStorageSize = 16352; + limits->maxComputeWorkgroupStorageSize = 16384; }; dawn::native::Limits limitsComputeWorkgroupStorageSizeTier1; dawn::native::GetDefaultLimits(&limitsComputeWorkgroupStorageSizeTier1); diff --git a/webgpu-cts/expectations.txt b/webgpu-cts/expectations.txt index f01e4f3bdd..bf1cc29c4d 100644 --- a/webgpu-cts/expectations.txt +++ b/webgpu-cts/expectations.txt @@ -354,6 +354,12 @@ crbug.com/dawn/0000 [ win ] webgpu:shader,execution,expression,binary,f32_logica crbug.com/1322180 webgpu:api,operation,adapter,requestDevice_limits:worse_than_default:limit="minStorageBufferOffsetAlignment" [ Skip ] crbug.com/1322180 webgpu:api,operation,adapter,requestDevice_limits:worse_than_default:limit="minUniformBufferOffsetAlignment" [ Skip ] +################################################################################ +# Failing due to limit value change. Needs CTS update. +################################################################################ +crbug.com/dawn/1410 webgpu:api,operation,adapter,requestDevice_limits:supported_limits:limit="maxComputeWorkgroupStorageSize" [ Failure ] +crbug.com/dawn/1410 webgpu:api,operation,adapter,requestDevice_limits:worse_than_default:limit="maxComputeWorkgroupStorageSize" [ Failure ] + # New failures. Please triage: crbug.com/dawn/0000 [ intel-0x5912 ubuntu ] webgpu:api,operation,adapter,requestDevice_limits:worse_than_default:limit="maxBindGroups" [ Failure ] crbug.com/dawn/0000 [ intel-0x5912 ubuntu ] webgpu:api,operation,command_buffer,copyTextureToTexture:color_textures,compressed,array:srcFormat="astc-10x10-unorm";dstFormat="astc-10x10-unorm-srgb";dimension="2d" [ Failure ]