mirror of
https://github.com/KhronosGroup/SPIRV-Tools
synced 2024-10-19 11:30:15 +00:00
12e4a7b649
* Check var pointer capability in ADCE. * Check var ptr capability for common uniform. * Check var ptr capability in access chain convert. Since we want this pass to run even if there are variable pointer on storage buffers, we had to remove asserts that assumed there were no variable pointers. The functions with the asserts will now work, it becomes the responsibility of the callers to deal with the output as appropriate. * Single block elimination and variable pointers. It seems like the code in local single block elimination is able to handle cases with variable pointers already. This is because the function `HasOnlySupportedRefs` ensures that variables that feed a variable pointer are not candidates. * Single store elimination and variable pointers. It seems like the code in local single stroe elimination is able to handle cases with variable pointers already. This is because the function `FindSingleStoreAndCheckUses` ensures that variables that feed a variable pointer are not candidates. * SSA rewriter and variable pointers. It seems like the code in the two passes that call the SSA rewriter are able to handle cases with variable pointers already. This is because the function `HasOnlySupportedRefs` ensures that variables that feed a variable pointer are not candidates. Fixes #2458.
913 lines
26 KiB
C++
913 lines
26 KiB
C++
// Copyright (c) 2017 Valve Corporation
|
|
// Copyright (c) 2017 LunarG Inc.
|
|
//
|
|
// 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.
|
|
|
|
#include <string>
|
|
|
|
#include "test/opt/pass_fixture.h"
|
|
#include "test/opt/pass_utils.h"
|
|
|
|
namespace spvtools {
|
|
namespace opt {
|
|
namespace {
|
|
|
|
using LocalSingleStoreElimTest = PassTest<::testing::Test>;
|
|
|
|
TEST_F(LocalSingleStoreElimTest, PositiveAndNegative) {
|
|
// Single store to v is optimized. Multiple store to
|
|
// f is not optimized.
|
|
//
|
|
// #version 140
|
|
//
|
|
// in vec4 BaseColor;
|
|
// in float fi;
|
|
//
|
|
// void main()
|
|
// {
|
|
// vec4 v = BaseColor;
|
|
// float f = fi;
|
|
// if (f < 0)
|
|
// f = 0.0;
|
|
// gl_FragColor = v + f;
|
|
// }
|
|
|
|
const std::string predefs =
|
|
R"(OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %main "main" %BaseColor %fi %gl_FragColor
|
|
OpExecutionMode %main OriginUpperLeft
|
|
OpSource GLSL 140
|
|
OpName %main "main"
|
|
OpName %v "v"
|
|
OpName %BaseColor "BaseColor"
|
|
OpName %f "f"
|
|
OpName %fi "fi"
|
|
OpName %gl_FragColor "gl_FragColor"
|
|
%void = OpTypeVoid
|
|
%9 = OpTypeFunction %void
|
|
%float = OpTypeFloat 32
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
%_ptr_Input_v4float = OpTypePointer Input %v4float
|
|
%BaseColor = OpVariable %_ptr_Input_v4float Input
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
%_ptr_Input_float = OpTypePointer Input %float
|
|
%fi = OpVariable %_ptr_Input_float Input
|
|
%float_0 = OpConstant %float 0
|
|
%bool = OpTypeBool
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%gl_FragColor = OpVariable %_ptr_Output_v4float Output
|
|
)";
|
|
|
|
const std::string before =
|
|
R"(%main = OpFunction %void None %9
|
|
%19 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%f = OpVariable %_ptr_Function_float Function
|
|
%20 = OpLoad %v4float %BaseColor
|
|
OpStore %v %20
|
|
%21 = OpLoad %float %fi
|
|
OpStore %f %21
|
|
%22 = OpLoad %float %f
|
|
%23 = OpFOrdLessThan %bool %22 %float_0
|
|
OpSelectionMerge %24 None
|
|
OpBranchConditional %23 %25 %24
|
|
%25 = OpLabel
|
|
OpStore %f %float_0
|
|
OpBranch %24
|
|
%24 = OpLabel
|
|
%26 = OpLoad %v4float %v
|
|
%27 = OpLoad %float %f
|
|
%28 = OpCompositeConstruct %v4float %27 %27 %27 %27
|
|
%29 = OpFAdd %v4float %26 %28
|
|
OpStore %gl_FragColor %29
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
const std::string after =
|
|
R"(%main = OpFunction %void None %9
|
|
%19 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%f = OpVariable %_ptr_Function_float Function
|
|
%20 = OpLoad %v4float %BaseColor
|
|
OpStore %v %20
|
|
%21 = OpLoad %float %fi
|
|
OpStore %f %21
|
|
%22 = OpLoad %float %f
|
|
%23 = OpFOrdLessThan %bool %22 %float_0
|
|
OpSelectionMerge %24 None
|
|
OpBranchConditional %23 %25 %24
|
|
%25 = OpLabel
|
|
OpStore %f %float_0
|
|
OpBranch %24
|
|
%24 = OpLabel
|
|
%27 = OpLoad %float %f
|
|
%28 = OpCompositeConstruct %v4float %27 %27 %27 %27
|
|
%29 = OpFAdd %v4float %20 %28
|
|
OpStore %gl_FragColor %29
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
SinglePassRunAndCheck<LocalSingleStoreElimPass>(predefs + before,
|
|
predefs + after, true, true);
|
|
}
|
|
|
|
TEST_F(LocalSingleStoreElimTest, ThreeStores) {
|
|
// Three stores to multiple loads of v is not optimized.
|
|
|
|
const std::string predefs =
|
|
R"(OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %main "main" %BaseColor %fi %gl_FragColor
|
|
OpExecutionMode %main OriginUpperLeft
|
|
OpSource GLSL 140
|
|
OpName %main "main"
|
|
OpName %v "v"
|
|
OpName %BaseColor "BaseColor"
|
|
OpName %fi "fi"
|
|
OpName %r "r"
|
|
OpName %gl_FragColor "gl_FragColor"
|
|
%void = OpTypeVoid
|
|
%9 = OpTypeFunction %void
|
|
%float = OpTypeFloat 32
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
%_ptr_Input_v4float = OpTypePointer Input %v4float
|
|
%BaseColor = OpVariable %_ptr_Input_v4float Input
|
|
%_ptr_Input_float = OpTypePointer Input %float
|
|
%fi = OpVariable %_ptr_Input_float Input
|
|
%float_0 = OpConstant %float 0
|
|
%bool = OpTypeBool
|
|
%float_1 = OpConstant %float 1
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%gl_FragColor = OpVariable %_ptr_Output_v4float Output
|
|
)";
|
|
|
|
const std::string before =
|
|
R"(%main = OpFunction %void None %9
|
|
%19 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%r = OpVariable %_ptr_Function_v4float Function
|
|
%20 = OpLoad %v4float %BaseColor
|
|
OpStore %v %20
|
|
%21 = OpLoad %float %fi
|
|
%22 = OpFOrdLessThan %bool %21 %float_0
|
|
OpSelectionMerge %23 None
|
|
OpBranchConditional %22 %24 %25
|
|
%24 = OpLabel
|
|
%26 = OpLoad %v4float %v
|
|
OpStore %v %26
|
|
OpStore %r %26
|
|
OpBranch %23
|
|
%25 = OpLabel
|
|
%27 = OpLoad %v4float %v
|
|
%28 = OpCompositeConstruct %v4float %float_1 %float_1 %float_1 %float_1
|
|
OpStore %v %28
|
|
%29 = OpFSub %v4float %28 %27
|
|
OpStore %r %29
|
|
OpBranch %23
|
|
%23 = OpLabel
|
|
%30 = OpLoad %v4float %r
|
|
OpStore %gl_FragColor %30
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
SinglePassRunAndCheck<LocalSingleStoreElimPass>(predefs + before,
|
|
predefs + before, true, true);
|
|
}
|
|
|
|
TEST_F(LocalSingleStoreElimTest, MultipleLoads) {
|
|
// Single store to multiple loads of v is optimized.
|
|
//
|
|
// #version 140
|
|
//
|
|
// in vec4 BaseColor;
|
|
// in float fi;
|
|
//
|
|
// void main()
|
|
// {
|
|
// vec4 v = BaseColor;
|
|
// float f = fi;
|
|
// if (f < 0)
|
|
// f = 0.0;
|
|
// gl_FragColor = v + f;
|
|
// }
|
|
|
|
const std::string predefs =
|
|
R"(OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %main "main" %BaseColor %fi %gl_FragColor
|
|
OpExecutionMode %main OriginUpperLeft
|
|
OpSource GLSL 140
|
|
OpName %main "main"
|
|
OpName %v "v"
|
|
OpName %BaseColor "BaseColor"
|
|
OpName %fi "fi"
|
|
OpName %r "r"
|
|
OpName %gl_FragColor "gl_FragColor"
|
|
%void = OpTypeVoid
|
|
%9 = OpTypeFunction %void
|
|
%float = OpTypeFloat 32
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
%_ptr_Input_v4float = OpTypePointer Input %v4float
|
|
%BaseColor = OpVariable %_ptr_Input_v4float Input
|
|
%_ptr_Input_float = OpTypePointer Input %float
|
|
%fi = OpVariable %_ptr_Input_float Input
|
|
%float_0 = OpConstant %float 0
|
|
%bool = OpTypeBool
|
|
%float_1 = OpConstant %float 1
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%gl_FragColor = OpVariable %_ptr_Output_v4float Output
|
|
)";
|
|
|
|
const std::string before =
|
|
R"(%main = OpFunction %void None %9
|
|
%19 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%r = OpVariable %_ptr_Function_v4float Function
|
|
%20 = OpLoad %v4float %BaseColor
|
|
OpStore %v %20
|
|
%21 = OpLoad %float %fi
|
|
%22 = OpFOrdLessThan %bool %21 %float_0
|
|
OpSelectionMerge %23 None
|
|
OpBranchConditional %22 %24 %25
|
|
%24 = OpLabel
|
|
%26 = OpLoad %v4float %v
|
|
OpStore %r %26
|
|
OpBranch %23
|
|
%25 = OpLabel
|
|
%27 = OpLoad %v4float %v
|
|
%28 = OpCompositeConstruct %v4float %float_1 %float_1 %float_1 %float_1
|
|
%29 = OpFSub %v4float %28 %27
|
|
OpStore %r %29
|
|
OpBranch %23
|
|
%23 = OpLabel
|
|
%30 = OpLoad %v4float %r
|
|
OpStore %gl_FragColor %30
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
const std::string after =
|
|
R"(%main = OpFunction %void None %9
|
|
%19 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%r = OpVariable %_ptr_Function_v4float Function
|
|
%20 = OpLoad %v4float %BaseColor
|
|
OpStore %v %20
|
|
%21 = OpLoad %float %fi
|
|
%22 = OpFOrdLessThan %bool %21 %float_0
|
|
OpSelectionMerge %23 None
|
|
OpBranchConditional %22 %24 %25
|
|
%24 = OpLabel
|
|
OpStore %r %20
|
|
OpBranch %23
|
|
%25 = OpLabel
|
|
%28 = OpCompositeConstruct %v4float %float_1 %float_1 %float_1 %float_1
|
|
%29 = OpFSub %v4float %28 %20
|
|
OpStore %r %29
|
|
OpBranch %23
|
|
%23 = OpLabel
|
|
%30 = OpLoad %v4float %r
|
|
OpStore %gl_FragColor %30
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
SinglePassRunAndCheck<LocalSingleStoreElimPass>(predefs + before,
|
|
predefs + after, true, true);
|
|
}
|
|
|
|
TEST_F(LocalSingleStoreElimTest, NoStoreElimWithInterveningAccessChainLoad) {
|
|
// Last load of v is eliminated, but access chain load and store of v isn't
|
|
//
|
|
// #version 140
|
|
//
|
|
// in vec4 BaseColor;
|
|
//
|
|
// void main()
|
|
// {
|
|
// vec4 v = BaseColor;
|
|
// float f = v[3];
|
|
// gl_FragColor = v * f;
|
|
// }
|
|
|
|
const std::string predefs =
|
|
R"(OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %main "main" %BaseColor %gl_FragColor
|
|
OpExecutionMode %main OriginUpperLeft
|
|
OpSource GLSL 140
|
|
OpName %main "main"
|
|
OpName %v "v"
|
|
OpName %BaseColor "BaseColor"
|
|
OpName %f "f"
|
|
OpName %gl_FragColor "gl_FragColor"
|
|
%void = OpTypeVoid
|
|
%8 = OpTypeFunction %void
|
|
%float = OpTypeFloat 32
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
%_ptr_Input_v4float = OpTypePointer Input %v4float
|
|
%BaseColor = OpVariable %_ptr_Input_v4float Input
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
%uint = OpTypeInt 32 0
|
|
%uint_3 = OpConstant %uint 3
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%gl_FragColor = OpVariable %_ptr_Output_v4float Output
|
|
)";
|
|
|
|
const std::string before =
|
|
R"(%main = OpFunction %void None %8
|
|
%17 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%f = OpVariable %_ptr_Function_float Function
|
|
%18 = OpLoad %v4float %BaseColor
|
|
OpStore %v %18
|
|
%19 = OpAccessChain %_ptr_Function_float %v %uint_3
|
|
%20 = OpLoad %float %19
|
|
OpStore %f %20
|
|
%21 = OpLoad %v4float %v
|
|
%22 = OpLoad %float %f
|
|
%23 = OpVectorTimesScalar %v4float %21 %22
|
|
OpStore %gl_FragColor %23
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
const std::string after =
|
|
R"(%main = OpFunction %void None %8
|
|
%17 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%f = OpVariable %_ptr_Function_float Function
|
|
%18 = OpLoad %v4float %BaseColor
|
|
OpStore %v %18
|
|
%19 = OpAccessChain %_ptr_Function_float %v %uint_3
|
|
%20 = OpLoad %float %19
|
|
OpStore %f %20
|
|
%23 = OpVectorTimesScalar %v4float %18 %20
|
|
OpStore %gl_FragColor %23
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
SinglePassRunAndCheck<LocalSingleStoreElimPass>(predefs + before,
|
|
predefs + after, true, true);
|
|
}
|
|
|
|
TEST_F(LocalSingleStoreElimTest, NoReplaceOfDominatingPartialStore) {
|
|
// Note: SPIR-V hand edited to initialize v to vec4(0.0)
|
|
//
|
|
// #version 140
|
|
//
|
|
// in vec4 BaseColor;
|
|
//
|
|
// void main()
|
|
// {
|
|
// vec4 v;
|
|
// float v[1] = 1.0;
|
|
// gl_FragColor = v;
|
|
// }
|
|
|
|
const std::string assembly =
|
|
R"(OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %main "main" %gl_FragColor %BaseColor
|
|
OpExecutionMode %main OriginUpperLeft
|
|
OpSource GLSL 140
|
|
OpName %main "main"
|
|
OpName %v "v"
|
|
OpName %gl_FragColor "gl_FragColor"
|
|
OpName %BaseColor "BaseColor"
|
|
%void = OpTypeVoid
|
|
%7 = OpTypeFunction %void
|
|
%float = OpTypeFloat 32
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
%float_0 = OpConstant %float 0
|
|
%12 = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_0
|
|
%float_1 = OpConstant %float 1
|
|
%uint = OpTypeInt 32 0
|
|
%uint_1 = OpConstant %uint 1
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%gl_FragColor = OpVariable %_ptr_Output_v4float Output
|
|
%_ptr_Input_v4float = OpTypePointer Input %v4float
|
|
%BaseColor = OpVariable %_ptr_Input_v4float Input
|
|
%main = OpFunction %void None %7
|
|
%19 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function %12
|
|
%20 = OpAccessChain %_ptr_Function_float %v %uint_1
|
|
OpStore %20 %float_1
|
|
%21 = OpLoad %v4float %v
|
|
OpStore %gl_FragColor %21
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
SinglePassRunAndCheck<LocalSingleStoreElimPass>(assembly, assembly, true,
|
|
true);
|
|
}
|
|
|
|
TEST_F(LocalSingleStoreElimTest, ElimIfCopyObjectInFunction) {
|
|
// Note: hand edited to insert OpCopyObject
|
|
//
|
|
// #version 140
|
|
//
|
|
// in vec4 BaseColor;
|
|
// in float fi;
|
|
//
|
|
// void main()
|
|
// {
|
|
// vec4 v = BaseColor;
|
|
// float f = fi;
|
|
// if (f < 0)
|
|
// f = 0.0;
|
|
// gl_FragColor = v + f;
|
|
// }
|
|
|
|
const std::string predefs =
|
|
R"(OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %main "main" %BaseColor %fi %gl_FragColor
|
|
OpExecutionMode %main OriginUpperLeft
|
|
OpSource GLSL 140
|
|
OpName %main "main"
|
|
OpName %v "v"
|
|
OpName %BaseColor "BaseColor"
|
|
OpName %f "f"
|
|
OpName %fi "fi"
|
|
OpName %gl_FragColor "gl_FragColor"
|
|
%void = OpTypeVoid
|
|
%9 = OpTypeFunction %void
|
|
%float = OpTypeFloat 32
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
%_ptr_Input_v4float = OpTypePointer Input %v4float
|
|
%BaseColor = OpVariable %_ptr_Input_v4float Input
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
%_ptr_Input_float = OpTypePointer Input %float
|
|
%fi = OpVariable %_ptr_Input_float Input
|
|
%float_0 = OpConstant %float 0
|
|
%bool = OpTypeBool
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%gl_FragColor = OpVariable %_ptr_Output_v4float Output
|
|
)";
|
|
|
|
const std::string before =
|
|
R"(%main = OpFunction %void None %9
|
|
%19 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%f = OpVariable %_ptr_Function_float Function
|
|
%20 = OpLoad %v4float %BaseColor
|
|
OpStore %v %20
|
|
%21 = OpLoad %float %fi
|
|
OpStore %f %21
|
|
%22 = OpLoad %float %f
|
|
%23 = OpFOrdLessThan %bool %22 %float_0
|
|
OpSelectionMerge %24 None
|
|
OpBranchConditional %23 %25 %24
|
|
%25 = OpLabel
|
|
OpStore %f %float_0
|
|
OpBranch %24
|
|
%24 = OpLabel
|
|
%26 = OpCopyObject %_ptr_Function_v4float %v
|
|
%27 = OpLoad %v4float %26
|
|
%28 = OpLoad %float %f
|
|
%29 = OpCompositeConstruct %v4float %28 %28 %28 %28
|
|
%30 = OpFAdd %v4float %27 %29
|
|
OpStore %gl_FragColor %30
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
const std::string after =
|
|
R"(%main = OpFunction %void None %9
|
|
%19 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%f = OpVariable %_ptr_Function_float Function
|
|
%20 = OpLoad %v4float %BaseColor
|
|
OpStore %v %20
|
|
%21 = OpLoad %float %fi
|
|
OpStore %f %21
|
|
%22 = OpLoad %float %f
|
|
%23 = OpFOrdLessThan %bool %22 %float_0
|
|
OpSelectionMerge %24 None
|
|
OpBranchConditional %23 %25 %24
|
|
%25 = OpLabel
|
|
OpStore %f %float_0
|
|
OpBranch %24
|
|
%24 = OpLabel
|
|
%26 = OpCopyObject %_ptr_Function_v4float %v
|
|
%28 = OpLoad %float %f
|
|
%29 = OpCompositeConstruct %v4float %28 %28 %28 %28
|
|
%30 = OpFAdd %v4float %20 %29
|
|
OpStore %gl_FragColor %30
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
SinglePassRunAndCheck<LocalSingleStoreElimPass>(predefs + before,
|
|
predefs + after, true, true);
|
|
}
|
|
|
|
TEST_F(LocalSingleStoreElimTest, NoOptIfStoreNotDominating) {
|
|
// Single store to f not optimized because it does not dominate
|
|
// the load.
|
|
//
|
|
// #version 140
|
|
//
|
|
// in vec4 BaseColor;
|
|
// in float fi;
|
|
//
|
|
// void main()
|
|
// {
|
|
// float f;
|
|
// if (fi < 0)
|
|
// f = 0.5;
|
|
// if (fi < 0)
|
|
// gl_FragColor = BaseColor * f;
|
|
// else
|
|
// gl_FragColor = BaseColor;
|
|
// }
|
|
|
|
const std::string assembly =
|
|
R"(OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %main "main" %fi %gl_FragColor %BaseColor
|
|
OpExecutionMode %main OriginUpperLeft
|
|
OpSource GLSL 140
|
|
OpName %main "main"
|
|
OpName %fi "fi"
|
|
OpName %f "f"
|
|
OpName %gl_FragColor "gl_FragColor"
|
|
OpName %BaseColor "BaseColor"
|
|
%void = OpTypeVoid
|
|
%8 = OpTypeFunction %void
|
|
%float = OpTypeFloat 32
|
|
%_ptr_Input_float = OpTypePointer Input %float
|
|
%fi = OpVariable %_ptr_Input_float Input
|
|
%float_0 = OpConstant %float 0
|
|
%bool = OpTypeBool
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
%float_0_5 = OpConstant %float 0.5
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%gl_FragColor = OpVariable %_ptr_Output_v4float Output
|
|
%_ptr_Input_v4float = OpTypePointer Input %v4float
|
|
%BaseColor = OpVariable %_ptr_Input_v4float Input
|
|
%main = OpFunction %void None %8
|
|
%18 = OpLabel
|
|
%f = OpVariable %_ptr_Function_float Function
|
|
%19 = OpLoad %float %fi
|
|
%20 = OpFOrdLessThan %bool %19 %float_0
|
|
OpSelectionMerge %21 None
|
|
OpBranchConditional %20 %22 %21
|
|
%22 = OpLabel
|
|
OpStore %f %float_0_5
|
|
OpBranch %21
|
|
%21 = OpLabel
|
|
%23 = OpLoad %float %fi
|
|
%24 = OpFOrdLessThan %bool %23 %float_0
|
|
OpSelectionMerge %25 None
|
|
OpBranchConditional %24 %26 %27
|
|
%26 = OpLabel
|
|
%28 = OpLoad %v4float %BaseColor
|
|
%29 = OpLoad %float %f
|
|
%30 = OpVectorTimesScalar %v4float %28 %29
|
|
OpStore %gl_FragColor %30
|
|
OpBranch %25
|
|
%27 = OpLabel
|
|
%31 = OpLoad %v4float %BaseColor
|
|
OpStore %gl_FragColor %31
|
|
OpBranch %25
|
|
%25 = OpLabel
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
SinglePassRunAndCheck<LocalSingleStoreElimPass>(assembly, assembly, true,
|
|
true);
|
|
}
|
|
|
|
TEST_F(LocalSingleStoreElimTest, OptInitializedVariableLikeStore) {
|
|
// Initialized variable f is optimized like it was a store.
|
|
// Note: The SPIR-V was edited to turn the store to f to an
|
|
// an initialization.
|
|
//
|
|
// #version 140
|
|
//
|
|
// void main()
|
|
// {
|
|
// float f = 0.0;
|
|
// gl_FragColor = vec4(f);
|
|
// }
|
|
|
|
const std::string predefs =
|
|
R"(OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %main "main" %gl_FragColor
|
|
OpExecutionMode %main OriginUpperLeft
|
|
OpSource GLSL 140
|
|
OpName %main "main"
|
|
OpName %f "f"
|
|
OpName %gl_FragColor "gl_FragColor"
|
|
OpDecorate %gl_FragColor Location 0
|
|
%void = OpTypeVoid
|
|
%6 = OpTypeFunction %void
|
|
%float = OpTypeFloat 32
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
%float_0 = OpConstant %float 0
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%gl_FragColor = OpVariable %_ptr_Output_v4float Output
|
|
)";
|
|
|
|
const std::string before =
|
|
R"(%main = OpFunction %void None %6
|
|
%12 = OpLabel
|
|
%f = OpVariable %_ptr_Function_float Function %float_0
|
|
%13 = OpLoad %float %f
|
|
%14 = OpCompositeConstruct %v4float %13 %13 %13 %13
|
|
OpStore %gl_FragColor %14
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
const std::string after =
|
|
R"(%main = OpFunction %void None %6
|
|
%12 = OpLabel
|
|
%f = OpVariable %_ptr_Function_float Function %float_0
|
|
%14 = OpCompositeConstruct %v4float %float_0 %float_0 %float_0 %float_0
|
|
OpStore %gl_FragColor %14
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
SinglePassRunAndCheck<LocalSingleStoreElimPass>(predefs + before,
|
|
predefs + after, true, true);
|
|
}
|
|
|
|
TEST_F(LocalSingleStoreElimTest, PointerVariable) {
|
|
// Test that checks if a pointer variable is removed.
|
|
|
|
const std::string before =
|
|
R"(OpCapability Shader
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %1 "main" %2
|
|
OpExecutionMode %1 OriginUpperLeft
|
|
OpMemberDecorate %_struct_3 0 Offset 0
|
|
OpDecorate %_runtimearr__struct_3 ArrayStride 16
|
|
OpMemberDecorate %_struct_5 0 Offset 0
|
|
OpDecorate %_struct_5 BufferBlock
|
|
OpMemberDecorate %_struct_6 0 Offset 0
|
|
OpDecorate %_struct_6 BufferBlock
|
|
OpDecorate %2 Location 0
|
|
OpDecorate %7 DescriptorSet 0
|
|
OpDecorate %7 Binding 0
|
|
%void = OpTypeVoid
|
|
%10 = OpTypeFunction %void
|
|
%int = OpTypeInt 32 1
|
|
%uint = OpTypeInt 32 0
|
|
%float = OpTypeFloat 32
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
|
|
%_struct_3 = OpTypeStruct %v4float
|
|
%_runtimearr__struct_3 = OpTypeRuntimeArray %_struct_3
|
|
%_struct_5 = OpTypeStruct %_runtimearr__struct_3
|
|
%_ptr_Uniform__struct_5 = OpTypePointer Uniform %_struct_5
|
|
%_struct_6 = OpTypeStruct %int
|
|
%_ptr_Uniform__struct_6 = OpTypePointer Uniform %_struct_6
|
|
%_ptr_Function__ptr_Uniform__struct_5 = OpTypePointer Function %_ptr_Uniform__struct_5
|
|
%_ptr_Function__ptr_Uniform__struct_6 = OpTypePointer Function %_ptr_Uniform__struct_6
|
|
%int_0 = OpConstant %int 0
|
|
%uint_0 = OpConstant %uint 0
|
|
%2 = OpVariable %_ptr_Output_v4float Output
|
|
%7 = OpVariable %_ptr_Uniform__struct_5 Uniform
|
|
%1 = OpFunction %void None %10
|
|
%23 = OpLabel
|
|
%24 = OpVariable %_ptr_Function__ptr_Uniform__struct_5 Function
|
|
OpStore %24 %7
|
|
%26 = OpLoad %_ptr_Uniform__struct_5 %24
|
|
%27 = OpAccessChain %_ptr_Uniform_v4float %26 %int_0 %uint_0 %int_0
|
|
%28 = OpLoad %v4float %27
|
|
%29 = OpCopyObject %v4float %28
|
|
OpStore %2 %28
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
const std::string after =
|
|
R"(OpCapability Shader
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %1 "main" %2
|
|
OpExecutionMode %1 OriginUpperLeft
|
|
OpMemberDecorate %_struct_3 0 Offset 0
|
|
OpDecorate %_runtimearr__struct_3 ArrayStride 16
|
|
OpMemberDecorate %_struct_5 0 Offset 0
|
|
OpDecorate %_struct_5 BufferBlock
|
|
OpMemberDecorate %_struct_6 0 Offset 0
|
|
OpDecorate %_struct_6 BufferBlock
|
|
OpDecorate %2 Location 0
|
|
OpDecorate %7 DescriptorSet 0
|
|
OpDecorate %7 Binding 0
|
|
%void = OpTypeVoid
|
|
%10 = OpTypeFunction %void
|
|
%int = OpTypeInt 32 1
|
|
%uint = OpTypeInt 32 0
|
|
%float = OpTypeFloat 32
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%_ptr_Uniform_v4float = OpTypePointer Uniform %v4float
|
|
%_struct_3 = OpTypeStruct %v4float
|
|
%_runtimearr__struct_3 = OpTypeRuntimeArray %_struct_3
|
|
%_struct_5 = OpTypeStruct %_runtimearr__struct_3
|
|
%_ptr_Uniform__struct_5 = OpTypePointer Uniform %_struct_5
|
|
%_struct_6 = OpTypeStruct %int
|
|
%_ptr_Uniform__struct_6 = OpTypePointer Uniform %_struct_6
|
|
%_ptr_Function__ptr_Uniform__struct_5 = OpTypePointer Function %_ptr_Uniform__struct_5
|
|
%_ptr_Function__ptr_Uniform__struct_6 = OpTypePointer Function %_ptr_Uniform__struct_6
|
|
%int_0 = OpConstant %int 0
|
|
%uint_0 = OpConstant %uint 0
|
|
%2 = OpVariable %_ptr_Output_v4float Output
|
|
%7 = OpVariable %_ptr_Uniform__struct_5 Uniform
|
|
%1 = OpFunction %void None %10
|
|
%23 = OpLabel
|
|
%24 = OpVariable %_ptr_Function__ptr_Uniform__struct_5 Function
|
|
OpStore %24 %7
|
|
%27 = OpAccessChain %_ptr_Uniform_v4float %7 %int_0 %uint_0 %int_0
|
|
%28 = OpLoad %v4float %27
|
|
%29 = OpCopyObject %v4float %28
|
|
OpStore %2 %28
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
// Relax logical pointers to allow pointer allocations.
|
|
SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
|
|
ValidatorOptions()->relax_logical_pointer = true;
|
|
SinglePassRunAndCheck<LocalSingleStoreElimPass>(before, after, true, true);
|
|
}
|
|
|
|
// Test that that an unused OpAccessChain between a store and a use does does
|
|
// not hinders the replacement of the use. We need to check this because
|
|
// local-access-chain-convert does always remove the OpAccessChain instructions
|
|
// that become dead.
|
|
|
|
TEST_F(LocalSingleStoreElimTest,
|
|
StoreElimWithUnusedInterveningAccessChainLoad) {
|
|
// Last load of v is eliminated, but access chain load and store of v isn't
|
|
//
|
|
// #version 140
|
|
//
|
|
// in vec4 BaseColor;
|
|
//
|
|
// void main()
|
|
// {
|
|
// vec4 v = BaseColor;
|
|
// float f = v[3];
|
|
// gl_FragColor = v * f;
|
|
// }
|
|
|
|
const std::string predefs =
|
|
R"(OpCapability Shader
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint Fragment %main "main" %BaseColor %gl_FragColor
|
|
OpExecutionMode %main OriginUpperLeft
|
|
OpSource GLSL 140
|
|
OpName %main "main"
|
|
OpName %v "v"
|
|
OpName %BaseColor "BaseColor"
|
|
OpName %gl_FragColor "gl_FragColor"
|
|
%void = OpTypeVoid
|
|
%8 = OpTypeFunction %void
|
|
%float = OpTypeFloat 32
|
|
%v4float = OpTypeVector %float 4
|
|
%_ptr_Function_v4float = OpTypePointer Function %v4float
|
|
%_ptr_Input_v4float = OpTypePointer Input %v4float
|
|
%BaseColor = OpVariable %_ptr_Input_v4float Input
|
|
%_ptr_Function_float = OpTypePointer Function %float
|
|
%uint = OpTypeInt 32 0
|
|
%uint_3 = OpConstant %uint 3
|
|
%_ptr_Output_v4float = OpTypePointer Output %v4float
|
|
%gl_FragColor = OpVariable %_ptr_Output_v4float Output
|
|
)";
|
|
|
|
const std::string before =
|
|
R"(%main = OpFunction %void None %8
|
|
%17 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%18 = OpLoad %v4float %BaseColor
|
|
OpStore %v %18
|
|
%19 = OpAccessChain %_ptr_Function_float %v %uint_3
|
|
%21 = OpLoad %v4float %v
|
|
OpStore %gl_FragColor %21
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
const std::string after =
|
|
R"(%main = OpFunction %void None %8
|
|
%17 = OpLabel
|
|
%v = OpVariable %_ptr_Function_v4float Function
|
|
%18 = OpLoad %v4float %BaseColor
|
|
OpStore %v %18
|
|
%19 = OpAccessChain %_ptr_Function_float %v %uint_3
|
|
OpStore %gl_FragColor %18
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
|
|
SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
|
|
SinglePassRunAndCheck<LocalSingleStoreElimPass>(predefs + before,
|
|
predefs + after, true, true);
|
|
}
|
|
|
|
TEST_F(LocalSingleStoreElimTest, VariablePointerTest) {
|
|
// Check that the load of the first variable is still used and that the load
|
|
// of the third variable is propagated. The first load has to remain because
|
|
// of the store to the variable pointer.
|
|
const std::string text = R"(
|
|
; CHECK: [[v1:%\w+]] = OpVariable
|
|
; CHECK: [[v2:%\w+]] = OpVariable
|
|
; CHECK: [[v3:%\w+]] = OpVariable
|
|
; CHECK: [[ld1:%\w+]] = OpLoad %int [[v1]]
|
|
; CHECK: OpIAdd %int [[ld1]] %int_0
|
|
OpCapability Shader
|
|
OpCapability VariablePointers
|
|
%1 = OpExtInstImport "GLSL.std.450"
|
|
OpMemoryModel Logical GLSL450
|
|
OpEntryPoint GLCompute %2 "main"
|
|
OpExecutionMode %2 LocalSize 1 1 1
|
|
OpSource GLSL 450
|
|
OpMemberDecorate %_struct_3 0 Offset 0
|
|
OpMemberDecorate %_struct_3 1 Offset 4
|
|
%void = OpTypeVoid
|
|
%5 = OpTypeFunction %void
|
|
%int = OpTypeInt 32 1
|
|
%bool = OpTypeBool
|
|
%_struct_3 = OpTypeStruct %int %int
|
|
%_ptr_Function__struct_3 = OpTypePointer Function %_struct_3
|
|
%_ptr_Function_int = OpTypePointer Function %int
|
|
%true = OpConstantTrue %bool
|
|
%int_0 = OpConstant %int 0
|
|
%int_1 = OpConstant %int 1
|
|
%13 = OpConstantNull %_struct_3
|
|
%2 = OpFunction %void None %5
|
|
%14 = OpLabel
|
|
%15 = OpVariable %_ptr_Function_int Function
|
|
%16 = OpVariable %_ptr_Function_int Function
|
|
%17 = OpVariable %_ptr_Function_int Function
|
|
OpStore %15 %int_1
|
|
OpStore %17 %int_0
|
|
OpSelectionMerge %18 None
|
|
OpBranchConditional %true %19 %20
|
|
%19 = OpLabel
|
|
OpBranch %18
|
|
%20 = OpLabel
|
|
OpBranch %18
|
|
%18 = OpLabel
|
|
%21 = OpPhi %_ptr_Function_int %15 %19 %16 %20
|
|
OpStore %21 %int_0
|
|
%22 = OpLoad %int %15
|
|
%23 = OpLoad %int %17
|
|
%24 = OpIAdd %int %22 %23
|
|
OpReturn
|
|
OpFunctionEnd
|
|
)";
|
|
SinglePassRunAndMatch<LocalSingleStoreElimPass>(text, false);
|
|
}
|
|
// TODO(greg-lunarg): Add tests to verify handling of these cases:
|
|
//
|
|
// Other types
|
|
// Others?
|
|
|
|
} // namespace
|
|
} // namespace opt
|
|
} // namespace spvtools
|