dEQP-VK.graphicsfuzz.two-nested-for-loops-with-returns

Components: Vulkan

New Tests:

dEQP-VK.graphicsfuzz.two-nested-for-loops-with-returns

Change-Id: I862653671a578c4910b691c0c7e78d9c373871de

diff --git a/android/cts/master/vk-master.txt b/android/cts/master/vk-master.txt
index 52c1963..bce5688 100644 (file)
--- a/android/cts/master/vk-master.txt
+++ b/android/cts/master/vk-master.txt
@@ -520923,6 +520923,7 @@ dEQP-VK.graphicsfuzz.two-loops-matrix
 dEQP-VK.graphicsfuzz.two-loops-set-struct
 dEQP-VK.graphicsfuzz.two-loops-with-break
 dEQP-VK.graphicsfuzz.two-nested-do-whiles
+dEQP-VK.graphicsfuzz.two-nested-for-loops-with-returns
 dEQP-VK.graphicsfuzz.two-nested-infinite-loops-discard
 dEQP-VK.graphicsfuzz.uninitialized-var-decrement-and-add
 dEQP-VK.graphicsfuzz.unreachable-barrier-in-loops

diff --git a/external/vulkancts/data/vulkan/amber/graphicsfuzz/two-nested-for-loops-with-returns.amber b/external/vulkancts/data/vulkan/amber/graphicsfuzz/two-nested-for-loops-with-returns.amber
new file mode 100644 (file)
index 0000000..61b573b
--- /dev/null
+++ b/external/vulkancts/data/vulkan/amber/graphicsfuzz/two-nested-for-loops-with-returns.amber
@@ -0,0 +1,211 @@
+#!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 compute shader with two nested for loops
+
+# The test passes because main always outputs 42.0.
+
+# Optimized using spirv-opt with the following arguments:
+# '--private-to-local'
+# '--eliminate-local-multi-store'
+# '--simplify-instructions'
+# '--eliminate-dead-inserts'
+# '--eliminate-dead-branches'
+# spirv-opt commit hash: 4a00a80c40484a6f6f72f48c9d34943cf8f180d4
+
+
+
+# variant_compute_shader is derived from the following GLSL:
+# #version 310 es
+#
+# precision highp float;
+#
+# layout(std430, binding = 0) buffer doesNotMatter
+# {
+#     float _compute_data[];
+# };
+#
+# float nb_mod()
+# {
+#     float s = 0.0;
+#
+#     // Loop is entered, but we always return 42.0 during the first iteration.
+#     for (
+#         int i = 5;
+#         i < 800;
+#         i++)
+#     {
+#         int GLF_live1_looplimiter2;
+#
+#         // Loop is entered and we possibly return.
+#         for (
+#             int GLF_live1i = 0;
+#             GLF_live1i < 20;
+#             ++GLF_live1i)
+#         {
+#             // GLF_live1_looplimiter2 is undefined, so we may break; doesn't matter.
+#             if (GLF_live1_looplimiter2 >= 5)
+#             {
+#                 ++s;
+#                 break;
+#             }
+#             // If we didn't break, we return 42.0 here.
+#             return 42.0;
+#         }
+#
+#         if (float(i) <= s) // Always false: s is 0.0 or 1.0.
+#         {
+#             break;
+#         }
+#         // We return 42.0 and we don't loop.
+#         return 42.0;
+#     }
+#     // Unreachable at runtime.
+#     return s;
+# }
+#
+# void main()
+# {
+#     _compute_data[0] = nb_mod(); // Always returns 42.0.
+# }
+SHADER compute variant_compute_shader SPIRV-ASM
+; SPIR-V
+; Version: 1.0
+; Generator: Khronos Glslang Reference Front End; 7
+; Bound: 82
+; Schema: 0
+               OpCapability Shader
+          %1 = OpExtInstImport "GLSL.std.450"
+               OpMemoryModel Logical GLSL450
+               OpEntryPoint GLCompute %4 "main"
+               OpExecutionMode %4 LocalSize 1 1 1
+               OpSource ESSL 310
+               OpName %4 "main"
+               OpName %8 "nb_mod("
+               OpName %11 "s"
+               OpName %15 "i"
+               OpName %26 "GLF_live1i"
+               OpName %36 "GLF_live1_looplimiter2"
+               OpName %64 "doesNotMatter"
+               OpMemberName %64 0 "_compute_data"
+               OpName %66 ""
+               OpDecorate %63 ArrayStride 4
+               OpMemberDecorate %64 0 Offset 0
+               OpDecorate %64 BufferBlock
+               OpDecorate %66 DescriptorSet 0
+               OpDecorate %66 Binding 0
+          %2 = OpTypeVoid
+          %3 = OpTypeFunction %2
+          %6 = OpTypeFloat 32
+          %7 = OpTypeFunction %6
+         %10 = OpTypePointer Function %6
+         %12 = OpConstant %6 0
+         %13 = OpTypeInt 32 1
+         %14 = OpTypePointer Function %13
+         %16 = OpConstant %13 5
+         %23 = OpConstant %13 800
+         %24 = OpTypeBool
+         %27 = OpConstant %13 0
+         %34 = OpConstant %13 20
+         %42 = OpConstant %6 1
+         %45 = OpConstant %6 42
+         %48 = OpConstant %13 1
+         %63 = OpTypeRuntimeArray %6
+         %64 = OpTypeStruct %63
+         %65 = OpTypePointer Uniform %64
+         %66 = OpVariable %65 Uniform
+         %68 = OpTypePointer Uniform %6
+         %74 = OpUndef %13
+         %81 = OpUndef %6
+          %4 = OpFunction %2 None %3
+          %5 = OpLabel
+         %67 = OpFunctionCall %6 %8
+         %69 = OpAccessChain %68 %66 %27 %27
+               OpStore %69 %67
+               OpReturn
+               OpFunctionEnd
+          %8 = OpFunction %6 None %7
+          %9 = OpLabel
+         %11 = OpVariable %10 Function
+         %15 = OpVariable %14 Function
+         %26 = OpVariable %14 Function
+         %36 = OpVariable %14 Function
+               OpStore %11 %12
+               OpStore %15 %16
+               OpBranch %17
+         %17 = OpLabel
+               OpLoopMerge %19 %20 None
+               OpBranch %21
+         %21 = OpLabel
+         %25 = OpSLessThan %24 %16 %23
+               OpBranchConditional %25 %18 %19
+         %18 = OpLabel
+               OpStore %26 %27
+               OpBranch %28
+         %28 = OpLabel
+               OpLoopMerge %30 %31 None
+               OpBranch %32
+         %32 = OpLabel
+         %35 = OpSLessThan %24 %27 %34
+               OpBranchConditional %35 %29 %30
+         %29 = OpLabel
+         %38 = OpSGreaterThanEqual %24 %74 %16
+               OpSelectionMerge %40 None
+               OpBranchConditional %38 %39 %40
+         %39 = OpLabel
+         %43 = OpFAdd %6 %12 %42
+               OpStore %11 %43
+               OpBranch %30
+         %40 = OpLabel
+               OpReturnValue %45
+         %31 = OpLabel
+               OpBranch %28
+         %30 = OpLabel
+         %79 = OpPhi %6 %12 %32 %43 %39
+         %51 = OpConvertSToF %6 %16
+         %53 = OpFOrdLessThanEqual %24 %51 %79
+               OpSelectionMerge %55 None
+               OpBranchConditional %53 %54 %55
+         %54 = OpLabel
+               OpBranch %19
+         %55 = OpLabel
+               OpReturnValue %45
+         %20 = OpLabel
+               OpBranch %17
+         %19 = OpLabel
+         %80 = OpPhi %6 %12 %21 %79 %54
+               OpReturnValue %80
+               OpFunctionEnd
+END
+
+# uniforms for variant
+
+
+BUFFER variant_ssbo DATA_TYPE float DATA
+ 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0 0.0
+END
+
+PIPELINE compute variant_pipeline
+  ATTACH variant_compute_shader
+  BIND BUFFER variant_ssbo AS storage DESCRIPTOR_SET 0 BINDING 0
+END
+
+RUN variant_pipeline 7 3 4
+
+EXPECT variant_ssbo IDX 0 EQ 42.0

