lee/renderdoc
1
0
Fork 0
mirror of https://github.com/baldurk/renderdoc.git synced 2026-05-12 13:00:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

DXIL Debugger use DXIL::Value* in more places in place of SSA IDs

Browse Source 
DDX/DDY now take a DXIL::Value* instead of SSA ID
Use GetShaderVariable() instead of GetLiveVariable() when getting values from other lanes
Defensive code to prevent crash if get an invalid SSA ID for ExtractVal, Load, Store, GetElementPtr
This commit is contained in:
Jake Turner
2024-12-16 17:21:48 +00:00
parent bc93b3dcf2
commit a03e94992b
2 changed files with 31 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files
renderdoc/driver/shaders/dxil/dxil_debug.cpp
+29 -30
View File
@@ -2761,18 +2761,14 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
else
{
RDCASSERT(!ThreadsAreDiverged(workgroups));
Id id = GetArgumentId(1);
if(id != DXILDebug::INVALID_ID)
{
if(dxOpCode == DXOp::DerivCoarseX)
result.value = DDX(false, opCode, dxOpCode, workgroups, id);
else if(dxOpCode == DXOp::DerivCoarseY)
result.value = DDY(false, opCode, dxOpCode, workgroups, id);
else if(dxOpCode == DXOp::DerivFineX)
result.value = DDX(true, opCode, dxOpCode, workgroups, id);
else if(dxOpCode == DXOp::DerivFineY)
result.value = DDY(true, opCode, dxOpCode, workgroups, id);
}
if(dxOpCode == DXOp::DerivCoarseX)
result.value = DDX(false, opCode, dxOpCode, workgroups, inst.args[1]);
else if(dxOpCode == DXOp::DerivCoarseY)
result.value = DDY(false, opCode, dxOpCode, workgroups, inst.args[1]);
else if(dxOpCode == DXOp::DerivFineX)
result.value = DDX(true, opCode, dxOpCode, workgroups, inst.args[1]);
else if(dxOpCode == DXOp::DerivFineY)
result.value = DDY(true, opCode, dxOpCode, workgroups, inst.args[1]);
}
break;
}
@@ -3568,7 +3564,6 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
RDCASSERT(!ThreadsAreDiverged(workgroups));
// QuadOp(value,op)
// QuadReadLaneAt(value,quadLane)
Id id = GetArgumentId(1);
ShaderVariable b;
RDCASSERT(GetShaderVariable(inst.args[2], opCode, dxOpCode, b));
uint32_t lane = UINT32_MAX;
@@ -3625,7 +3620,7 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
if(lane < workgroups.size())
{
ShaderVariable var;
RDCASSERT(workgroups[lane].GetLiveVariable(id, opCode, dxOpCode, var));
RDCASSERT(workgroups[lane].GetShaderVariable(inst.args[1], opCode, dxOpCode, var));
result.value = var.value;
}
else
@@ -4062,6 +4057,8 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
case Operation::ExtractVal:
{
Id src = GetArgumentId(0);
if(src == DXILDebug::INVALID_ID)
break;
RDCASSERT(IsVariableAssigned(src));
const ShaderVariable &srcVal = m_Variables[src];
RDCASSERT(srcVal.members.empty());
@@ -4100,6 +4097,8 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
{
// Load(ptr)
Id ptrId = GetArgumentId(0);
if(ptrId == DXILDebug::INVALID_ID)
break;
RDCASSERT(m_Memory.m_AllocPointers.count(ptrId) == 1);
ShaderVariable arg;
RDCASSERT(GetShaderVariable(inst.args[0], opCode, dxOpCode, arg));
@@ -4115,6 +4114,8 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
size_t allocSize = 0;
void *allocMemoryBackingPtr = NULL;
Id ptrId = GetArgumentId(0);
if(ptrId == DXILDebug::INVALID_ID)
break;
auto itPtr = m_Memory.m_AllocPointers.find(ptrId);
RDCASSERT(itPtr != m_Memory.m_AllocPointers.end());
@@ -4166,6 +4167,8 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
{
const DXIL::Type *resultType = inst.type->inner;
Id ptrId = GetArgumentId(0);
if(ptrId == DXILDebug::INVALID_ID)
break;
RDCASSERT(IsVariableAssigned(ptrId));
RDCASSERT(m_Memory.m_Allocs.count(ptrId) == 1);
@@ -5074,6 +5077,8 @@ bool ThreadState::ExecuteInstruction(DebugAPIWrapper *apiWrapper,
void *baseMemoryBackingPtr = NULL;
Id baseMemoryId = DXILDebug::INVALID_ID;
Id ptrId = GetArgumentId(0);
if(ptrId == DXILDebug::INVALID_ID)
break;
{
auto itPtr = m_Memory.m_AllocPointers.find(ptrId);
RDCASSERT(itPtr != m_Memory.m_AllocPointers.end());
@@ -5834,14 +5839,10 @@ void ThreadState::PerformGPUResourceOp(const rdcarray<ThreadState> &workgroups,
{
if(uvDDXY[i])
{
Id id = GetArgumentId(3 + i);
if(id != DXILDebug::INVALID_ID)
{
delta = DDX(false, opCode, dxOpCode, workgroups, id);
ddx.value.f32v[i] = delta.f32v[0];
delta = DDY(false, opCode, dxOpCode, workgroups, id);
ddy.value.f32v[i] = delta.f32v[0];
}
delta = DDX(false, opCode, dxOpCode, workgroups, inst.args[3 + i]);
ddx.value.f32v[i] = delta.f32v[0];
delta = DDY(false, opCode, dxOpCode, workgroups, inst.args[3 + i]);
ddy.value.f32v[i] = delta.f32v[0];
}
}
}
@@ -6000,11 +6001,9 @@ void ThreadState::Sub(const ShaderVariable &a, const ShaderVariable &b, ShaderVa
}
ShaderValue ThreadState::DDX(bool fine, Operation opCode, DXOp dxOpCode,
const rdcarray<ThreadState> &quad, const Id &id) const
const rdcarray<ThreadState> &quad, const DXIL::Value *dxilValue) const
{
RDCASSERT(!ThreadsAreDiverged(quad));
if(id == DXILDebug::INVALID_ID)
return ShaderValue();
uint32_t index = ~0U;
int quadIndex = m_WorkgroupIndex;
@@ -6027,14 +6026,14 @@ ShaderValue ThreadState::DDX(bool fine, Operation opCode, DXOp dxOpCode,
ShaderValue ret;
ShaderVariable a;
ShaderVariable b;
RDCASSERT(quad[index + 1].GetLiveVariable(id, opCode, dxOpCode, a));
RDCASSERT(quad[index].GetLiveVariable(id, opCode, dxOpCode, b));
RDCASSERT(quad[index + 1].GetShaderVariable(dxilValue, opCode, dxOpCode, a));
RDCASSERT(quad[index].GetShaderVariable(dxilValue, opCode, dxOpCode, b));
Sub(a, b, ret);
return ret;
}
ShaderValue ThreadState::DDY(bool fine, Operation opCode, DXOp dxOpCode,
const rdcarray<ThreadState> &quad, const Id &id) const
const rdcarray<ThreadState> &quad, const DXIL::Value *dxilValue) const
{
RDCASSERT(!ThreadsAreDiverged(quad));
uint32_t index = ~0U;
@@ -6058,8 +6057,8 @@ ShaderValue ThreadState::DDY(bool fine, Operation opCode, DXOp dxOpCode,
ShaderValue ret;
ShaderVariable a;
ShaderVariable b;
RDCASSERT(quad[index + 2].GetLiveVariable(id, opCode, dxOpCode, a));
RDCASSERT(quad[index].GetLiveVariable(id, opCode, dxOpCode, b));
RDCASSERT(quad[index + 2].GetShaderVariable(dxilValue, opCode, dxOpCode, a));
RDCASSERT(quad[index].GetShaderVariable(dxilValue, opCode, dxOpCode, b));
Sub(a, b, ret);
return ret;
}
renderdoc/driver/shaders/dxil/dxil_debug.h
+2 -2
View File
@@ -251,9 +251,9 @@ struct ThreadState
void Sub(const ShaderVariable &a, const ShaderVariable &b, ShaderValue &ret) const;
ShaderValue DDX(bool fine, DXIL::Operation opCode, DXIL::DXOp dxOpCode,
const rdcarray<ThreadState> &quad, const Id &id) const;
const rdcarray<ThreadState> &quad, const DXIL::Value *dxilValue) const;
ShaderValue DDY(bool fine, DXIL::Operation opCode, DXIL::DXOp dxOpCode,
const rdcarray<ThreadState> &quad, const Id &id) const;
const rdcarray<ThreadState> &quad, const DXIL::Value *dxilValue) const;
void ProcessScopeChange(const rdcarray<bool> &oldLive, const rdcarray<bool> &newLive);