From 1df4c0fd912106895dc85a5e153e1b072436d385 Mon Sep 17 00:00:00 2001 From: Ari Suonpaa Date: Fri, 3 Jan 2020 14:42:35 +0200 Subject: [PATCH] dEQP-VK.graphicsfuzz.cov-fold-negate-variable New tests: dEQP-VK.graphicsfuzz.cov-fold-negate-variable Components: Vulkan Change-Id: Ib16c2a70151bc62a27a5e4d3fcea85bcdcbf5d0c --- android/cts/master/vk-master.txt | 1 + .../graphicsfuzz/cov-fold-negate-variable.amber | 109 +++++++++++++++++++++ .../data/vulkan/amber/graphicsfuzz/index.txt | 1 + .../mustpass/master/vk-default-no-waivers.txt | 1 + external/vulkancts/mustpass/master/vk-default.txt | 1 + 5 files changed, 113 insertions(+) create mode 100644 external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-negate-variable.amber diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index 748fc03..9e5e7a4 100644 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -568760,6 +568760,7 @@ dEQP-VK.graphicsfuzz.cov-copy-prop-arrays-param-uniform dEQP-VK.graphicsfuzz.cov-dead-code-unreachable-merge dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero dEQP-VK.graphicsfuzz.cov-fold-logical-or-constant +dEQP-VK.graphicsfuzz.cov-fold-negate-variable dEQP-VK.graphicsfuzz.dead-barriers-in-loops dEQP-VK.graphicsfuzz.dead-struct-init dEQP-VK.graphicsfuzz.disc-and-add-in-func-in-loop diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-negate-variable.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-negate-variable.amber new file mode 100644 index 0000000..1f304e2 --- /dev/null +++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-negate-variable.amber @@ -0,0 +1,109 @@ +#!amber + +# Copyright 2019 Google LLC +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. + + +# A test for a coverage-gap found by GraphicsFuzz. + +# Short description: A fragment shader that covers a specific instruction folding path. + +# The test passes because shader always writes red. + +SHADER vertex variant_vertex_shader PASSTHROUGH + +# variant_fragment_shader is derived from the following GLSL: +# #version 310 es +# precision highp float; +# +# layout(location = 0) out vec4 _GLF_color; +# +# void main() +# { +# int i = 3; +# // If comparison is always true. +# if((~i) == -4) +# _GLF_color = vec4(1, 0, 0, 1); +# else +# _GLF_color = vec4(0, 0, 0, 0); +# } +SHADER fragment variant_fragment_shader SPIRV-ASM +; SPIR-V +; Version: 1.0 +; Generator: Khronos Glslang Reference Front End; 8 +; Bound: 26 +; Schema: 0 + OpCapability Shader + %1 = OpExtInstImport "GLSL.std.450" + OpMemoryModel Logical GLSL450 + OpEntryPoint Fragment %4 "main" %20 + OpExecutionMode %4 OriginUpperLeft + OpSource ESSL 310 + OpName %4 "main" + OpName %8 "i" + OpName %20 "_GLF_color" + OpDecorate %8 RelaxedPrecision + OpDecorate %10 RelaxedPrecision + OpDecorate %11 RelaxedPrecision + OpDecorate %20 Location 0 + %2 = OpTypeVoid + %3 = OpTypeFunction %2 + %6 = OpTypeInt 32 1 + %7 = OpTypePointer Function %6 + %9 = OpConstant %6 3 + %12 = OpConstant %6 -4 + %13 = OpTypeBool + %17 = OpTypeFloat 32 + %18 = OpTypeVector %17 4 + %19 = OpTypePointer Output %18 + %20 = OpVariable %19 Output + %21 = OpConstant %17 1 + %22 = OpConstant %17 0 + %23 = OpConstantComposite %18 %21 %22 %22 %21 + %25 = OpConstantComposite %18 %22 %22 %22 %22 + %4 = OpFunction %2 None %3 + %5 = OpLabel + %8 = OpVariable %7 Function + OpStore %8 %9 + %10 = OpLoad %6 %8 + %11 = OpNot %6 %10 + %14 = OpIEqual %13 %11 %12 + OpSelectionMerge %16 None + OpBranchConditional %14 %15 %24 + %15 = OpLabel + OpStore %20 %23 + OpBranch %16 + %24 = OpLabel + OpStore %20 %25 + OpBranch %16 + %16 = OpLabel + OpReturn + OpFunctionEnd +END + + +BUFFER variant_framebuffer FORMAT B8G8R8A8_UNORM + +PIPELINE graphics variant_pipeline + ATTACH variant_vertex_shader + ATTACH variant_fragment_shader + FRAMEBUFFER_SIZE 256 256 + BIND BUFFER variant_framebuffer AS color LOCATION 0 +END +CLEAR_COLOR variant_pipeline 0 0 0 255 + +CLEAR variant_pipeline +RUN variant_pipeline DRAW_RECT POS 0 0 SIZE 256 256 + +EXPECT variant_framebuffer IDX 0 0 SIZE 256 256 EQ_RGBA 255 0 0 255 diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt b/external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt index 6547252..2fd271f 100644 --- a/external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt +++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt @@ -19,6 +19,7 @@ { "cov-dead-code-unreachable-merge.amber", "cov-dead-code-unreachable-merge", "A fragment shader that covers a specific dead code elimination path." }, { "cov-fold-bitwise-and-zero.amber", "cov-fold-bitwise-and-zero", "A fragment shader that covers a specific instruction folding path." }, { "cov-fold-logical-or-constant.amber", "cov-fold-logical-or-constant", "A fragment shader that covers a specific instruction folding path." }, +{ "cov-fold-negate-variable.amber", "cov-fold-negate-variable", "A fragment shader that covers a specific instruction folding path." }, { "dead-barriers-in-loops.amber", "dead-barriers-in-loops", "A compute shader with dead barriers" }, { "dead-struct-init.amber", "dead-struct-init", "A fragment shader that uses struct initializers" }, { "disc-and-add-in-func-in-loop.amber", "disc-and-add-in-func-in-loop", "A fragment shader with discard and add in function in loop" }, diff --git a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt index 4b0833c..05e04ac 100644 --- a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt +++ b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt @@ -571013,6 +571013,7 @@ dEQP-VK.graphicsfuzz.cov-copy-prop-arrays-param-uniform dEQP-VK.graphicsfuzz.cov-dead-code-unreachable-merge dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero dEQP-VK.graphicsfuzz.cov-fold-logical-or-constant +dEQP-VK.graphicsfuzz.cov-fold-negate-variable dEQP-VK.graphicsfuzz.dead-barriers-in-loops dEQP-VK.graphicsfuzz.dead-struct-init dEQP-VK.graphicsfuzz.disc-and-add-in-func-in-loop diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt index 9822bb2..c92f649 100644 --- a/external/vulkancts/mustpass/master/vk-default.txt +++ b/external/vulkancts/mustpass/master/vk-default.txt @@ -570860,6 +570860,7 @@ dEQP-VK.graphicsfuzz.cov-copy-prop-arrays-param-uniform dEQP-VK.graphicsfuzz.cov-dead-code-unreachable-merge dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero dEQP-VK.graphicsfuzz.cov-fold-logical-or-constant +dEQP-VK.graphicsfuzz.cov-fold-negate-variable dEQP-VK.graphicsfuzz.dead-barriers-in-loops dEQP-VK.graphicsfuzz.dead-struct-init dEQP-VK.graphicsfuzz.disc-and-add-in-func-in-loop -- 2.7.4