projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 173bc2a)
lower local size for some amber KHR_workgroup_memory_explicit_layout tests
authorIago Toral Quiroga <itoral@igalia.com>
Wed, 31 Aug 2022 10:40:58 +0000 (12:40 +0200)
committerMatthew Netsch <quic_mnetsch@quicinc.com>
Thu, 15 Sep 2022 17:10:29 +0000 (17:10 +0000)
Some of these tests use a local size that exceeds the minimum requirement
in the spec and don't check whether the implementation supports it.

Rewrite the tests to use the minimum limit required by the spec for
maxComputeWorkGroupInvocations, which is 128, so that the test can
run on any implementation.

VK-GL-CTS issue: 3913
Components: Vulkan
Affects:
dEQP-VK.compute.workgroup_memory_explicit_layout.copy_memory.*
dEQP-VK.compute.workgroup_memory_explicit_layout.zero_ext.*

Change-Id: I4e8135d8d60e044f92ed5c53648fda24f067edc0

external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/copy_memory_two_invocations.amber patch | blob | history
external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/copy_memory_variable_pointers.amber patch | blob | history
external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_block.amber patch | blob | history
external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_block_with_offset.amber patch | blob | history
external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_other_block.amber patch | blob | history

diff --git a/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/copy_memory_two_invocations.amber b/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/copy_memory_two_invocations.amber
index a5179e3..385f5f4 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/copy_memory_two_invocations.amber
+++ b/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/copy_memory_two_invocations.amber
@@ -23,7 +23,7 @@ OpCapability WorkgroupMemoryExplicitLayoutKHR
 OpExtension "SPV_KHR_workgroup_memory_explicit_layout"
 OpMemoryModel Logical GLSL450
 OpEntryPoint GLCompute %main "main" %index %push_constants %input_buffer_0 %input_buffer_1 %output_buffer %wg %half_wg_0 %half_wg_1
-OpExecutionMode %main LocalSize 128 4 1
+OpExecutionMode %main LocalSize 32 4 1
 
 OpDecorate %index BuiltIn LocalInvocationIndex
 OpDecorate %buffer_type Block
@@ -163,7 +163,7 @@ BUFFER output_buffer DATA_TYPE uint32 SIZE 32 FILL 99
 BUFFER expected_buffer DATA_TYPE uint32 SIZE 32 SERIES_FROM 1 INC_BY 1
 
 BUFFER const_buf DATA_TYPE uint32 DATA
-30 130
+30 90
 END
 
 PIPELINE compute pipeline
@@ -175,6 +175,6 @@ PIPELINE compute pipeline
   BIND BUFFER output_buffer AS storage DESCRIPTOR_SET 0 BINDING 2
 END
 
-RUN pipeline 1 1 1
+RUN pipeline 4 1 1
 
 EXPECT output_buffer EQ_BUFFER expected_buffer
diff --git a/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/copy_memory_variable_pointers.amber b/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/copy_memory_variable_pointers.amber
index e1f5bfd..e5cb12d 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/copy_memory_variable_pointers.amber
+++ b/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/copy_memory_variable_pointers.amber
@@ -24,7 +24,7 @@ OpCapability VariablePointers
 OpExtension "SPV_KHR_workgroup_memory_explicit_layout"
 OpMemoryModel Logical GLSL450
 OpEntryPoint GLCompute %main "main" %index %push_constants %input_buffer_0 %input_buffer_1 %output_buffer %wg %half_wg_0 %half_wg_1
-OpExecutionMode %main LocalSize 128 4 1
+OpExecutionMode %main LocalSize 32 4 1
 
 OpDecorate %index BuiltIn LocalInvocationIndex
 OpDecorate %buffer_type Block
@@ -180,7 +180,7 @@ BUFFER output_buffer DATA_TYPE uint32 SIZE 32 FILL 99
 BUFFER expected_buffer DATA_TYPE uint32 SIZE 32 SERIES_FROM 1 INC_BY 1
 
 BUFFER const_buf DATA_TYPE uint32 DATA
