Matthew Netsch [Thu, 7 Jul 2022 17:36:30 +0000 (17:36 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I7ab0e9094c250af82f5aa28183fe5759e96f3e5f
Joe Withers [Fri, 1 Jul 2022 15:28:05 +0000 (16:28 +0100)]
Fix image feature checking in YCbCr filtering tests
The tests were using linear chroma filtering without checking for
support.
Components: Vulkan
Affects:
dEQP-VK.ycbcr.filtering.*
Change-Id: I2619667b8ebf78f3c2c1880501925a1348305b64
Matthew Netsch [Thu, 16 Jun 2022 15:55:55 +0000 (15:55 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I238c6805dbba58a1dddb7639663cd9c9b83b7f64
Matthew Netsch [Mon, 6 Jun 2022 15:54:27 +0000 (08:54 -0700)]
Fix modifier tests - Add Invalidate memory before host read.
Test cases for extension VK_EXT_image_drm_format_modifier were failing randomly due to image mismatch.
This was due to after performing copyImagetoBuffer buffers are not invalidated before reading from host.
Added the invalidate operation for buffer before reading.
Components: Vulkan
VK-GL-CTS Issue: 3744
Affects:
dEQP-VK.drm_format_modifiers.*
Change-Id: I57b27bf9c0beea0ed822b36ea379b024f9d1690a
Tapani Pälli [Fri, 10 Sep 2021 12:06:10 +0000 (15:06 +0300)]
Fix for the bounding box tests with GL 4.5
Affects:
dEQP-GL*functional.primitive_bounding_box.*
Components: AOSP
VK-GL-CTS issue: 3104
Signed-off-by: Tapani Pälli <tapani.palli@intel.com>
Change-Id: I38db9fc893a685893dbd6c2de8ab15ab3e0db11e
(cherry picked from commit
9e6d211ebf47f228f6648c7a30be8eb98cec41a9)
Mohd Faisal [Wed, 13 Oct 2021 14:09:01 +0000 (15:09 +0100)]
Fix missing self-subpass dependency
Self-subpass dependency required for read-after-write operation, in test
cases where the attachment is written using load-op-load at the start
of subpass and then the values are read inside the fragment shader.
Affects:
dEQP-
VK.renderpass.suballocation.subpass_dependencies.separate_channels.*
dEQP-
VK.renderpass2.suballocation.subpass_dependencies.separate_channels.*
Components: Vulkan
VK-GL-CTS issue: 3216
Change-Id: I6c72b81dccfb7526ec4607b255ff4872b13c4d22
(cherry picked from commit
305ee4bd7e5b372b2c910b615a146f2aa4416527)
Matthew Netsch [Thu, 2 Jun 2022 19:06:02 +0000 (19:06 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: Ic4e0dff0f0b61669584c3eff4602af9971552ab4
Andreas Flöjt [Thu, 5 May 2022 12:18:06 +0000 (14:18 +0200)]
Fix int64 robustness bugs
First bug: VkImage and VkImageView that use different formats without
specifying the VK_IMAGE_CREATE_MUTABLE_FORMAT_BIT flag on the image.
Second bug: Using a shader with a multisampled storage image without
checking the shaderStorageImageMultisample feature.
Affects:
dEQP-VK.robustness.image_robustness.*.r64i.*
Components: Vulkan
VK-GL-CTS issue: 3680
Change-Id: I7b984c3c7b6b2ee551618b7a32d4a841e942cd95
Ilan Aelion [Mon, 4 Apr 2022 18:51:22 +0000 (11:51 -0700)]
skip non-compresed 3D views of compressed images
dEQP-VK.image.texel_view_compatible.graphic.*.3d_image.texture_read
tests violate VUID-VkImageViewCreateInfo-image-04739 - "If image was
created with the VK_IMAGE_CREATE_BLOCK_TEXEL_VIEW_COMPATIBLE_BIT flag
and format is a non-compressed format, viewType must not be
VK_IMAGE_VIEW_TYPE_3D"
Components: Vulkan
Affected Tests:
dEQP-VKSC.image.texel_view_compatible.graphic.*.3d_image.texture_read.*
Change-Id: I48512da1cdedbaecc73ac1ae1289cbbb4bc2f70c
Juan A. Suarez Romero [Fri, 13 May 2022 09:50:30 +0000 (11:50 +0200)]
Fix leak on SimpleAllocator
SimpleAllocator object is leaked in some tests.
Affected tests:
dEQP-VK.compute.basic.concurrent_compute
dEQP-VK.draw.concurrent.compute_and_triangle_list
Components: Vulkan
VK-GL-CTS issue: 3634
Change-Id: Ief51211f94f2754b9133285ff7374971b7ea20e3
Ricardo Garcia [Thu, 12 May 2022 14:26:44 +0000 (16:26 +0200)]
Fix entry points check for VK_KHR_draw_indirect_count
VK_KHR_draw_indirect_count was promoted to core in Vulkan 1.2, but its
non-KHR entry points (vkCmdDrawIndirectCount and
vkCmdDrawIndexedIndirectCount) are not mandatory unless the device
supports the extension. In that case, the drawIndirectCount feature bit
will also be true. Any of the two checks is valid.
Affected tests:
dEQP-VK.api.version_check.entry_points
VK-GL-CTS issue: 3679
Components: Vulkan
Change-Id: I95666c1a22bed7da33f58a50307294c4048cd8ff
Ricardo Garcia [Fri, 20 May 2022 10:02:06 +0000 (12:02 +0200)]
Include the proper formats in pViewFormats list
Imageless framebuffer variants in fragment shading rate basic tests were
not including the render pass image view formats in the list of view
formats when creating the framebuffer, resulting in validation errors
with code VUID-VkFramebufferCreateInfo-flags-03205.
Affected tests:
dEQP-VK.fragment_shading_rate.basic.*
Components: Vulkan
VK-GL-CTS issue: 3705
Change-Id: I7389b8a0a2f24b3085f3963064508c8c388e43bc
Ricardo Garcia [Mon, 23 May 2022 08:40:23 +0000 (10:40 +0200)]
Fix state binding in multiview tests
According to the spec, when multiview is enabled all non-render pass
state is undefined at the beginning of each subpass, but multiview tests
were binding vertex buffers, index buffers and descriptor sets before
beginning the render pass. This commit moves the binding commands to the
same point the pipeline is bound for each subpass.
In addition, it fixes some validation errors related to the following
VUIDs:
- VUID-VkSubpassDependency-srcSubpass-02243
- VUID-VkSubpassDependency2-srcSubpass-02245
Due to some subpass dependencies missing the VK_DEPENDENCY_BY_REGION_BIT
bit in their flags despite being mandated by the spec.
Affected tests:
dEQP-VK.multiview.*
Components: Vulkan
VK-GL-CTS issue: 3701
Change-Id: I4f91f3dad0305e93dce68bb43497215c628df543
Chia-I Wu [Sat, 28 May 2022 00:47:42 +0000 (17:47 -0700)]
Improve comparison of VkPhysicalDeviceMemoryProperties
VkMemoryType should be fine, but VkMemoryHeap normally has a 4-byte
padding which can be garbage. Compare individual members rather than
doing deMemCmp.
VK-GL-CTS Issue: 3590
Affects: dEQP-VK.api.info.get_physical_device_properties2.memory_properties
Components: Vulkan
Change-Id: I49e276ee15d10ca40f11c7a5fd3fb50b84ff1de3
Shahbaz Youssefi [Mon, 22 Nov 2021 20:30:26 +0000 (15:30 -0500)]
Fix shader operator tests' precision expectation
es3fShaderOperatorTests.cpp takes the reported precision for lowp and
mediump (through glGetShaderPrecisionFormat) and tests that that many
bits are actually supported by the type.
glGetShaderPrecisionFormat is a legacy function that's not very
meaningful on modern hardware (see Vulkan issue #2931), and there is no
equivalent for its functionality in Vulkan.
This relevant tests are changed such that the test now verifies that _at
least_ that many bits are used in lowp and mediump operations, rather
than _exactly_. This aligns with the semantics of RelaxedPrecision in
SPIR-V.
Affected tests:
dEQP-GLES3.functional.shaders.operator.*
Components: OpenGL ES
VK-GL-CTS issue: 3344
Change-Id: I88a38d6ee067de8313f25327578c6666c257dc8b
(cherry picked from commit
23d62b971cec55ae49cddc9a9e37614bc9f80668)
Shahbaz Youssefi [Fri, 27 Aug 2021 03:11:56 +0000 (23:11 -0400)]
Fix GL_MAX_FRAGMENT_INTERPOLATION_OFFSET limit check
The spec is fixed to align with Vulkan, requiring the minimum value for
GL_MAX_FRAGMENT_INTERPOLATION_OFFSET to be 0.5-ULP, where
ULP = 1/pow(2,GL_FRAGMENT_INTERPOLATION_OFFSET_BITS)
Affects:
dEQP-GL45.functional.state_query.multisample_interpolation.max_fragment_interpolation_offset.get_float
dEQP-GLES31.functional.state_query.multisample_interpolation.max_fragment_interpolation_offset.get_float
KHR-GL44.shader_multisample_interpolation.api.api
KHR-GL45.shader_multisample_interpolation.api.api
KHR-GL46.shader_multisample_interpolation.api.api
KHR-GLES31.core.shader_multisample_interpolation.api.api
KHR-GL45.limits.max_fragment_interpolation_offset
KHR-GL46.limits.max_fragment_interpolation_offset
Components: OpenGL
Khronos OpenGL issue: #149
Change-Id: I153a05ef6db8f50a6aa337188e5aeb8d504fbbdd
(cherry picked from commit
5d72b170aad664e4fcf770863d37bd041d45ff9b)
Graeme Leese [Fri, 23 Jul 2021 18:00:11 +0000 (19:00 +0100)]
Fix warning in gcc-8
The code for setting up the output buffer was duplicated into each of
the cases for different input types, and the compiler doesn't understand
that DE_ASSERT marks an unreachable path. Changing to using standard
assert fixes the warning:
vktShaderFConvertTests.cpp:541:19: error: ‘outputBufferSizeInfo::memorySizeBytes’
may be used uninitialized in this function [-Werror=maybe-uninitialized]
541 | BufferSizeInfo outputBufferSizeInfo;
| ^~~~~~~~~~~~~~~~~~~~
Component: Vulkan
Affects: dEQP-VK.glsl.builtin.precision_fconvert.*
Change-Id: Icf6302166d8bce7c3ae1447973c895c34465a726
Matthew Netsch [Thu, 12 May 2022 21:05:06 +0000 (21:05 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I85db18b290ab8790b6b6ddd9417ed43c65d8e33f
Connor Abbott [Thu, 5 May 2022 16:58:03 +0000 (18:58 +0200)]
Fix second barrier access mask for transfers
This was TRANSFER_WRITE instead of TRANSFER_READ due to a typo.
Components: Vulkan
Affects:
dEQP-VK.synchronization2.none_stage.*
VK-GL-CTS Issue: 3672
Change-Id: Id62e91886bc6b2137a8f8a862185956a17fb3fab
Matthew Netsch [Wed, 11 May 2022 15:27:38 +0000 (08:27 -0700)]
Fixes sparse flags
Spec requires that VK_IMAGE_CREATE_SPARSE_BINDING_BIT
is set if residency or alias bits are set
Components: Vulkan
VK-GL-CTS Issue: 3678
Affects:
dEQP-VK.api.info.image_format_properties.*
Change-Id: Ie8788567ae5189e6303fb7d3eb7e64b1bdd9dbcf
Connor Abbott [Fri, 13 Aug 2021 15:37:54 +0000 (17:37 +0200)]
Don't alias image views in separate_channels subpass dependency tests
This is not allowed by the Vulkan spec:
> Multiple attachments that alias the same memory must not be used in a
> single subpass.
Instead we should have the input attachment and color attachment point
to the same attachment, which is allowed.
Components: Vulkan
Affects:
dEQP-VK.renderpass.suballocation.subpass_dependencies.separate_channels.*
dEQP-VK.renderpass2.suballocation.subpass_dependencies.separate_channels.*
VK-GL-CTS Issue: 3052
Change-Id: Iddb1111be5147f9816104fa879e023a9a3445555
(cherry picked from commit
a3e659e828a535582207149cf58a8580d45a0342)
Paul Thomson [Wed, 13 Apr 2022 18:38:46 +0000 (19:38 +0100)]
Fix DeqpTestRunnerTest
Component: Android
Google bug: b/
206657494
Google bug: b/
201652781
Change-Id: I3438b200105bc04ee63b0454a7ce32e4acd4de4b
Matthew Netsch [Thu, 5 May 2022 15:50:24 +0000 (15:50 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I4dbdafea321464fe25499e0a7d415488729d77ce
Ricardo Garcia [Tue, 19 Apr 2022 09:26:29 +0000 (11:26 +0200)]
Synchronize input attachment reads in IO chains
Each subpass in the render pass IO chain tests attempts to read the
output of the previous subpass as an input attachment, but the subpass
dependencies are missing VK_ACCESS_INPUT_ATTACHMENT_READ_BIT from the
flags in dstAccessMask.
Affected tests:
dEQP-VK.renderpass*.attachment_allocation.*
Components: Vulkan
VK-GL-CTS issue: 3643
Change-Id: I63b49709ee8cb03e364050253dc2a8a48c5b58cd
Ricardo Garcia [Tue, 19 Apr 2022 09:53:54 +0000 (11:53 +0200)]
Wait for idle queue after submitting an empty job
The test below imports an external signaled semaphore and submits to the
queue an empty job that waits on that signaled sempahore, but the test
returns without any further wait, which means the external sempahore may
be destroyed before the driver has had a chance to use it.
Affected tests:
dEQP-VK.api.external.semaphore.sync_fd.import_signaled_temporary
Components: Vulkan
VK-GL-CTS issue: 3636
Change-Id: I3e8daa9146f6fd542ad20539a7e9b6c9f0242978
Boris Zanin [Wed, 13 Apr 2022 11:57:22 +0000 (13:57 +0200)]
Limit dimensionality of arrays-of-arrays in random SSBO tests
One of these tests used a 5 dimensional array-of-arrays, resulting
in thousands of instructions that caused issues on devices with low
ram. This change limits the total dimensionality to prevent this.
Components: Vulkan
VK-GL-CTS issue: 1829
Solves:
dEQP-VK.ssbo.layout.random.scalar.75
Affects:
dEQP-VK.ssbo.*.random.*
Change-Id: Ibee39ccb0bd1543dafce7c498f56def1e05b4815
Piers Daniell [Wed, 20 Apr 2022 23:10:12 +0000 (17:10 -0600)]
Fix 32-bit compilation warning
There was a call to new[] in vktSpvAsmTrinaryMinMaxTests.cpp that used
a 64-bit values as an allocation size, which is not the type the
new operator expects when compiling for a 32-bit target.
Add a cast to fix the warning.
Affects:
dEQP-VK.spirv_assembly.instruction.amd_trinary_minmax.*
Components: Vulkan
Change-Id: I0941033614d67530f6cc157b5923e47bdca5c5a9
Matthew Netsch [Thu, 14 Apr 2022 15:58:41 +0000 (15:58 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I6ab43b2abea09721ad28bdba33565c7c0f0be5fd
Ricardo Garcia [Mon, 4 Apr 2022 08:14:57 +0000 (10:14 +0200)]
Fix warnings with clang and GCC
Affected tests:
No test result should be affected by these changes.
Components: OpenGL, Vulkan
VK-GL-CTS issue: 3602
Change-Id: If2eb0736d296add732aaff53c80a705cc306d7a3
Matthew Netsch [Thu, 7 Apr 2022 17:48:16 +0000 (17:48 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I4a1b44642747f72803ff97dafd55f4ba3fabad9e
Ari Suonpaa [Tue, 29 Mar 2022 08:56:44 +0000 (11:56 +0300)]
Use associated physical device from custom instance
Some of the API feature info tests created a custom instance,
but still used the default physical device. This is fixed by
choosing a physical device using the custom instance.
Comparison of VkPhysicalDeviceMemoryProperties was also
changed to only check the active memoryTypes and memoryHeaps
array elements instead of doing one large deMemCmp.
VK-GL-CTS Issue: 3590
Affects:
dEQP-VK.api.info.*
Components: Vulkan
Change-Id: I2378bcd1e97b7f85e533d34c5b5f6ac3e4fa9b93
Ricardo Garcia [Tue, 29 Mar 2022 14:51:18 +0000 (16:51 +0200)]
Wait for deferred operations before obtaining RT pipeline handle
The ray tracing utils, when creating ray tracing pipelines and using
deferred operations, were using the VkPipeline pointer and handler
before the deferred operation had completed, which is against the spec.
Affected tests:
dEQP-VK.ray_tracing_pipeline.pipeline_library.configurations.multithreaded_compilation_dho.*
dEQP-VK.ray_tracing_pipeline.large_shader_set.cpu_ht*
Components: Vulkan
VK-GL-CTS issue: 3588
Change-Id: Ied8f443c01e99878180130963b8988852171b8a0
Mike Blumenkrantz [Thu, 31 Mar 2022 13:07:29 +0000 (15:07 +0200)]
Fix subgroup size control failure logging
One of the failure messages was missing the message terminator, which
prevented it from ever being logged.
Affects:
dEQP-VK.subgroups.size_control*
Components: Vulkan
VK-GL-CTS issue: 3596
Change-Id: If649a11e0f6cf0f5e69e438d46b385b26e57dfe4
Ricardo Garcia [Fri, 1 Apr 2022 10:01:40 +0000 (12:01 +0200)]
Parse test case result version when converting to XML
When parsing QPA files, extract the test case result version so it can
be later used to print the proper version when converting to XML files.
Components: Framework
VK-GL-CTS issue: 3573
VK-GL-CTS public issue: 287
Change-Id: I34d005621685b0ef31a7092ec7c40e6626bf20e3
Matthew Netsch [Thu, 7 Apr 2022 17:24:00 +0000 (17:24 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5
Change-Id: I25f8f2f56ab07a9c3f04e8cfa54f2efc11bfd80a
Nanley Chery [Wed, 16 Mar 2022 20:08:04 +0000 (13:08 -0700)]
Add queue ownership release in modifier tests
Queue ownership transfers require a release operation and an acquire
operation. Before this patch, this test only performed the acquire
operation.
Components: Vulkan
VK-GL-CTS issue: 3575
Affects: dEQP-VK.drm_format_modifiers.export_import.*
Change-Id: I2998d7928d1042d6a159e1173257ee551c1120a5
Nanley Chery [Wed, 16 Mar 2022 20:40:46 +0000 (13:40 -0700)]
Fix incorrect layout transition in modifier tests
The queue family ownership acquire operation specifies a layout
transition from the pre-initialized layout. The image isn't in the
pre-initialized layout however, it's in the transfer dst optimal layout.
Align with the Vulkan spec, which says:
When performing a layout transition on an image subresource, the
old layout value must either equal the current layout of the
image subresource (at the time the transition executes), or else
be VK_IMAGE_LAYOUT_UNDEFINED (implying that the contents of the
image subresource need not be preserved).
Components: Vulkan
VK-GL-CTS issue: 3575
Affects: dEQP-VK.drm_format_modifiers.export_import.*
Change-Id: I76dbb54c699ed7d34e964de17f71ef01bc9e98a5
Nanley Chery [Wed, 16 Mar 2022 20:07:07 +0000 (13:07 -0700)]
Fix lossy layout transitions in modifier tests
The test performs several layout transitions that use
VK_IMAGE_LAYOUT_UNDEFINED for the initial layout. The spec says that
these transitions cause images to become undefined. The test expects
defined data from these images however. Replace these initial layouts
with layouts that don't cause data loss.
Components: Vulkan
VK-GL-CTS issue: 3575
Affects: dEQP-VK.drm_format_modifiers.export_import.*
Change-Id: I5e57dd197d461fba800d50239803d525c5334ac4
Matthew Netsch [Thu, 31 Mar 2022 17:26:55 +0000 (17:26 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I4624140325b398fc901142f54425375b5ffa3d66
Matthew Netsch [Thu, 31 Mar 2022 17:02:52 +0000 (17:02 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5
Change-Id: Ibcfcfa0cf5ad247b4c80017ad298d15a5139868f
James Jones [Fri, 27 Aug 2021 23:33:24 +0000 (16:33 -0700)]
modifiers: Use dedicated memory consistently
When a dedicated allocation device memory object
is exported, it must be imported as a dedicated
allocation created with a compatible resource as
well. This change makes the DRM format modifier
tests self-consistent in that regard.
Components: Vulkan
Affected tests: dEQP-VK.drm_format_modifiers.export_import.*
VK-GL-CTS issue: 3544
Change-Id: I93a35180b9a5a1b98e0d4fa1f2934258134cef1b
Matthew Netsch [Mon, 28 Mar 2022 14:14:33 +0000 (14:14 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: Iefb6b35452197d43db9dfc52b689476d2a81b8dd
Peter Kohaut [Mon, 28 Mar 2022 11:53:49 +0000 (13:53 +0200)]
Fix Zlib depedency
Use newer version of Zlib as older is no longer available to download from the zlib.net page
Components: Framework
Affects:
None
VK-GL-CTS Issue: 3587
Change-Id: Ie166dc897b0d1318c1ae73434bfa19687b579691
Matthew Netsch [Thu, 24 Mar 2022 19:49:07 +0000 (19:49 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I8a313ea2aebdd5163a689b2cc31161e5963172a2
Michael Chock [Wed, 2 Mar 2022 17:16:34 +0000 (09:16 -0800)]
Check for visibility in external_memory_host test
The external_memory_host synchronization test uses mapMemory when
validating the contents of the external memory, but does not ensure that
the memory is host-visible. When choosing a memory type for the
host-visible memory, additionally check the HOST_VISIBLE flag.
Affects:
dEQP-VK.memory.external_memory_host.synchronization.synchronization
Components: Vulkan
VK-GL-CTS issue: 3547
Change-Id: I0cff8f42debedd01db1760881a6f5f9481ea39bf
Jason Ekstrand [Wed, 16 Mar 2022 22:33:17 +0000 (17:33 -0500)]
Fix dEQP-VK.subgroups.size_control.compute.required_subgroup_size_*_require_full_subgroups
The tests were testing full subgroups with four workgroup sizes:
- Nx1x1
- 1xNx1
- 1x1xN
- getLocalSizes() which returns a maximally large workgroup size
However, the Vulkan spec says:
"If a VkPipelineShaderStageRequiredSubgroupSizeCreateInfo structure
is included in the pNext chain, and flags has the
VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT flag set,
the local workgroup size in the X dimension of the pipeline must be
a multiple of
VkPipelineShaderStageRequiredSubgroupSizeCreateInfo::requiredSubgroupSize
This means that the middle two subgroup sizes are invalid for use with
VK_PIPELINE_SHADER_STAGE_CREATE_REQUIRE_FULL_SUBGROUPS_BIT.
Components: Vulkan
Affects:
- dEQP-VK.subgroups.size_control.compute.required_subgroup_size_max_require_full_subgroups
- dEQP-VK.subgroups.size_control.compute.required_subgroup_size_min_require_full_subgroups
Change-Id: I46f2547e1a50f78cbed6695f96448f463ca57230
Matthew Netsch [Thu, 10 Mar 2022 16:57:32 +0000 (16:57 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I31b3e7ec830aa10aa3c06ef61972a4e9c48dffc2
Matthew Netsch [Thu, 10 Mar 2022 16:34:26 +0000 (16:34 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5
Change-Id: I010f996f4b726f1f79e9bbe9b9f3e96131021f00
Boris Zanin [Tue, 1 Mar 2022 15:16:12 +0000 (16:16 +0100)]
Disable BC7 mode 8 pattern generation
Due to BC7 is underspecified for mode 8 (LSB=0x00) tests
should avoid testing it. This commit avoids generation
mode 8 BC7 compressed blocks.
Affects tests:
* dEQP-VK.*bc7*
Components: Framework, Vulkan
VK-GL-CTS issue: 3501
Change-Id: I222046f703fbead2bf5c64376defc6481989be24
Matthew Netsch [Thu, 3 Mar 2022 17:11:01 +0000 (17:11 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I3cf7433d510e0966f4f4d96971519aa849cecda0
Matthew Netsch [Thu, 3 Mar 2022 16:47:59 +0000 (16:47 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5
Change-Id: I8e72cdeaa8eed150a5548dd30871eccb09f31d5c
Max Andersson [Mon, 7 Feb 2022 11:31:13 +0000 (12:31 +0100)]
Mark gl_Position as invariant in invariance tests
Always marks gl_Position as invariant. The reason
for this is that there is no guarantee that it
will be computed in an invariant way otherwise,
which may cause test failures.
Affects:
dEQP-VK.glsl.invariance.*user_defined*
VK-GL-CTS issue: 3493
Change-Id: Ia172664b454182458dbd13146c2d1688ecf4161f
Matthew Netsch [Thu, 24 Feb 2022 19:07:22 +0000 (19:07 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I3ae2bc92916e5c4e2b525a085ba763d4c4b124d1
Ricardo Garcia [Fri, 11 Feb 2022 09:30:05 +0000 (10:30 +0100)]
Ray tracing: avoid skipping triangles and AABBs at the same time
This is illegal according to the spec.
Removed tests:
dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.*pipelineskipboth*
dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.*rayskiptriangles.pipelineskipaabbs*
dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.*rayskipaabbs.pipelineskiptriangles*
dEQP-VK.ray_tracing_pipeline.builtin.incomingrayflagsext.*rayskipboth*
Components: Vulkan
VK-GL-CTS issue: 3508
Change-Id: Iebc50b4b546abc36b2607eeb7c5cbb900de35fcb
Mika Väinölä [Thu, 3 Feb 2022 08:15:19 +0000 (10:15 +0200)]
Replace bitwise or with logical
This fixes a Clang 14 bitwise-instead-of-logical warning.
Affects:
dEQP-VK.robustness.robustness2.*
dEQP-VK.robustness.image_robustness.*
Components: Vulkan
VK-GL-CTS issue: 3492
Change-Id: I803ed494ed218b404a2285ed891d41170d66abfe
Matthew Netsch [Thu, 17 Feb 2022 18:32:10 +0000 (18:32 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I4adbb2e30086c26c8ad3312a6086e267c2840d42
Ricardo Garcia [Thu, 10 Feb 2022 10:49:21 +0000 (11:49 +0100)]
Avoid invalid reportIntersectionEXT hit kinds in mem guarantee tests
Only values in the [0, 127] range are allowed with reportIntersectionEXT.
Affected tests:
dEQP-VK.ray_tracing_pipeline.memguarantee.*
Components: Vulkan
VK-GL-CTS issue: 3513
Change-Id: I54669b5b7e2c0f696bbbf3e5a477b1533e4f4488
Matthew Netsch [Thu, 17 Feb 2022 18:08:53 +0000 (18:08 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5
Change-Id: Ib8646342ae0c6c9df3c7f2fa78c24643c10d5e96
Ilkka Saarelainen [Wed, 2 Feb 2022 13:37:18 +0000 (15:37 +0200)]
Fix validation errors in compute tests
This CL fixes various validation errors in compute tests.
Affects:
dEQP-VK.compute.basic.image_barrier*
dEQP-VK.compute.cooperative_matrix.*
Components: Vulkan
VK-GL-CTS Issue: 3451
Change-Id: I33037a50d10a5cf8098c33b55ba42900f97f0019
Matthew Netsch [Thu, 3 Feb 2022 19:07:05 +0000 (14:07 -0500)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I96cce7d1a37d9ab836f098aecf1f5895a9e0185d
Iulian Milas [Wed, 5 Jan 2022 11:35:03 +0000 (12:35 +0100)]
Fix Set/WaitEvent2KHR dependency flags setup
Vulkan specifies that the dependencyFlags member of pDependencyInfo
must be 0 in case of vkCmdSetEvent2KHR and vkCmdWaitEvents2KHR.
The conformance tests use a non zero default flag.
Components: Vulkan
Affects:
dEQP-VK.synchronization2.basic.event.*
dEQP-VK.synchronization2.op.single_queue.event.*
VK-GL-CTS Issue: 3462
Change-Id: Ic67fb77bcddf198fc77bbc9b3a25979d3e43678b
Matthew Netsch [Thu, 3 Feb 2022 16:56:37 +0000 (16:56 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5
Change-Id: Ic3ea84ef67493d7b596c4f4a9547b7841170a9a9
Peter Kohaut [Fri, 21 Jan 2022 08:55:35 +0000 (09:55 +0100)]
Fix compilation on Android
Function testSemaphoreImportSyncFdSignaled is not used and the build process
for Android fails because of it.
Fix just removes this unused function.
Components: Vulkan, AOSP
Affects:
None
VK-GL-CTS Issue: 3465
Change-Id: I82ad0e8df8196ac08d0003f30b7e624461239f84
Matthew Netsch [Thu, 27 Jan 2022 23:10:08 +0000 (23:10 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I60ad45aaeeb84782bde80829cb1e731fb8e76b01
Matthew Netsch [Thu, 27 Jan 2022 19:12:43 +0000 (19:12 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5
Change-Id: Iff22de3540519a435bbb7874188bbcadec977b05
Nishit Shah [Thu, 20 Jan 2022 17:23:14 +0000 (11:23 -0600)]
Fix bug in calcFloatDiff
bsign variable in function calcFloatDiff is wrongly declared. Fixing.
VK-GL-CTS issue: 3472
Affects:
dEQP-VK.api.image_clearing.core.clear_depth_stencil_image*
and all the tests from the vktApiImageClearingTests.cpp file.
Components: Vulkan
Signed-off-by: Nishit Shah <nishit.shah@samsung.com>
Change-Id: I654920c9de460eb04caaca988552f65da3aa2687
Matthew Netsch [Fri, 21 Jan 2022 17:33:04 +0000 (12:33 -0500)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: If56557dcb21ca8bfd90acbb2fffbd3f8ceed16f2
Mika Väinölä [Tue, 11 Jan 2022 07:45:02 +0000 (09:45 +0200)]
Re-enable Clang warning for Amber
The Amber version used by vulkan-cts-1.2.5 and later includes 4d0115c
which should fix all suggest-destructor-override warnings.
Components: Framework, Vulkan
VK-GL-CTS issue: 3361
Change-Id: I36437c797c067521e1444d20cfece33babfe435a
Mika Väinölä [Thu, 13 Jan 2022 08:00:09 +0000 (10:00 +0200)]
GCC 11 build fixes
Some files used std::numeric_limits without including <limits> and
failed to compile.
VK-GL-CTS issue: 2842
Change-Id: I21e37ce38db08c7c7041f4628ac852588a788852
Matthew Netsch [Thu, 20 Jan 2022 21:10:44 +0000 (21:10 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5
Change-Id: I790e54266657e91c84b9e40f6eb7385914d569c6
Ilkka Saarelainen [Wed, 17 Feb 2021 11:33:22 +0000 (13:33 +0200)]
Decrease required subgroup size
dEQP-VK.spirv_assembly.instruction.spirv1p4.entrypoint.comp_workgroup_entry_point
test assumed that the subgroupSize is >= 8. The test failed if the
supported subgroupSize is less than 8.
This CL lowers the required subgroup size to 4.
Affects:
dEQP-VK.spirv_assembly.instruction.spirv1p4.entrypoint.comp_workgroup_entry_point
Components: Vulkan
VK-GL-CTS issue: 2698
Change-Id: I9931dab7a57c0b6b73530e72bca0c0d9cc90f87d
(cherry picked from commit
8f9b9137470ed5b0cd0b38edd9e9c28ccf565731)
Jari Komppa [Tue, 11 Jan 2022 14:58:31 +0000 (16:58 +0200)]
Fix for potentially uninitialized variables
This change adds a constructor for a struct which sets the members that
do not have a constructor of their own to known values.
This potentially affects anything that uses the reference rasterizer,
but should not change any test results.
Affects:
*
Components: Framework
VK-GL-CTS issue: 3434
Change-Id: Ie874b4baa4d2ff5a8aa66f9ea2c3cd11b37edb64
Matthew Netsch [Thu, 20 Jan 2022 17:01:38 +0000 (17:01 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.3 into vk-gl-cts/vulkan-cts-1.2.4
Change-Id: I3080cbdc60602f0faea714502bbc5461cac257e0
Mika Väinölä [Fri, 17 Dec 2021 07:10:19 +0000 (09:10 +0200)]
Fix NULL/False to std::string conversion errors
Newer versions of GCC reject std::string(DE_NULL). Previously this
didn't cause any errors or warnings when compiling, but should produce
an error at runtime. This change replaces invalid values with empty
string literals and adds deFatalStr for cases that potentially
relied on the string constructor throwing an exception.
Components: Framework, OpenGL, Vulkan
VK-GL-CTS issue: 3419
Change-Id: I68ec7d1447d1e96f5d7841e0684687cdd294fe39
Sean Risser [Fri, 30 Apr 2021 17:02:57 +0000 (13:02 -0400)]
Require geometry shaders for adjacency topologies
Clipping tests would use adjacency topologies with drivers that didn't
support geometry shaders.
Components: Vulkan
Affects: dEQP-VK.clipping.clip_volume.depth_clip.*
VK-GL-CTS Issue: 2906
Change-Id: I7a41e62dcbcdcab46ce4f8b04bfe322c688fbcac
Arkadiusz Sarwa [Tue, 7 Dec 2021 17:22:32 +0000 (18:22 +0100)]
Remove api.tooling_info.validate_instance_layers
Remove:
dEQP-VK.api.tooling_info.validate_instance_layers
Components: Vulkan
VK-GL-CTS issue: 3395
This reverts commit
7628909f404f665eb54c6a5019386747fb631134.
Change-Id: I68de938e73c10fed80d4e9bb3698b513a1b44315
Matthew Netsch [Fri, 14 Jan 2022 06:54:19 +0000 (06:54 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: Ic336acbf09ed630cc1b20ea82796f20369b1a5dc
Matthew Netsch [Fri, 14 Jan 2022 05:19:30 +0000 (05:19 +0000)]
Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5
Change-Id: I7ec0667baf95d997230a8befced3ca4f2cda4876
Mohankumar Nekkarakalaya [Wed, 12 Jan 2022 21:23:25 +0000 (13:23 -0800)]
Fix sType Tooling Info tests
Tooling Info tests were not setting the sType correctly. This goes
against spec
where "sType must be
VK_STRUCTURE_TYPE_PHYSICAL_DEVICE_TOOL_PROPERTIES_EXT". These
tests also check this sType to validate functionality.
Components: Vulkan
Affects:
dEQP-VK.api.tooling_info.*
VK-GL-CTS issue: 3444
Change-Id: Ic72104261a577d7d767742d4b2828296eba3922c
Paul Thomson [Fri, 3 Dec 2021 16:48:36 +0000 (16:48 +0000)]
DeqpTestRunner: fix deqpLogFilename
Fix capitalization of shell argument "deqpLogFilename" in
DeqpTestRunner.java. The code still worked fine in most cases because
the default filename matches the filename passed in DeqpTestRunner.java.
Components: Android
Google bug: b/
206657494
Change-Id: I857fa3994ada72aa96d199569704a46034255309
(cherry picked from commit
42017ff7072dcc7e7a7d51dd5611be05abf5460f)
Mikolaj Chadzynski [Thu, 23 Dec 2021 08:38:54 +0000 (09:38 +0100)]
Add format check to SharedPresentableImageTest
The SharedPresentableImageTest does not follow Vulkan spec.
The SurfaceFormats got by getPhysicalDeviceSurfaceFormats ->
getPhysicalDeviceSurfaceFormatsKHR should be checked by
vkGetPhysicalDeviceImageFormatProperties. This is according to:
www.khronos.org/registry/vulkan/specs/1.2-extensions/html/chap33.html
"33.5. Surface Queries
In addition to the surface capabilities as obtained by surface queries
below, swapchain images are also subject to ordinary image creation
limits as reported by vkGetPhysicalDeviceImageFormatProperties. As an
application is instructed by the appropriate Valid Usage sections, both
the surface capabilities and the image creation limits have to be
satisfied whenever swapchain images are created."
Unsupported format can lead to non-deterministic behavior e.g.
a segmentation fault, a null pointer dereference in a test or a driver.
VK-GL-CTS issue: 3422
Affects:
dEQP-VK.wsi.android.shared_presentable_image.*
Components: Vulkan
Change-Id: Id4bb4d1c81e090ed1d7f34a76f3cfafc464d8cf8
Paul Thomson [Mon, 20 Dec 2021 12:39:21 +0000 (12:39 +0000)]
Mirror ANGLE Khronos waiver for Android
Components: Android
VK-GL-CTS issue: 3255
Excluded:
dEQP-GLES3.functional.transform_feedback.array_element.*
dEQP-GLES3.functional.transform_feedback.random.*
dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.*_array_element
dEQP-GLES31.functional.program_interface_query.transform_feedback_varying.type.*.array.*
Change-Id: I670c1e71d60dced06229520bca6244e87fa4ea1a
James Fitzpatrick [Wed, 8 Dec 2021 12:17:29 +0000 (12:17 +0000)]
Fix requirements tests for multiplane images
The memory requirements tests for multiplane images would previously
assume that bits were not sparsely set in memoryTypeBits.
This could lead to the tests assuming that an implementation was
returning a lazily allocated memory type for an image without
transient attachment set.
Affects: dEQP-VK.memory.requirements.*multiplane_image*
Components: Vulkan
VK-GL-CTS issue: 3405
Change-Id: Ic1e56d7412ac413da907059c79b3f7064b3c664b
Jörg Wagner [Mon, 6 Dec 2021 08:57:51 +0000 (09:57 +0100)]
Reduce framebuffer size of spv-stable-pillars-O-op-select-to-op-phi
Reduce the size to 32x16 to avoid avoid timeouts on low-end platforms.
This shouldn't affect the ability to find compiler bugs because the
shader itself is the same.
Affects: dEQP-VK.graphicsfuzz.spv-stable-pillars-O-op-select-to-op-phi
Components: Vulkan
VK-GL-CTS Issue: 3367
Change-Id: I2eacbc75df29b8dc44c8744bc13e140d6ef7c0cb
Matthew Netsch [Fri, 7 Jan 2022 16:02:38 +0000 (11:02 -0500)]
Merge vk-gl-cts/vulkan-cts-1.2.5 into vk-gl-cts/vulkan-cts-1.2.6
Change-Id: I8e4fb16c3f82b6cc42af849e201d50ad2f053d6e
Ricardo Garcia [Thu, 9 Dec 2021 14:23:57 +0000 (15:23 +0100)]
Additional warning fix for Clang 13
Fixes warning about unused variable. No test results should be affected
by this change.
Components: Vulkan
VK-GL-CTS issue: 3147
Change-Id: Ib7c0425891e33e65e22ed90668aa3d0d7eae85df
Ricardo Garcia [Tue, 14 Dec 2021 10:08:16 +0000 (11:08 +0100)]
Fix mismatched ray payload in descriptor set random tests
Miss shaders had a ray payload declaration that didn't match other
shading stages.
Affected tests:
dEQP-VK.binding_model.descriptorset_random.*.miss.*
Components: Vulkan
VK-GL-CTS issue: 3412
Change-Id: I4473a883248bc9d572e6112da82bc4c774689071
s.fricke [Fri, 12 Nov 2021 21:54:10 +0000 (13:54 -0800)]
Add Samsung Driver ID
The enum value was added in the 1.2.199 Vulkan Headers
VK-GL-CTS issue: 3384
Components: Vulkan
Affects:
dEQP-VK.api.driver_properties.driver_id_match
Change-Id: Id04c20b5fe8ad90350a588fd0e7de0c498ebe5b6
Paul Thomson [Fri, 3 Dec 2021 17:53:24 +0000 (17:53 +0000)]
Update Android test lists for Broadcom waiver
VK-GL-CTS issue: 2804
Components: Vulkan, Android
Google bug: b/
206833783
Change-Id: I51fcc3ce1617dc5a980e893bfc5915e8fc789c74
Brandon Schade [Tue, 28 Sep 2021 19:28:20 +0000 (12:28 -0700)]
Remove few EGL robustness tests
Components: EGL
Affects:
dEQP-EGL.functional.robustness.reset_context.shaders.infinite_loop.*
VK-GL-CTS issue: 257
Change-Id: I9edb2e577fb14b98d83bb16dc31188d3a901606d
(cherry picked from commit
39c99a7ece4b6618cde30c6c621bd3036801bd4b)
Mohd Faisal [Mon, 22 Nov 2021 14:58:37 +0000 (14:58 +0000)]
Fix use a device with protected memory enabled
Test is trying to allocate memory from protected memory heap using
default device which doesn't have protected memory enabled. Change
checks if the protected memory supported, if it is create a custom
device with protected memory enabled.
Affects:
dEQP-VK.memory.mapping.*.full.variable.implicit_unmap
Components: Vulkan
VK-GL-CTS issue: 3292
Change-Id: I74897e3dd7f1cada0044036ba27ad8764754ed23
YiHsing Shen [Tue, 9 Nov 2021 02:03:40 +0000 (02:03 +0000)]
Throttling CTS producing frame speed
CTS checks the present time of the frame 6 frames ago. However, if
the default buffer count of BufferQueue is more than 7, CTS could
produce frames continuously in a short time. In this case, the frame
6 frames ago might be not presented yet then CTS fails. To prevent
this situation, CTS produces frames at the speed according to
compositeInterval.
Component: EGL
Affected tests:
dEQP-EGL.functional.get_frame_timestamps.*
Change-Id: I1ac15974a6c4147ee2546ad21dea1fb3e6bf38f9
Matthew Netsch [Fri, 7 Jan 2022 06:07:01 +0000 (01:07 -0500)]
Merge vk-gl-cts/vulkan-cts-1.2.4 into vk-gl-cts/vulkan-cts-1.2.5
Change-Id: I85eab03afdf24359556917617b56856b51b7eb07
Matthew Netsch [Thu, 6 Jan 2022 22:45:47 +0000 (17:45 -0500)]
Merge vk-gl-cts/vulkan-cts-1.2.3 into vk-gl-cts/vulkan-cts-1.2.4
Change-Id: Id711f3ba5558c490c3629051677c7f41ec2da2d6
Ricardo Garcia [Fri, 10 Dec 2021 13:54:01 +0000 (14:54 +0100)]
Fix warnings reported by clang 13
This commit fixes code that was producing warnings when built using
clang 13. They are mostly about unused variables and null pointer
substractions, but the new code should be semantically the same.
No test results should be affected by these changes.
Components: Framework, Vulkan, OpenGL
VK-GL-CTS issue: 3147
Change-Id: I0eb87c17270a610c8b29ec27ae8e10009053f8e1
Jari Komppa [Fri, 19 Nov 2021 13:16:54 +0000 (15:16 +0200)]
Rename various things for more inclusive language
This change renames various things to avoid gender-specific or degatory
terms.
Khronos inclusive language policy:
https://www.khronos.org/about/inclusive-language
Majority of the changes are due to the term 'dummy', as in mannequin or
placeholder, which in programming may mean any of empty, placeholder,
unused, minimal, busywork, ignored or irrelevant.
Changes not included are file names (gluDummyRenderContext), test names
(dummy_instruction_set) or branch names (master).
Affects:
*
Components: Framework, Vulkan, OpenGL
VK-GL-CTS issue: 2509
Change-Id: I3837477a1b3de1142e8d97c503890ccbce9138f8
Ari Suonpaa [Tue, 14 Dec 2021 05:27:53 +0000 (07:27 +0200)]
Remove vkDestroyBuffer
A buffer allocation test that is supposed to fail a large
allocation still tried to destroy the buffer even when an
error was returned from the allocation. This is now removed.
VK-GL-CTS Issue: 3192
Affects:
dEQP-VK.api.buffer.basic.size_max_uint64
Components: Vulkan
Change-Id: Ic36cb548ab2796b41e2a0b44d023e644b02a6d8c
Jari Komppa [Tue, 23 Nov 2021 10:53:00 +0000 (12:53 +0200)]
Avoid querying non-supported hardware features
Change the feature query test to avoid querying information on hardware
features that are not supported. This is done by querying non-existing
feature (max_enum) instead, which must be ignored by implementations.
The change also adds comment to all generated files stating what script
generates the files.
Affects:
dEQP-VK.api.info.get_physical_device_properties2.features
Components: Vulkan
VK-GL-CTS issue: 2853
Change-Id: I24a3832abc0721e649edbb112bd7f776c2b5d7f4
Mika Väinölä [Mon, 13 Dec 2021 11:00:05 +0000 (13:00 +0200)]
Disable two warnings for old Amber versions
Older versions of Amber fail to build with Clang >= 11 and GCC >=11 due
-Werror and warnings that have been fixed in later versions. Upgrading
Amber in older CTS branches risks accidental downgrades during fix
propagation. This change disables -Wsuggest-destructor-override for
Clang and -Wuninitialized for GCC when building libamber. These
should be re-enabled in newer Vulkan CTS releases.
Components: Framework, Vulkan
VK-GL-CTS issue: 3361
Change-Id: Ifc2ed69584d8ad179042b80212e02ceb9956d110
Mika Väinölä [Wed, 1 Dec 2021 10:24:52 +0000 (12:24 +0200)]
Zero initialize array in internal tests
This suppresses a -Wmaybe-uninitialized warning in GCC 11 release
builds.
Affects: dE-IT.delibs.decpp.block_buffer
Components: Framework
VK-GL-CTS issue: 3378
Change-Id: I2315b5cdeecb6e9a54dd419c88134f30a3335029