From: Maciej Jesionowski Date: Tue, 10 Oct 2017 09:29:26 +0000 (+0200) Subject: Exclude invalid spirv_assembly indexing cases X-Git-Tag: upstream/1.3.5~2565^2~6^2~83 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=4e718560a6491278b44277fcfd6a1d4a90291ba4;p=platform%2Fupstream%2FVK-GL-CTS.git Exclude invalid spirv_assembly indexing cases 32 bit int cases were trying to convert to the same bit width, which is forbidden by the spec. We can safely remove these cases as all other tests in this group use 32 bit access, so no coverage is lost. Excluded tests: * dEQP-VK.spirv_assembly.instruction.*.indexing.*u32* * dEQP-VK.spirv_assembly.instruction.*.indexing.*s32* VK-GL-CTS issue: 702 Components: Vulkan Change-Id: I049ab07824a92f757829c4db810ab099a3fb59e6 --- diff --git a/android/cts/master/src/vk-test-issues.txt b/android/cts/master/src/vk-test-issues.txt index cab0405..1f2bff2 100644 --- a/android/cts/master/src/vk-test-issues.txt +++ b/android/cts/master/src/vk-test-issues.txt @@ -21,3 +21,7 @@ dEQP-VK.glsl.builtin.function.common.frexp.vec4_highp_vertex # Issue 340: Cube map corner texel selection dEQP-VK.pipeline.sampler.view_type.cube.format.r5g6b5_unorm_pack16.mag_filter.linear + +# Issue 702: Tests use invalid conversion operations +dEQP-VK.spirv_assembly.instruction.*.indexing.*u32* +dEQP-VK.spirv_assembly.instruction.*.indexing.*s32* diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index b3b6e53..54da5ba 100755 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -169042,20 +169042,14 @@ dEQP-VK.spirv_assembly.instruction.compute.conditional_branch.same_labels_true dEQP-VK.spirv_assembly.instruction.compute.conditional_branch.same_labels_false dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_u16 dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_s16 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_u32 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_s32 dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_u64 dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_s64 dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_u16 dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_s16 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_u32 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_s32 dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_u64 dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_s64 dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_u16 dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_s16 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_u32 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_s32 dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_u64 dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_s64 dEQP-VK.spirv_assembly.instruction.compute.variable_pointers.compute.reads_opselect_single_buffer @@ -171145,16 +171139,6 @@ dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s16_tessc dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s16_tesse dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s16_geom dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s16_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u32_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s32_frag dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u64_vert dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u64_tessc dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u64_tesse @@ -171175,16 +171159,6 @@ dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s16_t dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s16_tesse dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s16_geom dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s16_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u32_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s32_frag dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u64_vert dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u64_tessc dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u64_tesse @@ -171205,16 +171179,6 @@ dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s16_tessc dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s16_tesse dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s16_geom dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s16_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u32_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s32_frag dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u64_vert dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u64_tessc dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u64_tesse diff --git a/external/vulkancts/mustpass/1.1.0/src/test-issues.txt b/external/vulkancts/mustpass/1.1.0/src/test-issues.txt index 311a567..4ffdf58 100644 --- a/external/vulkancts/mustpass/1.1.0/src/test-issues.txt +++ b/external/vulkancts/mustpass/1.1.0/src/test-issues.txt @@ -26,3 +26,7 @@ dEQP-VK.glsl.texture_functions.textureoffset.isampler2darray_vertex dEQP-VK.glsl.texture_functions.textureoffset.usampler2darray_vertex dEQP-VK.glsl.texture_functions.textureoffset.usampler3d_vertex dEQP-VK.glsl.texture_functions.texturegradoffset.usampler2darray_vertex + +# Issue 702: Tests use invalid conversion operations +dEQP-VK.spirv_assembly.instruction.*.indexing.*u32* +dEQP-VK.spirv_assembly.instruction.*.indexing.*s32* diff --git a/external/vulkancts/mustpass/1.1.0/vk-default.txt b/external/vulkancts/mustpass/1.1.0/vk-default.txt index 18b47a1..f69573e 100755 --- a/external/vulkancts/mustpass/1.1.0/vk-default.txt +++ b/external/vulkancts/mustpass/1.1.0/vk-default.txt @@ -169043,20 +169043,14 @@ dEQP-VK.spirv_assembly.instruction.compute.conditional_branch.same_labels_true dEQP-VK.spirv_assembly.instruction.compute.conditional_branch.same_labels_false dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_u16 dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_s16 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_u32 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_s32 dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_u64 dEQP-VK.spirv_assembly.instruction.compute.indexing.opaccesschain_s64 dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_u16 dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_s16 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_u32 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_s32 dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_u64 dEQP-VK.spirv_assembly.instruction.compute.indexing.opinboundsaccesschain_s64 dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_u16 dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_s16 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_u32 -dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_s32 dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_u64 dEQP-VK.spirv_assembly.instruction.compute.indexing.opptraccesschain_s64 dEQP-VK.spirv_assembly.instruction.compute.variable_pointers.compute.reads_opselect_single_buffer @@ -171126,16 +171120,6 @@ dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s16_tessc dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s16_tesse dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s16_geom dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s16_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u32_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_s32_frag dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u64_vert dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u64_tessc dEQP-VK.spirv_assembly.instruction.graphics.indexing.opaccesschain_u64_tesse @@ -171156,16 +171140,6 @@ dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s16_t dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s16_tesse dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s16_geom dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s16_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u32_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_s32_frag dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u64_vert dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u64_tessc dEQP-VK.spirv_assembly.instruction.graphics.indexing.opinboundsaccesschain_u64_tesse @@ -171186,16 +171160,6 @@ dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s16_tessc dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s16_tesse dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s16_geom dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s16_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u32_frag -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s32_vert -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s32_tessc -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s32_tesse -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s32_geom -dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_s32_frag dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u64_vert dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u64_tessc dEQP-VK.spirv_assembly.instruction.graphics.indexing.opptraccesschain_u64_tesse