From ffd39612bdb180ae32af12763e54af26aa118205 Mon Sep 17 00:00:00 2001 From: Ari Suonpaa Date: Wed, 15 Jan 2020 08:15:08 +0200 Subject: [PATCH] dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero New Tests: dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero Components: Vulkan Change-Id: I13bd8b897db2338590de9253e84722dcdb302e06 --- android/cts/master/vk-master.txt | 1 + .../graphicsfuzz/cov-fold-bitwise-and-zero.amber | 125 +++++++++++++++++++++ .../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, 129 insertions(+) create mode 100644 external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-bitwise-and-zero.amber diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index 81e3164..713f699 100644 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -568749,6 +568749,7 @@ dEQP-VK.graphicsfuzz.conditional-return-in-infinite-while dEQP-VK.graphicsfuzz.continue-and-merge dEQP-VK.graphicsfuzz.control-flow-in-function dEQP-VK.graphicsfuzz.control-flow-switch +dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero 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-bitwise-and-zero.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-bitwise-and-zero.amber new file mode 100644 index 0000000..562e7e8 --- /dev/null +++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-bitwise-and-zero.amber @@ -0,0 +1,125 @@ +#!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; +# +# precision highp int; +# +# layout(set = 0, binding = 0) uniform buf0 +# { +# int one; +# }; +# layout(location = 0) out vec4 _GLF_color; +# +# void main() +# { +# // If condition is always true. +# if ((one & 0) == 0) +# _GLF_color = vec4(1, 0, 0, 1); +# else +# _GLF_color = vec4(0); +# } +SHADER fragment variant_fragment_shader SPIRV-ASM +; SPIR-V +; Version: 1.0 +; Generator: Khronos Glslang Reference Front End; 8 +; Bound: 28 +; Schema: 0 + OpCapability Shader + %1 = OpExtInstImport "GLSL.std.450" + OpMemoryModel Logical GLSL450 + OpEntryPoint Fragment %4 "main" %22 + OpExecutionMode %4 OriginUpperLeft + OpSource ESSL 310 + OpName %4 "main" + OpName %7 "buf0" + OpMemberName %7 0 "one" + OpName %9 "" + OpName %22 "_GLF_color" + OpMemberDecorate %7 0 Offset 0 + OpDecorate %7 Block + OpDecorate %9 DescriptorSet 0 + OpDecorate %9 Binding 0 + OpDecorate %22 Location 0 + %2 = OpTypeVoid + %3 = OpTypeFunction %2 + %6 = OpTypeInt 32 1 + %7 = OpTypeStruct %6 + %8 = OpTypePointer Uniform %7 + %9 = OpVariable %8 Uniform + %10 = OpConstant %6 0 + %11 = OpTypePointer Uniform %6 + %15 = OpTypeBool + %19 = OpTypeFloat 32 + %20 = OpTypeVector %19 4 + %21 = OpTypePointer Output %20 + %22 = OpVariable %21 Output + %23 = OpConstant %19 1 + %24 = OpConstant %19 0 + %25 = OpConstantComposite %20 %23 %24 %24 %23 + %27 = OpConstantComposite %20 %24 %24 %24 %24 + %4 = OpFunction %2 None %3 + %5 = OpLabel + %12 = OpAccessChain %11 %9 %10 + %13 = OpLoad %6 %12 + %14 = OpBitwiseAnd %6 %13 %10 + %16 = OpIEqual %15 %14 %10 + OpSelectionMerge %18 None + OpBranchConditional %16 %17 %26 + %17 = OpLabel + OpStore %22 %25 + OpBranch %18 + %26 = OpLabel + OpStore %22 %27 + OpBranch %18 + %18 = OpLabel + OpReturn + OpFunctionEnd +END + +# uniforms for variant + +# one +BUFFER variant_one DATA_TYPE int32 DATA + 1 +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 + BIND BUFFER variant_one AS uniform DESCRIPTOR_SET 0 BINDING 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 15864ea..f5148f4 100644 --- a/external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt +++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt @@ -10,6 +10,7 @@ { "continue-and-merge.amber", "continue-and-merge", "A fragment shader with two nested loops" }, { "control-flow-in-function.amber", "control-flow-in-function", "A fragment shader with a lot of control flow" }, { "control-flow-switch.amber", "control-flow-switch", "A fragment shader with somewhat complex control flow and a switch" }, +{ "cov-fold-bitwise-and-zero.amber", "cov-fold-bitwise-and-zero", "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 441aca4..2185937 100644 --- a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt +++ b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt @@ -571002,6 +571002,7 @@ dEQP-VK.graphicsfuzz.conditional-return-in-infinite-while dEQP-VK.graphicsfuzz.continue-and-merge dEQP-VK.graphicsfuzz.control-flow-in-function dEQP-VK.graphicsfuzz.control-flow-switch +dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero 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 712a741..43aee8c 100644 --- a/external/vulkancts/mustpass/master/vk-default.txt +++ b/external/vulkancts/mustpass/master/vk-default.txt @@ -570849,6 +570849,7 @@ dEQP-VK.graphicsfuzz.conditional-return-in-infinite-while dEQP-VK.graphicsfuzz.continue-and-merge dEQP-VK.graphicsfuzz.control-flow-in-function dEQP-VK.graphicsfuzz.control-flow-switch +dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero 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