From 6fbd66000d689e79b5bd618195023ac8ad023cf0 Mon Sep 17 00:00:00 2001 From: Alexander Galazin Date: Tue, 8 Dec 2020 10:10:35 +0100 Subject: [PATCH] Remove cov-fold-div-variable-by-zero The test relies on undefined behavior Components: Vulkan VK-GL-CTS issue: 2691 Affects: dEQP-VK.graphicsfuzz.cov-fold-div-variable-by-zero Change-Id: I56f7e34bb237184b53c60b8074d19e16c400fff7 --- android/cts/master/vk-master-2020-03-01.txt | 1 - android/cts/master/vk-master.txt | 1 - .../cov-fold-div-variable-by-zero.amber | 119 --------------------- .../data/vulkan/amber/graphicsfuzz/index.txt | 1 - .../mustpass/master/vk-default-no-waivers.txt | 1 - external/vulkancts/mustpass/master/vk-default.txt | 1 - 6 files changed, 124 deletions(-) delete mode 100644 external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-div-variable-by-zero.amber diff --git a/android/cts/master/vk-master-2020-03-01.txt b/android/cts/master/vk-master-2020-03-01.txt index 2198d62..cc6483a 100644 --- a/android/cts/master/vk-master-2020-03-01.txt +++ b/android/cts/master/vk-master-2020-03-01.txt @@ -183167,7 +183167,6 @@ dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero dEQP-VK.graphicsfuzz.cov-fold-bitwise-or-full-mask dEQP-VK.graphicsfuzz.cov-fold-bitwise-xor dEQP-VK.graphicsfuzz.cov-fold-div-uniform-by-zero -dEQP-VK.graphicsfuzz.cov-fold-div-variable-by-zero dEQP-VK.graphicsfuzz.cov-fold-logical-and-const-variable dEQP-VK.graphicsfuzz.cov-fold-logical-and-constant dEQP-VK.graphicsfuzz.cov-fold-logical-or-constant diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index 44ee633..a07a10a 100644 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -579581,7 +579581,6 @@ dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero dEQP-VK.graphicsfuzz.cov-fold-bitwise-or-full-mask dEQP-VK.graphicsfuzz.cov-fold-bitwise-xor dEQP-VK.graphicsfuzz.cov-fold-div-uniform-by-zero -dEQP-VK.graphicsfuzz.cov-fold-div-variable-by-zero dEQP-VK.graphicsfuzz.cov-fold-logical-and-const-variable dEQP-VK.graphicsfuzz.cov-fold-logical-and-constant dEQP-VK.graphicsfuzz.cov-fold-logical-or-constant diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-div-variable-by-zero.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-div-variable-by-zero.amber deleted file mode 100644 index d908c2c..0000000 --- a/external/vulkancts/data/vulkan/amber/graphicsfuzz/cov-fold-div-variable-by-zero.amber +++ /dev/null @@ -1,119 +0,0 @@ -#!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 one = 1; -# // Division by zero results are undefined -# int tmp = one / 0; -# if (tmp == 0) -# _GLF_color = vec4(1, tmp, 0, 1); -# else -# _GLF_color = vec4(1, 0, 0, 1); -# } -SHADER fragment variant_fragment_shader SPIRV-ASM -; SPIR-V -; Version: 1.0 -; Generator: Khronos Glslang Reference Front End; 8 -; Bound: 30 -; 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 %8 "one" - OpName %10 "tmp" - OpName %22 "_GLF_color" - OpDecorate %8 RelaxedPrecision - OpDecorate %10 RelaxedPrecision - OpDecorate %11 RelaxedPrecision - OpDecorate %13 RelaxedPrecision - OpDecorate %14 RelaxedPrecision - OpDecorate %22 Location 0 - OpDecorate %24 RelaxedPrecision - %2 = OpTypeVoid - %3 = OpTypeFunction %2 - %6 = OpTypeInt 32 1 - %7 = OpTypePointer Function %6 - %9 = OpConstant %6 1 - %12 = OpConstant %6 0 - %15 = OpTypeBool - %19 = OpTypeFloat 32 - %20 = OpTypeVector %19 4 - %21 = OpTypePointer Output %20 - %22 = OpVariable %21 Output - %23 = OpConstant %19 1 - %26 = OpConstant %19 0 - %29 = OpConstantComposite %20 %23 %26 %26 %23 - %4 = OpFunction %2 None %3 - %5 = OpLabel - %8 = OpVariable %7 Function - %10 = OpVariable %7 Function - OpStore %8 %9 - %11 = OpLoad %6 %8 - %13 = OpSDiv %6 %11 %12 - OpStore %10 %13 - %14 = OpLoad %6 %10 - %16 = OpIEqual %15 %14 %12 - OpSelectionMerge %18 None - OpBranchConditional %16 %17 %28 - %17 = OpLabel - %24 = OpLoad %6 %10 - %25 = OpConvertSToF %19 %24 - %27 = OpCompositeConstruct %20 %23 %25 %26 %23 - OpStore %22 %27 - OpBranch %18 - %28 = OpLabel - OpStore %22 %29 - OpBranch %18 - %18 = 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 bb99b86..6385bc9 100644 --- a/external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt +++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt @@ -31,7 +31,6 @@ { "cov-fold-bitwise-or-full-mask.amber", "cov-fold-bitwise-or-full-mask", "A fragment shader that covers a specific instruction folding path." }, { "cov-fold-bitwise-xor.amber", "cov-fold-bitwise-xor", "A fragment shader that covers a specific instruction folding path." }, { "cov-fold-div-uniform-by-zero.amber", "cov-fold-div-uniform-by-zero", "A fragment shader that covers a specific instruction folding path." }, -{ "cov-fold-div-variable-by-zero.amber", "cov-fold-div-variable-by-zero", "A fragment shader that covers a specific instruction folding path." }, { "cov-fold-logical-and-const-variable.amber", "cov-fold-logical-and-const-variable", "A fragment shader that covers a specific instruction folding path." }, { "cov-fold-logical-and-constant.amber", "cov-fold-logical-and-constant", "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." }, diff --git a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt index 1dff4b0..c3c6668 100644 --- a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt +++ b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt @@ -581848,7 +581848,6 @@ dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero dEQP-VK.graphicsfuzz.cov-fold-bitwise-or-full-mask dEQP-VK.graphicsfuzz.cov-fold-bitwise-xor dEQP-VK.graphicsfuzz.cov-fold-div-uniform-by-zero -dEQP-VK.graphicsfuzz.cov-fold-div-variable-by-zero dEQP-VK.graphicsfuzz.cov-fold-logical-and-const-variable dEQP-VK.graphicsfuzz.cov-fold-logical-and-constant dEQP-VK.graphicsfuzz.cov-fold-logical-or-constant diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt index 9a89c16..4b12b72 100644 --- a/external/vulkancts/mustpass/master/vk-default.txt +++ b/external/vulkancts/mustpass/master/vk-default.txt @@ -581695,7 +581695,6 @@ dEQP-VK.graphicsfuzz.cov-fold-bitwise-and-zero dEQP-VK.graphicsfuzz.cov-fold-bitwise-or-full-mask dEQP-VK.graphicsfuzz.cov-fold-bitwise-xor dEQP-VK.graphicsfuzz.cov-fold-div-uniform-by-zero -dEQP-VK.graphicsfuzz.cov-fold-div-variable-by-zero dEQP-VK.graphicsfuzz.cov-fold-logical-and-const-variable dEQP-VK.graphicsfuzz.cov-fold-logical-and-constant dEQP-VK.graphicsfuzz.cov-fold-logical-or-constant -- 2.7.4