From: Boris Zanin Date: Thu, 16 May 2019 15:23:19 +0000 (+0200) Subject: Remove incorrect unroll_dont_unroll test X-Git-Tag: upstream/1.3.5~2002^2~4^2~2^2~2^2^2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=558ca135d9918625b970b43a3675326d6c0f51f4;p=platform%2Fupstream%2FVK-GL-CTS.git Remove incorrect unroll_dont_unroll test According SPIR-V validator: Unroll and DontUnroll loop controls must not both be specified. Remove tests: * dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll Affects: * dEQP-VK.spirv_assembly.instruction.compute.loop_control.* VK-GL-CTS issue: 1779 Change-Id: Ib799f96a290bb08df1175f1dc6f6d212314665af --- diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index 0f4d4cd..786cd5e 100755 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -168758,7 +168758,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.wide dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_length dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_infinite dEQP-VK.spirv_assembly.instruction.compute.function_control.none diff --git a/android/cts/nyc/src/vk-master.txt b/android/cts/nyc/src/vk-master.txt index bfe15a1..758e777 100644 --- a/android/cts/nyc/src/vk-master.txt +++ b/android/cts/nyc/src/vk-master.txt @@ -63255,7 +63255,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.swap dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.function_control.none dEQP-VK.spirv_assembly.instruction.compute.function_control.inline dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline diff --git a/android/cts/nyc/vk-master.txt b/android/cts/nyc/vk-master.txt index 3856b1b..d8e2e04 100644 --- a/android/cts/nyc/vk-master.txt +++ b/android/cts/nyc/vk-master.txt @@ -65727,7 +65727,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.swap dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.function_control.none dEQP-VK.spirv_assembly.instruction.compute.function_control.inline dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline diff --git a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp index 066bec9..0360bd7 100644 --- a/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp +++ b/external/vulkancts/modules/vulkan/spirv_assembly/vktSpvAsmInstructionTests.cpp @@ -4192,7 +4192,6 @@ tcu::TestCaseGroup* createLoopControlGroup (tcu::TestContext& testCtx) cases.push_back(CaseParameter("none", "None")); cases.push_back(CaseParameter("unroll", "Unroll")); cases.push_back(CaseParameter("dont_unroll", "DontUnroll")); - cases.push_back(CaseParameter("unroll_dont_unroll", "Unroll|DontUnroll")); fillRandomScalars(rnd, -100.f, 100.f, &inputFloats[0], numElements); diff --git a/external/vulkancts/mustpass/1.0.0/src/master.txt b/external/vulkancts/mustpass/1.0.0/src/master.txt index 55af768..3390799 100644 --- a/external/vulkancts/mustpass/1.0.0/src/master.txt +++ b/external/vulkancts/mustpass/1.0.0/src/master.txt @@ -62696,7 +62696,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.swap dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.function_control.none dEQP-VK.spirv_assembly.instruction.compute.function_control.inline dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline diff --git a/external/vulkancts/mustpass/1.0.0/vk-default.txt b/external/vulkancts/mustpass/1.0.0/vk-default.txt index 6844bb2..69c198a 100644 --- a/external/vulkancts/mustpass/1.0.0/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.0/vk-default.txt @@ -65168,7 +65168,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.swap dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.function_control.none dEQP-VK.spirv_assembly.instruction.compute.function_control.inline dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline diff --git a/external/vulkancts/mustpass/1.0.1/src/master.txt b/external/vulkancts/mustpass/1.0.1/src/master.txt index 4c1871b..cfcee87 100644 --- a/external/vulkancts/mustpass/1.0.1/src/master.txt +++ b/external/vulkancts/mustpass/1.0.1/src/master.txt @@ -74784,7 +74784,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.swap dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.function_control.none dEQP-VK.spirv_assembly.instruction.compute.function_control.inline dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline diff --git a/external/vulkancts/mustpass/1.0.1/vk-default.txt b/external/vulkancts/mustpass/1.0.1/vk-default.txt index d3ba370..a359f67 100644 --- a/external/vulkancts/mustpass/1.0.1/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.1/vk-default.txt @@ -74784,7 +74784,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.swap dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.function_control.none dEQP-VK.spirv_assembly.instruction.compute.function_control.inline dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline diff --git a/external/vulkancts/mustpass/1.0.2/src/master.txt b/external/vulkancts/mustpass/1.0.2/src/master.txt index bc3810f..4112ab1 100644 --- a/external/vulkancts/mustpass/1.0.2/src/master.txt +++ b/external/vulkancts/mustpass/1.0.2/src/master.txt @@ -138444,7 +138444,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.swap dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.function_control.none dEQP-VK.spirv_assembly.instruction.compute.function_control.inline dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline diff --git a/external/vulkancts/mustpass/1.0.2/vk-default.txt b/external/vulkancts/mustpass/1.0.2/vk-default.txt index bc3810f..4112ab1 100644 --- a/external/vulkancts/mustpass/1.0.2/vk-default.txt +++ b/external/vulkancts/mustpass/1.0.2/vk-default.txt @@ -138444,7 +138444,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.swap dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.function_control.none dEQP-VK.spirv_assembly.instruction.compute.function_control.inline dEQP-VK.spirv_assembly.instruction.compute.function_control.dont_inline diff --git a/external/vulkancts/mustpass/1.1.0/vk-default-no-waivers.txt b/external/vulkancts/mustpass/1.1.0/vk-default-no-waivers.txt index 9e4449e..ca69957 100644 --- a/external/vulkancts/mustpass/1.1.0/vk-default-no-waivers.txt +++ b/external/vulkancts/mustpass/1.1.0/vk-default-no-waivers.txt @@ -168763,7 +168763,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.wide dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_length dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_infinite dEQP-VK.spirv_assembly.instruction.compute.function_control.none diff --git a/external/vulkancts/mustpass/1.1.0/vk-default.txt b/external/vulkancts/mustpass/1.1.0/vk-default.txt index d2ab65d..3e3f32a 100755 --- a/external/vulkancts/mustpass/1.1.0/vk-default.txt +++ b/external/vulkancts/mustpass/1.1.0/vk-default.txt @@ -168763,7 +168763,6 @@ dEQP-VK.spirv_assembly.instruction.compute.opphi.wide dEQP-VK.spirv_assembly.instruction.compute.loop_control.none dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dont_unroll -dEQP-VK.spirv_assembly.instruction.compute.loop_control.unroll_dont_unroll dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_length dEQP-VK.spirv_assembly.instruction.compute.loop_control.dependency_infinite dEQP-VK.spirv_assembly.instruction.compute.function_control.none