dEQP-VK.graphicsfuzz.function-with-uniform-return
authorVenni Ihanakangas <venni.ihanakangas@siru.fi>
Mon, 13 Jan 2020 13:42:41 +0000 (15:42 +0200)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Fri, 14 Feb 2020 11:28:17 +0000 (06:28 -0500)
Components: Vulkan

New Tests:

dEQP-VK.graphicsfuzz.function-with-uniform-return

Change-Id: I059acea3f141791a856fd499d5b8e2a4f102c309

android/cts/master/vk-master.txt
external/vulkancts/data/vulkan/amber/graphicsfuzz/function-with-uniform-return.amber [new file with mode: 0644]
external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt

index be52b23..154d763 100644 (file)
@@ -578211,6 +578211,7 @@ dEQP-VK.graphicsfuzz.for-loop-with-return
 dEQP-VK.graphicsfuzz.for-with-ifs-and-return
 dEQP-VK.graphicsfuzz.fragcoord-control-flow
 dEQP-VK.graphicsfuzz.fragcoord-control-flow-2
+dEQP-VK.graphicsfuzz.function-with-uniform-return
 dEQP-VK.graphicsfuzz.global-array-loops
 dEQP-VK.graphicsfuzz.if-and-switch
 dEQP-VK.graphicsfuzz.injection-switch-as-comparison
diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/function-with-uniform-return.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/function-with-uniform-return.amber
new file mode 100644 (file)
index 0000000..f153253
--- /dev/null
@@ -0,0 +1,199 @@
+#!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 uniform value as a return
+
+# The test passes because shader always writes color 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(location = 0) out vec4 _GLF_color;
+#
+# layout(set = 0, binding = 0) uniform buf0
+# {
+#   vec2 injectionSwitch;
+# };
+#
+# float fx(){
+#   if (gl_FragCoord.y >= 0.0)
+#     return injectionSwitch.y;
+#
+#   while(true){
+#     _GLF_color = vec4(1.0, 1.0, 1.0, 1.0);
+#   };
+# }
+#
+# void main()
+# {
+#   float x2 = 1.0;
+#   float B = 1.0;
+#
+#   _GLF_color = vec4(fx(), 0.0, 0.0, 1.0);
+#
+#   while (x2 > 2.0){
+#     float k0;
+#     k0 = fx() - fx();
+#     B = k0;
+#     x2 = B;
+#   }
+# }
+SHADER fragment variant_fragment_shader SPIRV-ASM
+; SPIR-V
+; Version: 1.0
+; Generator: Khronos Glslang Reference Front End; 8
+; Bound: 63
+; Schema: 0
+               OpCapability Shader
+          %1 = OpExtInstImport "GLSL.std.450"
+               OpMemoryModel Logical GLSL450
+               OpEntryPoint Fragment %4 "main" %12 %40
+               OpExecutionMode %4 OriginUpperLeft
+               OpSource ESSL 310
+               OpName %4 "main"
+               OpName %8 "fx("
+               OpName %12 "gl_FragCoord"
+               OpName %24 "buf0"
+               OpMemberName %24 0 "injectionSwitch"
+               OpName %26 ""
+               OpName %40 "_GLF_color"
+               OpName %45 "x2"
+               OpName %46 "B"
+               OpName %57 "k0"
+               OpDecorate %12 BuiltIn FragCoord
+               OpMemberDecorate %24 0 Offset 0
+               OpDecorate %24 Block
+               OpDecorate %26 DescriptorSet 0
+               OpDecorate %26 Binding 0
+               OpDecorate %40 Location 0
+          %2 = OpTypeVoid
+          %3 = OpTypeFunction %2
+          %6 = OpTypeFloat 32
+          %7 = OpTypeFunction %6
+         %10 = OpTypeVector %6 4
+         %11 = OpTypePointer Input %10
+         %12 = OpVariable %11 Input
+         %13 = OpTypeInt 32 0
+         %14 = OpConstant %13 1
+         %15 = OpTypePointer Input %6
+         %18 = OpConstant %6 0
+         %19 = OpTypeBool
+         %23 = OpTypeVector %6 2
+         %24 = OpTypeStruct %23
+         %25 = OpTypePointer Uniform %24
+         %26 = OpVariable %25 Uniform
+         %27 = OpTypeInt 32 1
+         %28 = OpConstant %27 0
+         %29 = OpTypePointer Uniform %6
+         %38 = OpConstantTrue %19
+         %39 = OpTypePointer Output %10
+         %40 = OpVariable %39 Output
+         %41 = OpConstant %6 1
+         %42 = OpConstantComposite %10 %41 %41 %41 %41
+         %44 = OpTypePointer Function %6
+         %55 = OpConstant %6 2
+          %4 = OpFunction %2 None %3
+          %5 = OpLabel
+         %45 = OpVariable %44 Function
+         %46 = OpVariable %44 Function
+         %57 = OpVariable %44 Function
+               OpStore %45 %41
+               OpStore %46 %41
+         %47 = OpFunctionCall %6 %8
+         %48 = OpCompositeConstruct %10 %47 %18 %18 %41
+               OpStore %40 %48
+               OpBranch %49
+         %49 = OpLabel
+               OpLoopMerge %51 %52 None
+               OpBranch %53
+         %53 = OpLabel
+         %54 = OpLoad %6 %45
+         %56 = OpFOrdGreaterThan %19 %54 %55
+               OpBranchConditional %56 %50 %51
+         %50 = OpLabel
+         %58 = OpFunctionCall %6 %8
+         %59 = OpFunctionCall %6 %8
+         %60 = OpFSub %6 %58 %59
+               OpStore %57 %60
+         %61 = OpLoad %6 %57
+               OpStore %46 %61
+         %62 = OpLoad %6 %46
+               OpStore %45 %62
+               OpBranch %52
+         %52 = OpLabel
+               OpBranch %49
+         %51 = OpLabel
+               OpReturn
+               OpFunctionEnd
+          %8 = OpFunction %6 None %7
+          %9 = OpLabel
+         %16 = OpAccessChain %15 %12 %14
+         %17 = OpLoad %6 %16
+         %20 = OpFOrdGreaterThanEqual %19 %17 %18
+               OpSelectionMerge %22 None
+               OpBranchConditional %20 %21 %22
+         %21 = OpLabel
+         %30 = OpAccessChain %29 %26 %28 %14
+         %31 = OpLoad %6 %30
+               OpReturnValue %31
+         %22 = OpLabel
+               OpBranch %33
+         %33 = OpLabel
+               OpLoopMerge %35 %36 None
+               OpBranch %37
+         %37 = OpLabel
+               OpBranchConditional %38 %34 %35
+         %34 = OpLabel
+               OpStore %40 %42
+               OpBranch %36
+         %36 = OpLabel
+               OpBranch %33
+         %35 = OpLabel
+         %43 = OpUndef %6
+               OpReturnValue %43
+               OpFunctionEnd
+END
+
+# uniforms for variant
+
+# injectionSwitch
+BUFFER variant_injectionSwitch DATA_TYPE vec2<float> 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
index 835e948..43d4eac 100644 (file)
@@ -52,6 +52,7 @@
 {      "for-with-ifs-and-return.amber",                                "for-with-ifs-and-return",                              "A fragment shader with two ifs and return/continue inside a for loop"                                  },
 {      "fragcoord-control-flow.amber",                                 "fragcoord-control-flow",                               "A fragment shader that uses FragCoord and somewhat complex control flow"                               },
 {      "fragcoord-control-flow-2.amber",                               "fragcoord-control-flow-2",                             "A fragment shader that uses FragCoord and somewhat complex control flow"                               },