diff --git a/external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp b/external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp
index e318b3e..c3e6bb3 100644 (file)
--- a/external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp
+++ b/external/vulkancts/modules/vulkan/amber/vktAmberGraphicsFuzzTests.cpp
@@ -95,6 +95,7 @@ void createAmberTests (tcu::TestCaseGroup* group)
                {       "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"                                                                                  },
                {       "two-nested-do-whiles.amber",                                   "two-nested-do-whiles",                                 "A fragment shader with nested do while"                                                                                                },
+               {       "two-nested-for-loops-with-returns.amber",              "two-nested-for-loops-with-returns",    "A compute shader with two nested for loops"                                                                                    },
                {       "two-nested-infinite-loops-discard.amber",              "two-nested-infinite-loops-discard",    "A fragment shader with an always false if function"                                                                    },
                {       "uninitialized-var-decrement-and-add.amber",    "uninitialized-var-decrement-and-add",  "A fragment shader that uses an uninitialized variable"                                                                 },
                {       "unreachable-barrier-in-loops.amber",                   "unreachable-barrier-in-loops",                 "A compute shader with an unreachable barrier in a loop nest"                                                   },

diff --git a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
index 8235631..eee3263 100644 (file)
--- a/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
+++ b/external/vulkancts/mustpass/master/vk-default-no-waivers.txt
@@ -523266,6 +523266,7 @@ dEQP-VK.graphicsfuzz.two-loops-matrix
 dEQP-VK.graphicsfuzz.two-loops-set-struct
 dEQP-VK.graphicsfuzz.two-loops-with-break
 dEQP-VK.graphicsfuzz.two-nested-do-whiles
+dEQP-VK.graphicsfuzz.two-nested-for-loops-with-returns
 dEQP-VK.graphicsfuzz.two-nested-infinite-loops-discard
 dEQP-VK.graphicsfuzz.uninitialized-var-decrement-and-add
 dEQP-VK.graphicsfuzz.unreachable-barrier-in-loops

diff --git a/external/vulkancts/mustpass/master/vk-default.txt b/external/vulkancts/mustpass/master/vk-default.txt
index 58e5d7f..1084f38 100644 (file)
--- a/external/vulkancts/mustpass/master/vk-default.txt
+++ b/external/vulkancts/mustpass/master/vk-default.txt
@@ -523113,6 +523113,7 @@ dEQP-VK.graphicsfuzz.two-loops-matrix
 dEQP-VK.graphicsfuzz.two-loops-set-struct
 dEQP-VK.graphicsfuzz.two-loops-with-break
 dEQP-VK.graphicsfuzz.two-nested-do-whiles
+dEQP-VK.graphicsfuzz.two-nested-for-loops-with-returns
 dEQP-VK.graphicsfuzz.two-nested-infinite-loops-discard
 dEQP-VK.graphicsfuzz.uninitialized-var-decrement-and-add
 dEQP-VK.graphicsfuzz.unreachable-barrier-in-loops