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

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 54da5ba..0df59f7 100755 (executable)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -168830,9 +168830,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 fb852d8..5fa30bc 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -7291,12 +7291,6 @@ void createUConvertCases (vector<ConvertCase>& 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 f231965..4c1871b 100644 (file)
--- a/external/vulkancts/mustpass/1.0.1/src/master.txt
+++ b/external/vulkancts/mustpass/1.0.1/src/master.txt
@@ -74846,9 +74846,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 33b51f9..d3ba370 100644 (file)
--- a/external/vulkancts/mustpass/1.0.1/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt
@@ -74846,9 +74846,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 8181529..8933e5c 100644 (file)
--- a/external/vulkancts/mustpass/1.0.2/src/master.txt
+++ b/external/vulkancts/mustpass/1.0.2/src/master.txt
@@ -138506,9 +138506,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 8181529..8933e5c 100644 (file)
--- a/external/vulkancts/mustpass/1.0.2/vk-default.txt
+++ b/external/vulkancts/mustpass/1.0.2/vk-default.txt
@@ -138506,9 +138506,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.1.0/vk-default.txt b/external/vulkancts/mustpass/1.1.0/vk-default.txt
index f69573e..3cd6f4a 100755 (executable)
--- a/external/vulkancts/mustpass/1.1.0/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.0/vk-default.txt
@@ -168835,9 +168835,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