+{      "function-with-uniform-return.amber",                   "function-with-uniform-return",                 "A fragment shader with uniform value as a return"                                                                              },
 {      "global-array-loops.amber",                                             "global-array-loops",                                   "A loop that writes then reads a global array"                                                                                  },
 {      "if-and-switch.amber",                                                  "if-and-switch",                                                "A fragment shader with a switch and some data flow"                                                                    },
 {      "injection-switch-as-comparison.amber",                 "injection-switch-as-comparison",               "A fragment shader with uniform comparison in loop"                                                                             },
index 615b94b..74b5f94 100644 (file)
@@ -580464,6 +580464,7 @@ dEQP-VK.graphicsfuzz.for-loop-with-return
 dEQP-VK.graphicsfuzz.for-with-ifs-and-return
 dEQP-VK.graphicsfuzz.fragcoord-control-flow
 dEQP-VK.graphicsfuzz.fragcoord-control-flow-2
+dEQP-VK.graphicsfuzz.function-with-uniform-return
 dEQP-VK.graphicsfuzz.global-array-loops
 dEQP-VK.graphicsfuzz.if-and-switch
 dEQP-VK.graphicsfuzz.injection-switch-as-comparison
index 8aa11b4..93734e6 100644 (file)
@@ -580311,6 +580311,7 @@ dEQP-VK.graphicsfuzz.for-loop-with-return
 dEQP-VK.graphicsfuzz.for-with-ifs-and-return
 dEQP-VK.graphicsfuzz.fragcoord-control-flow
 dEQP-VK.graphicsfuzz.fragcoord-control-flow-2
+dEQP-VK.graphicsfuzz.function-with-uniform-return
 dEQP-VK.graphicsfuzz.global-array-loops
 dEQP-VK.graphicsfuzz.if-and-switch
 dEQP-VK.graphicsfuzz.injection-switch-as-comparison