dEQP-VK.graphicsfuzz.two-loops-mat-add
authorPaul Thomson <paulthomson@google.com>
Tue, 14 Jan 2020 16:50:51 +0000 (16:50 +0000)
committerAlexander Galazin <Alexander.Galazin@arm.com>
Fri, 3 Apr 2020 10:58:17 +0000 (06:58 -0400)
Components: Vulkan

New Tests:

dEQP-VK.graphicsfuzz.two-loops-mat-add

Change-Id: I1b4e62970655366801e0c5b37693d60fe6d45260

android/cts/master/vk-master-2020-03-01.txt
android/cts/master/vk-master.txt
external/vulkancts/data/vulkan/amber/graphicsfuzz/index.txt
external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-mat-add.amber [new file with mode: 0644]
external/vulkancts/mustpass/master/vk-default-no-waivers.txt
external/vulkancts/mustpass/master/vk-default.txt

index f6b5268..f43e89c 100644 (file)
@@ -187766,6 +187766,7 @@ dEQP-VK.graphicsfuzz.swizzle-struct-init-min
 dEQP-VK.graphicsfuzz.transpose-rectangular-matrix
 dEQP-VK.graphicsfuzz.two-2-iteration-loops
 dEQP-VK.graphicsfuzz.two-for-loops-with-barrier-function
+dEQP-VK.graphicsfuzz.two-loops-mat-add
 dEQP-VK.graphicsfuzz.two-loops-matrix
 dEQP-VK.graphicsfuzz.two-loops-set-struct
 dEQP-VK.graphicsfuzz.two-loops-with-break
index 422b6f3..8db94f9 100644 (file)
@@ -584180,6 +584180,7 @@ dEQP-VK.graphicsfuzz.swizzle-struct-init-min
 dEQP-VK.graphicsfuzz.transpose-rectangular-matrix
 dEQP-VK.graphicsfuzz.two-2-iteration-loops
 dEQP-VK.graphicsfuzz.two-for-loops-with-barrier-function
+dEQP-VK.graphicsfuzz.two-loops-mat-add
 dEQP-VK.graphicsfuzz.two-loops-matrix
 dEQP-VK.graphicsfuzz.two-loops-set-struct
 dEQP-VK.graphicsfuzz.two-loops-with-break
index f7d0832..8f809e6 100644 (file)
 {      "transpose-rectangular-matrix.amber",                   "transpose-rectangular-matrix",                 "Fragment shader that uses 'transpose'"                                                                                                 },
 {      "two-2-iteration-loops.amber",                                  "two-2-iteration-loops",                                "Fragment shader with pair of outer loops"                                                                                              },
 {      "two-for-loops-with-barrier-function.amber",    "two-for-loops-with-barrier-function",  "A compute shader with two barrier functions"                                                                                   },
+{      "two-loops-mat-add.amber",                                              "two-loops-mat-add",                                    "A fragment shader with two for loops over a global matrix"                                                             },
 {      "two-loops-matrix.amber",                                               "two-loops-matrix",                                             "A fragment shader with two loops and some matrices"                                                                    },
 {      "two-loops-set-struct.amber",                                   "two-loops-set-struct",                                 "A fragment shader with two loops that write to a struct"                                                               },
 {      "two-loops-with-break.amber",                                   "two-loops-with-break",                                 "A fragment shader with two loops with breaks"                                                                                  },
diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-mat-add.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/two-loops-mat-add.amber
new file mode 100644 (file)
index 0000000..97860be
--- /dev/null
@@ -0,0 +1,273 @@
+#!amber
+
+# Copyright 2020 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 for loops over a global matrix
+
+# The test passes because the shader always writes red.
+
+# Optimized using spirv-opt with the following arguments:
+# '--eliminate-dead-code-aggressive'
+# '--vector-dce'
+# '--ccp'
+# '--ccp'
+# '--eliminate-dead-code-aggressive'
+# '--eliminate-local-multi-store'
+# '--eliminate-dead-branches'
+# '--inline-entry-points-exhaustive'
+# '--copy-propagate-arrays'
+# '--eliminate-local-single-store'
+# '--eliminate-local-multi-store'
+# '--convert-local-access-chains'
+# '--inline-entry-points-exhaustive'
+# '--convert-local-access-chains'
+# '--ccp'
+# '--redundancy-elimination'
+# spirv-opt commit hash: 18b3b94567a9251a6f8491a6d07c4422abadd22c
+
+
+
+SHADER vertex variant_vertex_shader PASSTHROUGH
+
+# variant_fragment_shader is derived from the following GLSL:
+# #version 310 es
+# precision highp float;
+#
+# layout(set = 0, binding = 0) uniform buf0 {
+#   vec2 injectionSwitch;
+# };
+#
+# layout(location = 0) out vec4 _GLF_color;
+#
+# mat4 m44;
+#
+# void main()
+# {
+#     // Always true.
+#     if (injectionSwitch.x < 1.0) {
+#         m44 = mat4(
+#             1.0,  2.0,  3.0,  4.0,
+#             5.0,  6.0,  7.0,  8.0,
+#             9.0,  10.0, 11.0, 12.0,
+#             13.0, 14.0, 15.0, 16.0
+#         );
+#     }
+#
+#     float s = 0.0;
+#     int c = 0;
+#     for (
+#         int i = 0;
+#         i < 4;
+#         i++)
+#     {
+#         s += m44[c][i];
+#     }
+#
+#     // 0 iteration loop.
+#     for (
+#         int i = 4;
+#         i < 4;
+#         i++)
+#     {
+#         s += m44[c][i];
+#     }
+#
+#     // Always true (1+2+3+4==10).
+#     if (s == 10.0)
+#         _GLF_color = vec4(1.0, 0.0, 0.0, 1.0);
+#     else
+#         _GLF_color = vec4(0.0, 0.0, 0.0, 1.0);
+# }
+SHADER fragment variant_fragment_shader SPIRV-ASM
+; SPIR-V
+; Version: 1.0
+; Generator: Khronos Glslang Reference Front End; 8
+; Bound: 104
+; Schema: 0
+               OpCapability Shader
+          %1 = OpExtInstImport "GLSL.std.450"
+               OpMemoryModel Logical GLSL450
+               OpEntryPoint Fragment %4 "main" %92
+               OpExecutionMode %4 OriginUpperLeft
+               OpSource ESSL 310
+               OpName %4 "main"
+               OpName %8 "buf0"
+               OpMemberName %8 0 "injectionSwitch"
+               OpName %10 ""
+               OpName %26 "m44"
+               OpName %48 "s"
+               OpName %51 "c"
+               OpName %52 "i"
+               OpName %71 "i"
+               OpName %92 "_GLF_color"
+               OpMemberDecorate %8 0 Offset 0
+               OpDecorate %8 Block
+               OpDecorate %10 DescriptorSet 0
+               OpDecorate %10 Binding 0
+               OpDecorate %51 RelaxedPrecision
+               OpDecorate %52 RelaxedPrecision
+               OpDecorate %70 RelaxedPrecision
+               OpDecorate %71 RelaxedPrecision
+               OpDecorate %86 RelaxedPrecision
+               OpDecorate %92 Location 0
+               OpDecorate %96 RelaxedPrecision
+          %2 = OpTypeVoid
+          %3 = OpTypeFunction %2
+          %6 = OpTypeFloat 32
+          %7 = OpTypeVector %6 2
+          %8 = OpTypeStruct %7
+          %9 = OpTypePointer Uniform %8
+         %10 = OpVariable %9 Uniform
+         %11 = OpTypeInt 32 1
+         %12 = OpConstant %11 0
+         %13 = OpTypeInt 32 0
+         %14 = OpConstant %13 0
+         %15 = OpTypePointer Uniform %6
+         %18 = OpConstant %6 1
+         %19 = OpTypeBool
+         %23 = OpTypeVector %6 4
+         %24 = OpTypeMatrix %23 4
+         %25 = OpTypePointer Private %24
+         %26 = OpVariable %25 Private
+         %27 = OpConstant %6 2
+         %28 = OpConstant %6 3
+         %29 = OpConstant %6 4
+         %30 = OpConstantComposite %23 %18 %27 %28 %29
+         %31 = OpConstant %6 5
+         %32 = OpConstant %6 6
+         %33 = OpConstant %6 7
+         %34 = OpConstant %6 8
+         %35 = OpConstantComposite %23 %31 %32 %33 %34
+         %36 = OpConstant %6 9
+         %37 = OpConstant %6 10
+         %38 = OpConstant %6 11
+         %39 = OpConstant %6 12
+         %40 = OpConstantComposite %23 %36 %37 %38 %39
+         %41 = OpConstant %6 13
+         %42 = OpConstant %6 14
+         %43 = OpConstant %6 15
+         %44 = OpConstant %6 16
+         %45 = OpConstantComposite %23 %41 %42 %43 %44
+         %46 = OpConstantComposite %24 %30 %35 %40 %45
+         %47 = OpTypePointer Function %6
+         %49 = OpConstant %6 0
+         %50 = OpTypePointer Function %11
+         %59 = OpConstant %11 4
+         %63 = OpTypePointer Private %6
+         %69 = OpConstant %11 1
+         %91 = OpTypePointer Output %23
+         %92 = OpVariable %91 Output
+         %93 = OpConstantComposite %23 %18 %49 %49 %18
+         %95 = OpConstantComposite %23 %49 %49 %49 %18
+        %102 = OpConstantTrue %19
+        %103 = OpConstantFalse %19
+          %4 = OpFunction %2 None %3
+          %5 = OpLabel
+         %48 = OpVariable %47 Function
+         %51 = OpVariable %50 Function
+         %52 = OpVariable %50 Function
+         %71 = OpVariable %50 Function
+         %16 = OpAccessChain %15 %10 %12 %14
+         %17 = OpLoad %6 %16
+         %20 = OpFOrdLessThan %19 %17 %18
+               OpSelectionMerge %22 None
+               OpBranchConditional %20 %21 %22
+         %21 = OpLabel
+               OpStore %26 %46
+               OpBranch %22
+         %22 = OpLabel
+               OpStore %48 %49
+               OpStore %51 %12
+               OpStore %52 %12
+               OpBranch %53
+         %53 = OpLabel
+         %99 = OpPhi %6 %49 %22 %67 %56
+         %96 = OpPhi %11 %12 %22 %70 %56
+               OpLoopMerge %55 %56 None
+               OpBranch %57
+         %57 = OpLabel
+         %60 = OpSLessThan %19 %96 %59
+               OpBranchConditional %60 %54 %55
+         %54 = OpLabel
+         %64 = OpAccessChain %63 %26 %12 %96
+         %65 = OpLoad %6 %64
+         %67 = OpFAdd %6 %99 %65
+               OpStore %48 %67
+               OpBranch %56
+         %56 = OpLabel
+         %70 = OpIAdd %11 %96 %69
+               OpStore %52 %70
+               OpBranch %53
+         %55 = OpLabel
+               OpStore %71 %59
+               OpBranch %72
+         %72 = OpLabel
+         %98 = OpPhi %6 %99 %55 %84 %75
+         %97 = OpPhi %11 %59 %55 %86 %75
+               OpLoopMerge %74 %75 None
+               OpBranch %76
+         %76 = OpLabel
+         %78 = OpSLessThan %19 %59 %59
+               OpBranchConditional %103 %73 %74
+         %73 = OpLabel
+         %81 = OpAccessChain %63 %26 %12 %59
+         %82 = OpLoad %6 %81
+         %84 = OpFAdd %6 %98 %82
+               OpStore %48 %84
+               OpBranch %75
+         %75 = OpLabel
+         %86 = OpIAdd %11 %59 %69
+               OpStore %71 %86
+               OpBranch %72
+         %74 = OpLabel
+         %88 = OpFOrdEqual %19 %98 %37
+               OpSelectionMerge %90 None
+               OpBranchConditional %88 %89 %94
+         %89 = OpLabel
+               OpStore %92 %93
+               OpBranch %90
+         %94 = OpLabel
+               OpStore %92 %95
+               OpBranch %90
+         %90 = OpLabel
+               OpReturn
+               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 ef01940..dd92f37 100644 (file)
@@ -586447,6 +586447,7 @@ dEQP-VK.graphicsfuzz.swizzle-struct-init-min
 dEQP-VK.graphicsfuzz.transpose-rectangular-matrix
 dEQP-VK.graphicsfuzz.two-2-iteration-loops
 dEQP-VK.graphicsfuzz.two-for-loops-with-barrier-function
+dEQP-VK.graphicsfuzz.two-loops-mat-add
 dEQP-VK.graphicsfuzz.two-loops-matrix
 dEQP-VK.graphicsfuzz.two-loops-set-struct
 dEQP-VK.graphicsfuzz.two-loops-with-break
index 6a07141..da81730 100644 (file)
@@ -586294,6 +586294,7 @@ dEQP-VK.graphicsfuzz.swizzle-struct-init-min
 dEQP-VK.graphicsfuzz.transpose-rectangular-matrix
 dEQP-VK.graphicsfuzz.two-2-iteration-loops
 dEQP-VK.graphicsfuzz.two-for-loops-with-barrier-function
+dEQP-VK.graphicsfuzz.two-loops-mat-add
 dEQP-VK.graphicsfuzz.two-loops-matrix
 dEQP-VK.graphicsfuzz.two-loops-set-struct
 dEQP-VK.graphicsfuzz.two-loops-with-break