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

Let ADCE pass check DebugScope (#3703)

Browse Source 
In the existing code, ADCE pass does not check DebugScope of an
instruction when it checks the users of each instruction, which results
in removing OpenCL.Debug.100 instructions that are only used by
DebugScope. This commit lets ADCE pass add DebugScope of an instruction
to the live instruction set when the instruction is added to the live
instruction set.
This commit is contained in:
Jaebaek Seo 2020-08-18 09:33:20 -04:00 committed by GitHub
parent ee7f0c882f
commit 3434cb0b00
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 67 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
source/opt/aggressive_dead_code_elim_pass.cpp
View File

@ -533,6 +533,17 @@ bool AggressiveDCEPass::AggressiveDCE(Function* func) {
AddToWorklist(dec);
}
// Add DebugScope and DebugInlinedAt for |liveInst| to the work list.
if (liveInst->GetDebugScope().GetLexicalScope() != kNoDebugScope) {
auto* scope = get_def_use_mgr()->GetDef(
liveInst->GetDebugScope().GetLexicalScope());
AddToWorklist(scope);
}
if (liveInst->GetDebugInlinedAt() != kNoInlinedAt) {
auto* inlined_at =
get_def_use_mgr()->GetDef(liveInst->GetDebugInlinedAt());
AddToWorklist(inlined_at);
}
worklist_.pop();
}

56
test/opt/aggressive_dead_code_elim_test.cpp
View File

@ -7525,6 +7525,62 @@ TEST_F(AggressiveDCETest, DebugInfoElimUnusedTextureKeepGlobalVariable) {
SinglePassRunAndMatch<AggressiveDCEPass>(text, true);
}
TEST_F(AggressiveDCETest, KeepDebugScopeParent) {
// Verify that local variable tc and its store are kept by DebugDeclare.
//
// Same shader source as DebugInfoInFunctionKeepStoreVarElim. The SPIR-V
// has just been inlined.
const std::string text = R"(
OpCapability Shader
%1 = OpExtInstImport "OpenCL.DebugInfo.100"
OpMemoryModel Logical GLSL450
OpEntryPoint Fragment %main "main" %out_var_SV_TARGET0
OpExecutionMode %main OriginUpperLeft
%11 = OpString "float"
%16 = OpString "t.hlsl"
%19 = OpString "src.main"
OpName %out_var_SV_TARGET0 "out.var.SV_TARGET0"
OpName %main "main"
OpDecorate %out_var_SV_TARGET0 Location 0
%float = OpTypeFloat 32
%float_0 = OpConstant %float 0
%v4float = OpTypeVector %float 4
%7 = OpConstantComposite %v4float %float_0 %float_0 %float_0 %float_0
%uint = OpTypeInt 32 0
%uint_32 = OpConstant %uint 32
%_ptr_Output_v4float = OpTypePointer Output %v4float
%void = OpTypeVoid
%23 = OpTypeFunction %void
%26 = OpTypeFunction %v4float
%out_var_SV_TARGET0 = OpVariable %_ptr_Output_v4float Output
%_ptr_Function_v4float = OpTypePointer Function %v4float
%33 = OpExtInst %void %1 DebugInfoNone
%13 = OpExtInst %void %1 DebugTypeBasic %11 %uint_32 Float
%14 = OpExtInst %void %1 DebugTypeVector %13 4
%15 = OpExtInst %void %1 DebugTypeFunction FlagIsProtected|FlagIsPrivate %14
%17 = OpExtInst %void %1 DebugSource %16
%18 = OpExtInst %void %1 DebugCompilationUnit 1 4 %17 HLSL
%20 = OpExtInst %void %1 DebugFunction %19 %15 %17 1 1 %18 %19 FlagIsProtected|FlagIsPrivate 2 %33
%22 = OpExtInst %void %1 DebugLexicalBlock %17 2 1 %20
%main = OpFunction %void None %23
%24 = OpLabel
%31 = OpVariable %_ptr_Function_v4float Function
; CHECK: [[block:%\w+]] = OpExtInst %void %1 DebugLexicalBlock
; CHECK: DebugScope [[block]]
%34 = OpExtInst %void %1 DebugScope %22
OpLine %16 3 5
OpStore %31 %7
OpStore %out_var_SV_TARGET0 %7
%35 = OpExtInst %void %1 DebugNoScope
OpReturn
OpFunctionEnd
)";
SetAssembleOptions(SPV_TEXT_TO_BINARY_OPTION_PRESERVE_NUMERIC_IDS);
SinglePassRunAndMatch<AggressiveDCEPass>(text, true);
}
// TODO(greg-lunarg): Add tests to verify handling of these cases:
//
// Check that logical addressing required