projects / platform / upstream / VK-GL-CTS.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 1048c2e)
Add tests for OpSpecConstantOp INotEqual
authorJeff Bolz <jbolz@nvidia.com>
Tue, 30 Oct 2018 19:39:14 +0000 (14:39 -0500)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Thu, 15 Nov 2018 12:00:45 +0000 (07:00 -0500)
This was the only spec constant operation missing tests.

Components: Vulkan
New Tests: dEQP-VK.spirv_assembly.instruction.*.opspecconstantop.inotequal*

Change-Id: I5549880871d9afbc95ad239f0622562e21a4312d

android/cts/master/vk-master.txt patch | blob | history
external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp patch | blob | history
external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt patch | blob | history
external/vulkancts/mustpass/1.1.2/vk-default.txt patch | blob | history

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index c067e8b..439c611 100755 (executable)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -211972,6 +211972,7 @@ dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.ulessthanequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.sgreaterthanequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.ugreaterthanequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.iequal
+dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.inotequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.logicaland
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.logicalor
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.logicalequal
@@ -213689,6 +213690,11 @@ dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_tessc
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_tesse
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_geom
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_frag
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_vert
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_tessc
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_tesse
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_geom
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_frag
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.logicaland_vert
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.logicaland_tessc
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.logicaland_tesse
diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
index 8745239..e01dda2 100644 (file)
--- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
+++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp
@@ -2734,6 +2734,7 @@ tcu::TestCaseGroup* createSpecConstantGroup (tcu::TestContext& testCtx)
        cases.push_back(SpecConstantTwoIntCase("sgreaterthanequal",             " %i32 0",              " %i32 0",              "%bool",        "SGreaterThanEqual    %sc_0 %sc_1",                     -1000,  50,             selectFalseUsingSc,     outputInts2));
        cases.push_back(SpecConstantTwoIntCase("ugreaterthanequal",             " %i32 0",              " %i32 0",              "%bool",        "UGreaterThanEqual    %sc_0 %sc_1",                     10,             10,             selectTrueUsingSc,      outputInts2));
        cases.push_back(SpecConstantTwoIntCase("iequal",                                " %i32 0",              " %i32 0",              "%bool",        "IEqual               %sc_0 %sc_1",                     42,             24,             selectFalseUsingSc,     outputInts2));
+       cases.push_back(SpecConstantTwoIntCase("inotequal",                             " %i32 0",              " %i32 0",              "%bool",        "INotEqual            %sc_0 %sc_1",                     42,             24,             selectTrueUsingSc,      outputInts2));
        cases.push_back(SpecConstantTwoIntCase("logicaland",                    "True %bool",   "True %bool",   "%bool",        "LogicalAnd           %sc_0 %sc_1",                     0,              1,              selectFalseUsingSc,     outputInts2));
        cases.push_back(SpecConstantTwoIntCase("logicalor",                             "False %bool",  "False %bool",  "%bool",        "LogicalOr            %sc_0 %sc_1",                     1,              0,              selectTrueUsingSc,      outputInts2));
        cases.push_back(SpecConstantTwoIntCase("logicalequal",                  "True %bool",   "True %bool",   "%bool",        "LogicalEqual         %sc_0 %sc_1",                     0,              1,              selectFalseUsingSc,     outputInts2));
@@ -6392,6 +6393,7 @@ tcu::TestCaseGroup* createSpecConstantTests (tcu::TestContext& testCtx)
        cases.push_back(SpecConstantTwoIntGraphicsCase("sgreaterthanequal",             " %i32 0",              " %i32 0",              "%bool",        "SGreaterThanEqual    %sc_0 %sc_1",                             -1000,  50,             selectFalseUsingSc,     outputColors2));
        cases.push_back(SpecConstantTwoIntGraphicsCase("ugreaterthanequal",             " %i32 0",              " %i32 0",              "%bool",        "UGreaterThanEqual    %sc_0 %sc_1",                             10,             10,             selectTrueUsingSc,      outputColors2));
        cases.push_back(SpecConstantTwoIntGraphicsCase("iequal",                                " %i32 0",              " %i32 0",              "%bool",        "IEqual               %sc_0 %sc_1",                             42,             24,             selectFalseUsingSc,     outputColors2));
+       cases.push_back(SpecConstantTwoIntGraphicsCase("inotequal",                             " %i32 0",              " %i32 0",              "%bool",        "INotEqual            %sc_0 %sc_1",                             42,             24,             selectTrueUsingSc,      outputColors2));
        cases.push_back(SpecConstantTwoIntGraphicsCase("logicaland",                    "True %bool",   "True %bool",   "%bool",        "LogicalAnd           %sc_0 %sc_1",                             0,              1,              selectFalseUsingSc,     outputColors2));
        cases.push_back(SpecConstantTwoIntGraphicsCase("logicalor",                             "False %bool",  "False %bool",  "%bool",        "LogicalOr            %sc_0 %sc_1",                             1,              0,              selectTrueUsingSc,      outputColors2));
        cases.push_back(SpecConstantTwoIntGraphicsCase("logicalequal",                  "True %bool",   "True %bool",   "%bool",        "LogicalEqual         %sc_0 %sc_1",                             0,              1,              selectFalseUsingSc,     outputColors2));
diff --git a/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
index 4705aec..4de253d 100644 (file)
--- a/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/1.1.2/vk-default-no-waivers.txt
@@ -211977,6 +211977,7 @@ dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.ulessthanequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.sgreaterthanequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.ugreaterthanequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.iequal
+dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.inotequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.logicaland
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.logicalor
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.logicalequal
@@ -213690,6 +213691,11 @@ dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_tessc
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_tesse
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_geom
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_frag
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_vert
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_tessc
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_tesse
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_geom
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_frag
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.logicaland_vert
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.logicaland_tessc
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.logicaland_tesse
diff --git a/external/vulkancts/mustpass/1.1.2/vk-default.txt b/external/vulkancts/mustpass/1.1.2/vk-default.txt
index fa19047..7c4d374 100644 (file)
--- a/external/vulkancts/mustpass/1.1.2/vk-default.txt
+++ b/external/vulkancts/mustpass/1.1.2/vk-default.txt
@@ -211977,6 +211977,7 @@ dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.ulessthanequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.sgreaterthanequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.ugreaterthanequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.iequal
+dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.inotequal
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.logicaland
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.logicalor
 dEQP-VK.spirv_assembly.instruction.compute.opspecconstantop.logicalequal
@@ -213690,6 +213691,11 @@ dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_tessc
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_tesse
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_geom
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.iequal_frag
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_vert
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_tessc
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_tesse
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_geom
+dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.inotequal_frag
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.logicaland_vert
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.logicaland_tessc
 dEQP-VK.spirv_assembly.instruction.graphics.opspecconstantop.logicaland_tesse
Domain: Graphics System / GL;