AuroraMiddleware/SPIRV-Tools
1
0
Fork 0
mirror of https://github.com/KhronosGroup/SPIRV-Tools synced 2024-11-22 19:50:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Do not inline OpKill Instructions (#2713)" (#2749)

Browse Source 
This reverts commit fe7cc9c612.
This commit is contained in:
Steven Perron 2019-07-17 14:59:05 -04:00 committed by GitHub
parent 58e2ec25ba
commit aa9e8f5380
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 158 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
source/opt/inline_pass.cpp
View File

@ -629,39 +629,12 @@ bool InlinePass::GenInlineCode(
return true;
}
bool InlinePass::IsInlinableFunctionCall(Instruction* inst) {
bool InlinePass::IsInlinableFunctionCall(const Instruction* inst) {
if (inst->opcode() != SpvOp::SpvOpFunctionCall) return false;
const uint32_t calleeFnId =
inst->GetSingleWordOperand(kSpvFunctionCallFunctionId);
const auto ci = inlinable_.find(calleeFnId);
if (ci == inlinable_.cend()) {
return false;
}
if (funcs_with_opkill_.count(calleeFnId) == 0) {
return true;
}
// We cannot inline into a continue construct if the function has an OpKill.
auto* cfg_analysis = context()->GetStructuredCFGAnalysis();
BasicBlock* bb = context()->get_instr_block(inst);
uint32_t loop_header_id = cfg_analysis->ContainingLoop(bb->id());
if (loop_header_id == 0) {
// Not in a loop, so we can inline.
return true;
}
BasicBlock* loop_header_bb = context()->get_instr_block(loop_header_id);
uint32_t loop_continue =
loop_header_bb->GetLoopMergeInst()->GetSingleWordOperand(1);
Function* caller_func = bb->GetParent();
DominatorAnalysis* dom = context()->GetDominatorAnalysis(caller_func);
if (dom->Dominates(loop_continue, bb->id())) {
// The function call is the continue construct and the callee contains an
// OpKill.
return false;
}
return true;
return ci != inlinable_.cend();
}
void InlinePass::UpdateSucceedingPhis(
@ -738,9 +711,6 @@ bool InlinePass::IsInlinableFunction(Function* func) {
// the returns as a branch to the loop's merge block. However, this can only
// done validly if the return was not in a loop in the original function.
// Also remember functions with multiple (early) returns.
// Do not inline functions with an OpKill because they may be inlined into a
// continue construct.
AnalyzeReturns(func);
if (no_return_in_loop_.find(func->result_id()) == no_return_in_loop_.cend()) {
return false;
@ -771,13 +741,6 @@ void InlinePass::InitializeInline() {
}
// Compute inlinability
if (IsInlinableFunction(&fn)) inlinable_.insert(fn.result_id());
bool has_opkill = !fn.WhileEachInst(
[](Instruction* inst) { return inst->opcode() != SpvOpKill; });
if (has_opkill) {
funcs_with_opkill_.insert(fn.result_id());
}
}
}

5
source/opt/inline_pass.h
View File

@ -122,7 +122,7 @@ class InlinePass : public Pass {
UptrVectorIterator<BasicBlock> call_block_itr);
// Return true if |inst| is a function call that can be inlined.
bool IsInlinableFunctionCall(Instruction* inst);
bool IsInlinableFunctionCall(const Instruction* inst);
// Return true if |func| does not have a return that is
// nested in a structured if, switch or loop.
@ -159,9 +159,6 @@ class InlinePass : public Pass {
// Set of ids of functions with no returns in loop
std::set<uint32_t> no_return_in_loop_;
// Set of ids of functions with no returns in loop
std::unordered_set<uint32_t> funcs_with_opkill_;
// Set of ids of inlinable functions
std::set<uint32_t> inlinable_;

115
test/opt/inline_test.cpp
View File

@ -3112,121 +3112,6 @@ OpFunctionEnd
SinglePassRunAndCheck<InlineExhaustivePass>(test, test, false, true);
}
TEST_F(InlineTest, DontInlineFuncWithOpKill) {
const std::string test =
R"(OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main"
OpExecutionMode %main OriginUpperLeft
OpSource GLSL 330
OpName %main "main"
OpName %kill_ "kill("
%void = OpTypeVoid
%3 = OpTypeFunction %void
%bool = OpTypeBool
%true = OpConstantTrue %bool
%main = OpFunction %void None %3
%5 = OpLabel
OpBranch %9
%9 = OpLabel
OpLoopMerge %11 %12 None
OpBranch %13
%13 = OpLabel
OpBranchConditional %true %10 %11
%10 = OpLabel
OpBranch %12
%12 = OpLabel
%16 = OpFunctionCall %void %kill_
OpBranch %9
%11 = OpLabel
OpReturn
OpFunctionEnd
%kill_ = OpFunction %void None %3
%7 = OpLabel
OpKill
OpFunctionEnd
)";
SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
SinglePassRunAndCheck<InlineExhaustivePass>(test, test, false, true);
}
TEST_F(InlineTest, InlineFuncWithOpKill) {
const std::string before =
R"(OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main"
OpExecutionMode %main OriginUpperLeft
OpSource GLSL 330
OpName %main "main"
OpName %kill_ "kill("
%void = OpTypeVoid
%3 = OpTypeFunction %void
%bool = OpTypeBool
%true = OpConstantTrue %bool
%main = OpFunction %void None %3
%5 = OpLabel
OpBranch %9
%9 = OpLabel
OpLoopMerge %11 %12 None
OpBranch %13
%13 = OpLabel
OpBranchConditional %true %10 %11
%10 = OpLabel
%16 = OpFunctionCall %void %kill_
OpBranch %12
%12 = OpLabel
OpBranch %9
%11 = OpLabel
OpReturn
OpFunctionEnd
%kill_ = OpFunction %void None %3
%7 = OpLabel
OpKill
OpFunctionEnd
)";
const std::string after =
R"(OpCapability Shader
%1 = OpExtInstImport "GLSL.std.450"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main"
OpExecutionMode %main OriginUpperLeft
OpSource GLSL 330
OpName %main "main"
OpName %kill_ "kill("
%void = OpTypeVoid
%3 = OpTypeFunction %void
%bool = OpTypeBool
%true = OpConstantTrue %bool
%main = OpFunction %void None %3
%5 = OpLabel
OpBranch %9
%9 = OpLabel
OpLoopMerge %11 %12 None
OpBranch %13
%13 = OpLabel
OpBranchConditional %true %10 %11
%10 = OpLabel
OpKill
%17 = OpLabel
OpBranch %12
%12 = OpLabel
OpBranch %9
%11 = OpLabel
OpReturn
OpFunctionEnd
%kill_ = OpFunction %void None %3
%7 = OpLabel
OpKill
OpFunctionEnd
)";
SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
SinglePassRunAndCheck<InlineExhaustivePass>(before, after, false, true);
}
// TODO(greg-lunarg): Add tests to verify handling of these cases:
//
// Empty modules