Do not register DebugFunction for functions optimized away by inlining.#3749
Merged
jaebaek merged 1 commit intoKhronosGroup:masterfrom Aug 27, 2020
Merged
Do not register DebugFunction for functions optimized away by inlining.#3749jaebaek merged 1 commit intoKhronosGroup:masterfrom
jaebaek merged 1 commit intoKhronosGroup:masterfrom
Conversation
Contributor
Author
|
@jaebaek Please review |
jaebaek
reviewed
Aug 26, 2020
Contributor
jaebaek
left a comment
There was a problem hiding this comment.
Could you please add an unit test similar to
https://github.com/KhronosGroup/SPIRV-Tools/blob/master/test/opt/debug_info_manager_test.cpp#L298 ?
source/opt/debug_info_manager.cpp
Outdated
| "inst is not a DebugFunction"); | ||
| auto fn_id = inst->GetSingleWordOperand(kDebugFunctionOperandFunctionIndex); | ||
| // Do not register function that has been optimized away | ||
| if (fn_id == GetDebugInfoNone()->result_id()) return; |
Contributor
There was a problem hiding this comment.
Since we can add another DebugInfoNone and do not reuse it for multiple DebugFunction, it can be different from GetDebugInfoNone()->result_id() even when it is actually DebugInfoNone.
Why don't we change this to
// Skip if Function operand of DebugFunction is DebugInfoNone
if (GetDbgInst(fn_id) != nullptr) {
assert(GetDbgInst(fn_id)->GetOpenCL100DebugOpcode() == OpenCLDebugInfo100DebugInfoNone);
return;
}
?
Contributor
Author
There was a problem hiding this comment.
Change made and test added. I believe I have addressed all concerns.
jaebaek
approved these changes
Aug 27, 2020
Contributor
|
Thank you for working on it! |
dneto0
pushed a commit
to dneto0/SPIRV-Tools
that referenced
this pull request
Sep 14, 2024
Roll third_party/glslang/ 983698b..517f39e (1 commit) KhronosGroup/glslang@983698b...517f39e $ git log 983698b..517f39e --date=short --no-merges --format='%ad %ae %s' 2020-08-26 jmadill Suppress two override suggestion warnings. Created with: roll-dep third_party/glslang Roll third_party/googletest/ 1e315c5b1..df6b75949 (1 commit) google/googletest@1e315c5...df6b759 $ git log 1e315c5b1..df6b75949 --date=short --no-merges --format='%ad %ae %s' 2020-08-26 absl-team Googletest export Created with: roll-dep third_party/googletest Roll third_party/spirv-tools/ 4dd1223..8a0ebd4 (14 commits) KhronosGroup/SPIRV-Tools@4dd1223...8a0ebd4 $ git log 4dd1223..8a0ebd4 --date=short --no-merges --format='%ad %ae %s' 2020-08-31 jaebaek Correctly replace debug lexical scope of instruction (KhronosGroup#3718) 2020-08-28 afdx spirv-fuzz: Remove opaque pointer design pattern (KhronosGroup#3755) 2020-08-27 stefanomil spirv-fuzz: Create synonym via OpPhi and existing synonyms (KhronosGroup#3701) 2020-08-27 stefanomil Add LoopNestingDepth function to StructuredCFGAnalysis (KhronosGroup#3754) 2020-08-27 afdx spirv-fuzz: Do not make synonyms of void result ids (KhronosGroup#3747) 2020-08-26 greg Do not register DebugFunction for functions optimized away. (KhronosGroup#3749) 2020-08-26 jaebaek Handle DebugScope in compact-ids pass (KhronosGroup#3724) 2020-08-26 afdx spirv-fuzz: Overflow ids (KhronosGroup#3734) 2020-08-25 greg Fix DebugNoScope to not output InlinedAt operand. (KhronosGroup#3748) 2020-08-25 vasniktel spirv-fuzz: Split the fact manager into multiple files (KhronosGroup#3699) 2020-08-25 andreperezmaselco.developer spirv-fuzz: Add inline function transformation (KhronosGroup#3517) 2020-08-25 vasniktel spirv-fuzz: Fix MaybeGetZeroConstant (KhronosGroup#3740) 2020-08-24 greg Fix SSA-rewrite to remove DebugDeclare for variables without loads (KhronosGroup#3719) 2020-08-24 stevenperron Add undef for inlined void function (KhronosGroup#3720) Created with: roll-dep third_party/spirv-tools
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This fixes #3743
The debug info manager was attempting to register functions that had been optimized away by inlining. They all have a function id of DebugInfoNone which caused a problem with the DebugFunction map which keys on the function id, resulting in conflict.
The solution is to not register functions which map to DebugInfoNone.