-
Notifications
You must be signed in to change notification settings - Fork 829
Corrected setting IRBuilder debug location in HLSignatureLower::Gener… #8022
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
base: main
Are you sure you want to change the base?
Conversation
…ateDxilComputeAndNodeCommonInputs()
|
@adam-yang - can you have a look at this when you get a chance please? @kpyzhov - it seems like there may be some kind of a testing hole that we should fill along with this fix? |
tools/clang/test/HLSLFileCheck/dxil/debug/dxop_threadid_dbgloc.hlsl
Outdated
Show resolved
Hide resolved
adam-yang
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM. Thank you!
|
@adam-yang, can you approve it again please? Thanks! |
adam-yang
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
LGTM
|
@damyanp, I'm seeing the "microsoft.DirectXShaderCompiler" check has been in the "waiting" state for a long time. Is that some testing that I have to run manually? Thanks! |
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
…ateDxilComputeAndNodeCommonInputs()
As a result of #7799, the HLSL entry function can now contain
dbg.valuecalls with !dbg location metadata with scopes corresponding to functions which have been inlined.The
HLSignatureLower::GenerateDxilComputeAndNodeCommonInputs()creates@dx.op.threadIdintrinsic calls, using the default dbg loc when creating anIRBuilder. When the first instruction in the entry block is one of thedbg,valuecalls, its dbg location is copied to the@dx.op.threadIdcalls. That makes the DXIL unreadable by the modern LLVM IR reader since it fails the IR module verification because of !dbg pointing to a different subprogram scope.This change sets the dbg location for IRBuilder to be the !dbg node of the first non-PHI and non-debug instruction in the block.