Skip to content

Correct the scope for DebugLocalVariable #7516

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

Merged
csyonghe merged 3 commits into from
Jun 26, 2025
Merged

Correct the scope for DebugLocalVariable #7516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
b2b41bd
Correct the scope for DebugLocalVariable
lujinwangnv Jun 24, 2025
2bd0c9f
Add a test for DebugLocalVariable
lujinwangnv Jun 25, 2025
04ce835
Merge branch 'master' into debugscope
lujinwangnv Jun 25, 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
11 changes: 9 additions & 2 deletions source/slang/slang-emit-spirv.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3468,7 +3468,8 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex
spvBlock,
spvFunc,
irDebugFunc,
irFunc->getDataType());
irFunc->getDataType(),
irFunc);
}
if (funcDebugScope)
{
Expand Down Expand Up @@ -7964,7 +7965,8 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex
SpvInst* firstBlock,
SpvInst* spvFunc,
IRDebugFunction* debugFunc,
IRFuncType* debugType)
IRFuncType* debugType,
IRFunc* irFunc = nullptr)
{
SpvInst* debugFuncInfo = nullptr;
if (debugFunc && m_mapIRInstToSpvInst.tryGetValue(debugFunc, debugFuncInfo))
Expand Down Expand Up @@ -8002,6 +8004,11 @@ struct SPIRVEmitContext : public SourceEmitterBase, public SPIRVEmitSharedContex
builder.getIntValue(builder.getUIntType(), 0),
debugFunc->getLine());

if (irFunc)
{
registerDebugInst(irFunc, debugFuncInfo);
}

if (firstBlock && spvFunc)
{
emitOpDebugFunctionDefinition(
Expand Down
21 changes: 21 additions & 0 deletions tests/spirv/debug-local-variable-scope.slang
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
//TEST:SIMPLE(filecheck=CHECK):-target spirv -entry main -stage fragment -g2 -emit-spirv-directly

Texture2D testTex : register(t0);
SamplerState testSampler : register(s0);

struct PSIn
{
float4 pos : SV_Position;
};

float4 main(PSIn input) : SV_TARGET
{
uint4 testPos = input.pos;
float bias = -1.0;
float2 tc = testPos.xy / 32.0;
float4 colVal = testTex.SampleBias(testSampler, tc, bias);
return float4(colVal.xyz, 1.0);
}

// CHECK: %[[FUNC_ID:[0-9]+]] = OpExtInst %void {{.*}} DebugFunction %{{[0-9]+}}
// CHECK: DebugLocalVariable %{{[0-9]+}} %{{[0-9]+}} %{{[0-9]+}} %{{.*}} %{{.*}} %[[FUNC_ID]]
Loading