From: Paul Thomson Date: Mon, 9 Sep 2019 14:44:16 +0000 (+0100) Subject: dEQP-VK.graphicsfuzz.two-loops-set-struct X-Git-Tag: upstream/1.3.5~1853 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=c077d2345ab04e77838d9051fad9e2046ea8ff6c;p=platform%2Fupstream%2FVK-GL-CTS.git dEQP-VK.graphicsfuzz.two-loops-set-struct Components: Vulkan New Tests: dEQP-VK.graphicsfuzz.two-loops-set-struct Change-Id: I8c08d5bc486d228ebf2dbaa8a7c7fb2bae4a7410 --- diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt index 6d63c63..f3625be 100644 --- a/android/cts/master/vk-master.txt +++ b/android/cts/master/vk-master.txt @@ -483032,6 +483032,7 @@ dEQP-VK.graphicsfuzz.pow-vec4 dEQP-VK.graphicsfuzz.return-in-loop-in-function dEQP-VK.graphicsfuzz.struct-used-as-temporary dEQP-VK.graphicsfuzz.swizzle-struct-init-min +dEQP-VK.graphicsfuzz.two-loops-set-struct dEQP-VK.graphicsfuzz.unreachable-barrier-in-loops dEQP-VK.graphicsfuzz.unreachable-loops dEQP-VK.graphicsfuzz.unreachable-loops-in-switch diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-set-struct.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-set-struct.amber new file mode 100644 index 0000000..7dc3728 --- /dev/null +++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-set-struct.amber @@ -0,0 +1,206 @@ +#!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 bug found by GraphicsFuzz. + +# Short description: A fragment shader with two loops that write to a struct + +# The test passes because the shader always writes the color red. + +# Optimized using spirv-opt with the following arguments: +# '--private-to-local' +# '--private-to-local' +# '--eliminate-dead-inserts' +# '--if-conversion' +# '--eliminate-dead-code-aggressive' +# '--eliminate-dead-code-aggressive' +# '--vector-dce' +# '--convert-local-access-chains' +# '--convert-local-access-chains' +# '--eliminate-local-single-block' +# '--eliminate-dead-code-aggressive' +# '--redundancy-elimination' +# '--eliminate-local-multi-store' +# '--eliminate-dead-branches' +# '--merge-blocks' +# '--eliminate-dead-code-aggressive' +# '--eliminate-dead-branches' +# '--eliminate-dead-inserts' +# '--simplify-instructions' +# '--eliminate-local-multi-store' +# '--private-to-local' +# '--combine-access-chains' +# '--eliminate-local-single-store' +# '--eliminate-dead-branches' +# '--merge-return' +# spirv-opt commit hash: 06407250a169c6a03b3765e86619075af1a8c187 + + + +SHADER vertex variant_vertex_shader PASSTHROUGH + +# variant_fragment_shader is derived from the following GLSL: +# #version 310 es +# precision highp float; +# +# struct StructType +# { +# vec3 col; +# bvec4 bbbb; +# }; +# +# layout(location = 0) out vec4 _GLF_color; +# +# layout(set = 0, binding = 0) uniform buf0 +# { +# vec2 injectionSwitch; +# }; +# void main() +# { +# StructType s; +# +# for ( +# int i = 0; +# i < int(injectionSwitch.y); // i < 1 +# i++) +# { +# s.col = vec3(1.0, 0.0, 0.0); +# } +# +# for ( +# int i = 0; +# i < int(injectionSwitch.y); // i < 1 +# i++) +# { +# s.col = vec3(1.0, 0.0, 0.0);; +# } +# _GLF_color = vec4(s.col, 1.0); +# } +SHADER fragment variant_fragment_shader SPIRV-ASM +; SPIR-V +; Version: 1.0 +; Generator: Khronos Glslang Reference Front End; 7 +; Bound: 75 +; Schema: 0 + OpCapability Shader + %1 = OpExtInstImport "GLSL.std.450" + OpMemoryModel Logical GLSL450 + OpEntryPoint Fragment %4 "main" %58 + OpExecutionMode %4 OriginUpperLeft + OpSource ESSL 310 + OpName %4 "main" + OpName %18 "buf0" + OpMemberName %18 0 "injectionSwitch" + OpName %20 "" + OpName %31 "StructType" + OpMemberName %31 0 "col" + OpMemberName %31 1 "bbbb" + OpName %58 "_GLF_color" + OpMemberDecorate %18 0 Offset 0 + OpDecorate %18 Block + OpDecorate %20 DescriptorSet 0 + OpDecorate %20 Binding 0 + OpDecorate %41 RelaxedPrecision + OpDecorate %55 RelaxedPrecision + OpDecorate %58 Location 0 + OpDecorate %70 RelaxedPrecision + OpDecorate %71 RelaxedPrecision + %2 = OpTypeVoid + %3 = OpTypeFunction %2 + %6 = OpTypeInt 32 1 + %9 = OpConstant %6 0 + %16 = OpTypeFloat 32 + %17 = OpTypeVector %16 2 + %18 = OpTypeStruct %17 + %19 = OpTypePointer Uniform %18 + %20 = OpVariable %19 Uniform + %21 = OpTypeInt 32 0 + %22 = OpConstant %21 1 + %23 = OpTypePointer Uniform %16 + %27 = OpTypeBool + %29 = OpTypeVector %16 3 + %30 = OpTypeVector %27 4 + %31 = OpTypeStruct %29 %30 + %34 = OpConstant %16 1 + %35 = OpConstant %16 0 + %36 = OpConstantComposite %29 %34 %35 %35 + %40 = OpConstant %6 1 + %56 = OpTypeVector %16 4 + %57 = OpTypePointer Output %56 + %58 = OpVariable %57 Output + %74 = OpUndef %31 + %4 = OpFunction %2 None %3 + %5 = OpLabel + OpBranch %10 + %10 = OpLabel + %73 = OpPhi %31 %74 %5 %66 %11 + %70 = OpPhi %6 %9 %5 %41 %11 + %24 = OpAccessChain %23 %20 %9 %22 + %25 = OpLoad %16 %24 + %26 = OpConvertFToS %6 %25 + %28 = OpSLessThan %27 %70 %26 + OpLoopMerge %12 %11 None + OpBranchConditional %28 %11 %12 + %11 = OpLabel + %66 = OpCompositeInsert %31 %36 %73 0 + %41 = OpIAdd %6 %70 %40 + OpBranch %10 + %12 = OpLabel + OpBranch %43 + %43 = OpLabel + %72 = OpPhi %31 %73 %12 %68 %44 + %71 = OpPhi %6 %9 %12 %55 %44 + %52 = OpSLessThan %27 %71 %26 + OpLoopMerge %45 %44 None + OpBranchConditional %52 %44 %45 + %44 = OpLabel + %68 = OpCompositeInsert %31 %36 %72 0 + %55 = OpIAdd %6 %71 %40 + OpBranch %43 + %45 = OpLabel + %60 = OpCompositeExtract %29 %72 0 + %61 = OpCompositeExtract %16 %60 0 + %62 = OpCompositeExtract %16 %60 1 + %63 = OpCompositeExtract %16 %60 2 + %64 = OpCompositeConstruct %56 %61 %62 %63 %34 + OpStore %58 %64 + OpReturn + OpFunctionEnd +END + +# uniforms for variant + +# injectionSwitch +BUFFER variant_injectionSwitch DATA_TYPE vec2 DATA + 0.0 1.0 +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_injectionSwitch 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/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp b/external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp index 14429af..504eece 100644 --- a/external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp +++ b/external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp @@ -67,6 +67,7 @@ void createAmberTests (tcu::TestCaseGroup* group) { "return-in-loop-in-function.amber", "return-in-loop-in-function", "A fragment shader with early return from loop in function" }, { "struct-used-as-temporary.amber", "struct-used-as-temporary", "A fragment shader that uses a temporary struct variable" }, { "swizzle-struct-init-min.amber", "swizzle-struct-init-min", "A fragment shader that uses vector swizzles, struct initializers, and min" }, + { "two-loops-set-struct.amber", "two-loops-set-struct", "A fragment shader with two loops that write to a struct" }, { "unreachable-barrier-in-loops.amber", "unreachable-barrier-in-loops", "A compute shader with an unreachable barrier in a loop nest" }, { "unreachable-loops.amber", "unreachable-loops", "Fragment shader that writes red despite unreachable loops" }, { "unreachable-loops-in-switch.amber", "unreachable-loops-in-switch", "A fragment shader with unreachable loops in a switch" }, diff --git a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt index 68505ae..2f4178c 100644 --- a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt +++ b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt @@ -485178,6 +485178,7 @@ dEQP-VK.graphicsfuzz.pow-vec4 dEQP-VK.graphicsfuzz.return-in-loop-in-function dEQP-VK.graphicsfuzz.struct-used-as-temporary dEQP-VK.graphicsfuzz.swizzle-struct-init-min +dEQP-VK.graphicsfuzz.two-loops-set-struct dEQP-VK.graphicsfuzz.unreachable-barrier-in-loops dEQP-VK.graphicsfuzz.unreachable-loops dEQP-VK.graphicsfuzz.unreachable-loops-in-switch diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt index 6b8b4ec..28bd029 100644 --- a/external/vulkancts/mustpass/master/vk-default.txt +++ b/external/vulkancts/mustpass/master/vk-default.txt @@ -485025,6 +485025,7 @@ dEQP-VK.graphicsfuzz.pow-vec4 dEQP-VK.graphicsfuzz.return-in-loop-in-function dEQP-VK.graphicsfuzz.struct-used-as-temporary dEQP-VK.graphicsfuzz.swizzle-struct-init-min +dEQP-VK.graphicsfuzz.two-loops-set-struct dEQP-VK.graphicsfuzz.unreachable-barrier-in-loops dEQP-VK.graphicsfuzz.unreachable-loops dEQP-VK.graphicsfuzz.unreachable-loops-in-switch