Skip to content

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.

Sign up for GitHub

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

Open
kpyzhov wants to merge 2 commits into
base: main
Choose a base branch
from
+26 −0
Open

Corrected setting IRBuilder debug location in HLSignatureLower::Gener… #8022

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a8e683
Corrected setting IRBuilder debug location in HLSignatureLower::Gener…
Dec 25, 2025
e441ec7
Added a test.
Dec 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions lib/HLSL/HLSignatureLower.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1253,6 +1253,8 @@ void HLSignatureLower::GenerateDxilComputeAndNodeCommonInputs() {
DXASSERT(funcAnnotation, "must find annotation for entry function");
auto &funcProps = HLM.GetDxilFunctionProps(Entry);
IRBuilder<> Builder(Entry->getEntryBlock().getFirstInsertionPt());
Builder.SetCurrentDebugLocation(
Entry->getEntryBlock().getFirstNonPHIOrDbg()->getDebugLoc());

for (Argument &arg : Entry->args()) {
DxilParameterAnnotation &paramAnnotation =
Expand Down
24 changes: 24 additions & 0 deletions tools/clang/test/HLSLFileCheck/dxil/debug/dxop_threadid_dbgloc.hlsl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
// RUN: %dxc -T cs_6_5 -E CSMain -O0 -Zi -enable-16bit-types %s | FileCheck %s

// CHECK-LABEL: @CSMain()
// CHECK: %{{[0-9]+}} = call i32 @dx.op.threadId.i32(i32 {{[0-9]+}}, i32 {{[0-9]+}}), !dbg [[DBG_MD:![0-9]+]]
// CHECK: [[SUBPGM:![0-9]+]] = !DISubprogram(name: "CSMain"
// CHECK: [[DBG_MD]] = !DILocation(line: 21, column: 15, scope: [[SUBPGM]])

RWBuffer<float> u0 : register(u0);
RWBuffer<float> u1 : register(u1);

static float my_var;
static float my_var2;

void foo() {
my_var2 = my_var * 2;
}

[RootSignature("DescriptorTable(UAV(u0,numDescriptors=2))")]
[numthreads(64,1,1)]
void CSMain(uint3 dtid : SV_DispatchThreadID) {
my_var = u0[dtid.x];
foo();
u1[dtid.x] = my_var2;
}