-30 130
+30 90
 END
 
 PIPELINE compute pipeline
@@ -192,6 +192,6 @@ PIPELINE compute pipeline
   BIND BUFFER output_buffer AS storage DESCRIPTOR_SET 0 BINDING 2
 END
 
-RUN pipeline 1 1 1
+RUN pipeline 4 1 1
 
 EXPECT output_buffer EQ_BUFFER expected_buffer
diff --git a/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_block.amber b/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_block.amber
index 5ef39ed..a5ce320 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_block.amber
+++ b/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_block.amber
@@ -24,7 +24,7 @@ OpCapability WorkgroupMemoryExplicitLayoutKHR
 OpExtension "SPV_KHR_workgroup_memory_explicit_layout"
 OpMemoryModel Logical GLSL450
 OpEntryPoint GLCompute %main "main" %index %push_constants %output_buffer %wg
-OpExecutionMode %main LocalSize 128 4 1
+OpExecutionMode %main LocalSize 32 4 1
 
 OpDecorate %index BuiltIn LocalInvocationIndex
 OpDecorate %buffer_type Block
@@ -101,6 +101,6 @@ PIPELINE compute pipeline
   BIND BUFFER output_buffer AS storage DESCRIPTOR_SET 0 BINDING 1
 END
 
-RUN pipeline 1 1 1
+RUN pipeline 4 1 1
 
 EXPECT output_buffer EQ_BUFFER expected_buffer
diff --git a/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_block_with_offset.amber b/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_block_with_offset.amber
index 61f15c0..377f666 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_block_with_offset.amber
+++ b/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_block_with_offset.amber
@@ -24,7 +24,7 @@ OpCapability WorkgroupMemoryExplicitLayoutKHR
 OpExtension "SPV_KHR_workgroup_memory_explicit_layout"
 OpMemoryModel Logical GLSL450
 OpEntryPoint GLCompute %main "main" %index %push_constants %output_buffer %wg %offset_wg
-OpExecutionMode %main LocalSize 128 4 1
+OpExecutionMode %main LocalSize 32 4 1
 
 OpDecorate %index BuiltIn LocalInvocationIndex
 OpDecorate %buffer_type Block
@@ -108,7 +108,7 @@ PIPELINE compute pipeline
   BIND BUFFER output_buffer AS storage DESCRIPTOR_SET 0 BINDING 1
 END
 
-RUN pipeline 1 1 1
+RUN pipeline 4 1 1
 
 EXPECT output_buffer IDX 64 EQ 0
 EXPECT output_buffer IDX 68 EQ 0
diff --git a/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_other_block.amber b/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_other_block.amber
index e224183..272174c 100644 (file)
--- a/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_other_block.amber
+++ b/external/vulkancts/data/vulkan/amber/compute/workgroup_memory_explicit_layout/zero_ext_other_block.amber
@@ -24,7 +24,7 @@ OpCapability WorkgroupMemoryExplicitLayoutKHR
 OpExtension "SPV_KHR_workgroup_memory_explicit_layout"
 OpMemoryModel Logical GLSL450
 OpEntryPoint GLCompute %main "main" %index %push_constants %output_buffer %wg %other_wg
-OpExecutionMode %main LocalSize 128 4 1
+OpExecutionMode %main LocalSize 32 4 1
 
 OpDecorate %index BuiltIn LocalInvocationIndex
 OpDecorate %buffer_type Block
@@ -106,6 +106,6 @@ PIPELINE compute pipeline
   BIND BUFFER output_buffer AS storage DESCRIPTOR_SET 0 BINDING 1
 END
 
-RUN pipeline 1 1 1
+RUN pipeline 4 1 1
 
 EXPECT output_buffer EQ_BUFFER expected_buffer
Domain: Graphics System / GL;