Enable remaining OpFUnord tests

NaN issues should be handled by 000e5e5b715

Components: Vulkan

Affects:
dEQP-VK.spirv_assembly.instruction.compute.opfunord.*

VK-GL-CTS issue: 1423

Change-Id: Ie0c2bcb3abf4a8bfcdd2a464c761e18e9064ced3

diff --git a/external/vulkancts/mustpass/1.1.3/src/excluded-tests.txt b/external/vulkancts/mustpass/1.1.3/src/excluded-tests.txt
index 00b9458..82c9190 100644 (file)
--- a/external/vulkancts/mustpass/1.1.3/src/excluded-tests.txt
+++ b/external/vulkancts/mustpass/1.1.3/src/excluded-tests.txt
@@ -25,8 +25,5 @@ dEQP-VK.glsl.texture_functions.texture.sparse_usampler2darray_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_isampler3d_bias_fragment
 dEQP-VK.glsl.texture_functions.texture.sparse_usampler3d_bias_fragment
 
-# CTS issue 426, spec issue 403
-dEQP-VK.spirv_assembly.instruction.compute.opfunord.*
-
 # New tests from AOSP
 dEQP-VK.texture.explicit_lod.*

diff --git a/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
index cbb6093..ae1286d 100644 (file)
--- a/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/1.1.3/vk-default-no-waivers.txt
@@ -221693,6 +221693,12 @@ dEQP-VK.spirv_assembly.instruction.compute.localsize.literal_localsize_z
 dEQP-VK.spirv_assembly.instruction.compute.localsize.literal_and_specid_localsize_z
 dEQP-VK.spirv_assembly.instruction.compute.localsize.specid_localsize_z
 dEQP-VK.spirv_assembly.instruction.compute.opnop.all
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.equal
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.less
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.lessequal
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.greater
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.greaterequal
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.notequal
 dEQP-VK.spirv_assembly.instruction.compute.opatomic.iadd
 dEQP-VK.spirv_assembly.instruction.compute.opatomic.isub
 dEQP-VK.spirv_assembly.instruction.compute.opatomic.iinc

diff --git a/external/vulkancts/mustpass/1.1.3/vk-default.txt b/external/vulkancts/mustpass/1.1.3/vk-default.txt
index d1ab5ad..d66e71c 100644 (file)
--- a/external/vulkancts/mustpass/1.1.3/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.3/vk-default.txt
@@ -221693,6 +221693,12 @@ dEQP-VK.spirv_assembly.instruction.compute.localsize.literal_localsize_z
 dEQP-VK.spirv_assembly.instruction.compute.localsize.literal_and_specid_localsize_z
 dEQP-VK.spirv_assembly.instruction.compute.localsize.specid_localsize_z
 dEQP-VK.spirv_assembly.instruction.compute.opnop.all
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.equal
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.less
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.lessequal
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.greater
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.greaterequal
+dEQP-VK.spirv_assembly.instruction.compute.opfunord.notequal
 dEQP-VK.spirv_assembly.instruction.compute.opatomic.iadd
 dEQP-VK.spirv_assembly.instruction.compute.opatomic.isub
 dEQP-VK.spirv_assembly.instruction.compute.opatomic.iinc