From bb482f826bf25b8c69add2b5e1ddbbcd9b2be30c Mon Sep 17 00:00:00 2001 From: Andrey Tuganov Date: Thu, 28 Sep 2017 17:18:51 -0400 Subject: [PATCH] Remove OpUConvert to signed integer tests OpUConvert only convers to unsigned integers. Affects: dEQP-VK.spirv_assembly.instruction. compute.uconvert.* Components: Vulkan VK-GL-CTS issue: 720 Change-Id: I68b13c8584d64359e52910091347de03b933ba42 --- android/cts/master/vk-master.txt | 3 --- .../modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp | 6 ------ external/vulkancts/mustpass/1.0.1/src/master.txt | 3 --- external/vulkancts/mustpass/1.0.1/vk-default.txt | 3 --- external/vulkancts/mustpass/1.0.2/src/master.txt | 3 --- external/vulkancts/mustpass/1.0.2/vk-default.txt | 3 --- external/vulkancts/mustpass/1.0.3/vk-default.txt | 3 --- 7 files changed, 24 deletions(-) diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index 3ce6a7d..54fa8f3 100644 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -191238,9 +191238,6 @@ dEQP-VK.spirv_assembly.instruction.compute.sconvert.int32_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint32 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_uint64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int32 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_int64 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_2 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_3 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_4 diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp index 1f65718..6b67d67 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp @@ -7940,12 +7940,6 @@ void createUConvertCases (vector& testCases) testCases.push_back(ConvertCase(INTEGER_TYPE_UNSIGNED_16, INTEGER_TYPE_UNSIGNED_64, 17991)); testCases.push_back(ConvertCase(INTEGER_TYPE_UNSIGNED_32, INTEGER_TYPE_UNSIGNED_64, 904256275)); - - // Convert unsigned int to int - testCases.push_back(ConvertCase(INTEGER_TYPE_UNSIGNED_16, INTEGER_TYPE_SIGNED_32, 38002)); - testCases.push_back(ConvertCase(INTEGER_TYPE_UNSIGNED_16, INTEGER_TYPE_SIGNED_64, 64921)); - - testCases.push_back(ConvertCase(INTEGER_TYPE_UNSIGNED_32, INTEGER_TYPE_SIGNED_64, 4294956295ll)); } // Test for the OpUConvert instruction. diff --git a/external/vulkancts/mustpass/1.0.1/src/master.txt b/external/vulkancts/mustpass/1.0.1/src/master.txt index d04afc1..35c60b5 100644 --- a/external/vulkancts/mustpass/1.0.1/src/master.txt +++ b/external/vulkancts/mustpass/1.0.1/src/master.txt @@ -74845,9 +74845,6 @@ dEQP-VK.spirv_assembly.instruction.compute.sconvert.int32_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint32 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_uint64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int32 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_int64 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_2 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_3 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_4 diff --git a/external/vulkancts/mustpass/1.0.1/vk-default.txt b/external/vulkancts/mustpass/1.0.1/vk-default.txt index d04afc1..35c60b5 100644 --- a/external/vulkancts/mustpass/1.0.1/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt @@ -74845,9 +74845,6 @@ dEQP-VK.spirv_assembly.instruction.compute.sconvert.int32_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint32 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_uint64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int32 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_int64 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_2 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_3 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_4 diff --git a/external/vulkancts/mustpass/1.0.2/src/master.txt b/external/vulkancts/mustpass/1.0.2/src/master.txt index 6032905..ca79c58 100644 --- a/external/vulkancts/mustpass/1.0.2/src/master.txt +++ b/external/vulkancts/mustpass/1.0.2/src/master.txt @@ -138505,9 +138505,6 @@ dEQP-VK.spirv_assembly.instruction.compute.sconvert.int32_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint32 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_uint64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int32 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_int64 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_2 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_3 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_4 diff --git a/external/vulkancts/mustpass/1.0.2/vk-default.txt b/external/vulkancts/mustpass/1.0.2/vk-default.txt index 6032905..ca79c58 100644 --- a/external/vulkancts/mustpass/1.0.2/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.2/vk-default.txt @@ -138505,9 +138505,6 @@ dEQP-VK.spirv_assembly.instruction.compute.sconvert.int32_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint32 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_uint64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int32 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_int64 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_2 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_3 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_4 diff --git a/external/vulkancts/mustpass/1.0.3/vk-default.txt b/external/vulkancts/mustpass/1.0.3/vk-default.txt index 9eb384d..c3fa82c 100644 --- a/external/vulkancts/mustpass/1.0.3/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.3/vk-default.txt @@ -191243,9 +191243,6 @@ dEQP-VK.spirv_assembly.instruction.compute.sconvert.int32_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint32 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_uint64 dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_uint64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int32 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint16_to_int64 -dEQP-VK.spirv_assembly.instruction.compute.uconvert.uint32_to_int64 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_2 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_3 dEQP-VK.spirv_assembly.instruction.compute.opcompositeinsert.int.vec_4 -- 2.7.4