Skip to content

S
swiftshader
Commit 00e4a7cc by Ben Clayton
Options

SpirvShaderDebugger: Implement globals, stub array types

Bug: b/148401179 Change-Id: Ic432d5e82793a1a4395365846d3c3c4205fdf7ba Reviewed-on: https://swiftshader-review.googlesource.com/c/SwiftShader/+/44288 Kokoro-Result: kokoro <noreply+kokoro@google.com> Tested-by: 's avatarBen Clayton <bclayton@google.com> Reviewed-by: 's avatarAntonio Maiorano <amaiorano@google.com>
parent 0d6791c2
Showing with 56 additions and 2 deletions
src/Pipeline/SpirvShaderDebugger.cpp
...@@ -106,6 +106,7 @@ struct Object ...@@ -106,6 +106,7 @@ struct Object
Expression, Expression,
Function, Function,
InlinedAt, InlinedAt,
GlobalVariable,
LocalVariable, LocalVariable,
Member, Member,
Operation, Operation,
...@@ -119,6 +120,7 @@ struct Object ...@@ -119,6 +120,7 @@ struct Object
// Types // Types
BasicType, BasicType,
ArrayType,
VectorType, VectorType,
FunctionType, FunctionType,
CompositeType, CompositeType,
...@@ -146,6 +148,7 @@ constexpr const char *cstr(Object::Kind k) ...@@ -146,6 +148,7 @@ constexpr const char *cstr(Object::Kind k)
case Object::Kind::Expression: return "Expression"; case Object::Kind::Expression: return "Expression";
case Object::Kind::Function: return "Function"; case Object::Kind::Function: return "Function";
case Object::Kind::InlinedAt: return "InlinedAt"; case Object::Kind::InlinedAt: return "InlinedAt";
case Object::Kind::GlobalVariable: return "GlobalVariable";
case Object::Kind::LocalVariable: return "LocalVariable"; case Object::Kind::LocalVariable: return "LocalVariable";
case Object::Kind::Member: return "Member"; case Object::Kind::Member: return "Member";
case Object::Kind::Operation: return "Operation"; case Object::Kind::Operation: return "Operation";
...@@ -155,6 +158,7 @@ constexpr const char *cstr(Object::Kind k) ...@@ -155,6 +158,7 @@ constexpr const char *cstr(Object::Kind k)
case Object::Kind::CompilationUnit: return "CompilationUnit"; case Object::Kind::CompilationUnit: return "CompilationUnit";
case Object::Kind::LexicalBlock: return "LexicalBlock"; case Object::Kind::LexicalBlock: return "LexicalBlock";
case Object::Kind::BasicType: return "BasicType"; case Object::Kind::BasicType: return "BasicType";
case Object::Kind::ArrayType: return "ArrayType";
case Object::Kind::VectorType: return "VectorType"; case Object::Kind::VectorType: return "VectorType";
case Object::Kind::FunctionType: return "FunctionType"; case Object::Kind::FunctionType: return "FunctionType";
case Object::Kind::CompositeType: return "CompositeType"; case Object::Kind::CompositeType: return "CompositeType";
...@@ -227,6 +231,7 @@ struct Type : public Object ...@@ -227,6 +231,7 @@ struct Type : public Object
static constexpr bool kindof(Kind kind) static constexpr bool kindof(Kind kind)
{ {
return kind == Kind::BasicType || return kind == Kind::BasicType ||
kind == Kind::ArrayType ||
kind == Kind::VectorType || kind == Kind::VectorType ||
kind == Kind::FunctionType || kind == Kind::FunctionType ||
kind == Kind::CompositeType; kind == Kind::CompositeType;
...@@ -254,6 +259,12 @@ struct BasicType : ObjectImpl<BasicType, Type, Object::Kind::BasicType> ...@@ -254,6 +259,12 @@ struct BasicType : ObjectImpl<BasicType, Type, Object::Kind::BasicType>
OpenCLDebugInfo100DebugBaseTypeAttributeEncoding encoding = OpenCLDebugInfo100Unspecified; OpenCLDebugInfo100DebugBaseTypeAttributeEncoding encoding = OpenCLDebugInfo100Unspecified;
}; };
struct ArrayType : ObjectImpl<ArrayType, Type, Object::Kind::ArrayType>
{
Type *base = nullptr;
std::vector<uint32_t> dimensions;
};
struct VectorType : ObjectImpl<VectorType, Type, Object::Kind::VectorType> struct VectorType : ObjectImpl<VectorType, Type, Object::Kind::VectorType>
{ {
Type *base = nullptr; Type *base = nullptr;
...@@ -326,6 +337,19 @@ struct SourceScope : ObjectImpl<SourceScope, Object, Object::Kind::SourceScope> ...@@ -326,6 +337,19 @@ struct SourceScope : ObjectImpl<SourceScope, Object, Object::Kind::SourceScope>
InlinedAt *inlinedAt = nullptr; InlinedAt *inlinedAt = nullptr;
}; };
struct GlobalVariable : ObjectImpl<GlobalVariable, Object, Object::Kind::GlobalVariable>
{
std::string name;
Type *type = nullptr;
Source *source = nullptr;
uint32_t line = 0;
uint32_t column = 0;
Scope *parent = nullptr;
std::string linkage;
sw::SpirvShader::Object::ID variable;
uint32_t flags = 0; // OR'd from OpenCLDebugInfo100DebugInfoFlags
};
struct LocalVariable : ObjectImpl<LocalVariable, Object, Object::Kind::LocalVariable> struct LocalVariable : ObjectImpl<LocalVariable, Object, Object::Kind::LocalVariable>
{ {
static constexpr uint32_t NoArg = ~uint32_t(0); static constexpr uint32_t NoArg = ~uint32_t(0);
...@@ -889,6 +913,14 @@ void SpirvShader::Impl::Debugger::process(const SpirvShader *shader, const InsnI ...@@ -889,6 +913,14 @@ void SpirvShader::Impl::Debugger::process(const SpirvShader *shader, const InsnI
type->encoding = static_cast<OpenCLDebugInfo100DebugBaseTypeAttributeEncoding>(insn.word(7)); type->encoding = static_cast<OpenCLDebugInfo100DebugBaseTypeAttributeEncoding>(insn.word(7));
}); });
break; break;
case OpenCLDebugInfo100DebugTypeArray:
defineOrEmit(insn, pass, [&](debug::ArrayType *type) {
type->base = get(debug::Type::ID(insn.word(5)));
auto &components = shader->getObject(insn.word(6));
ASSERT(components.kind == SpirvShader::Object::Kind::Constant);
type->dimensions = components.constantValue;
});
break;
case OpenCLDebugInfo100DebugTypeVector: case OpenCLDebugInfo100DebugTypeVector:
defineOrEmit(insn, pass, [&](debug::VectorType *type) { defineOrEmit(insn, pass, [&](debug::VectorType *type) {
type->base = get(debug::Type::ID(insn.word(5))); type->base = get(debug::Type::ID(insn.word(5)));
...@@ -939,6 +971,22 @@ void SpirvShader::Impl::Debugger::process(const SpirvShader *shader, const InsnI ...@@ -939,6 +971,22 @@ void SpirvShader::Impl::Debugger::process(const SpirvShader *shader, const InsnI
member->flags = insn.word(13); member->flags = insn.word(13);
}); });
break; break;
case OpenCLDebugInfo100DebugGlobalVariable:
defineOrEmit(insn, pass, [&](debug::GlobalVariable *var) {
var->name = shader->getString(insn.word(5));
var->type = get(debug::Type::ID(insn.word(6)));
var->source = get(debug::Source::ID(insn.word(7)));
var->line = insn.word(8);
var->column = insn.word(9);
var->parent = get(debug::Scope::ID(insn.word(10)));
var->linkage = shader->getString(insn.word(11));
var->variable = insn.word(12);
var->flags = insn.word(13);
// static member declaration: word(14)
exposeVariable(shader, var->name.c_str(), &debug::Scope::Root, var->type, var->variable, state);
});
break;
case OpenCLDebugInfo100DebugFunction: case OpenCLDebugInfo100DebugFunction:
defineOrEmit(insn, pass, [&](debug::Function *func) { defineOrEmit(insn, pass, [&](debug::Function *func) {
func->name = shader->getString(insn.word(5)); func->name = shader->getString(insn.word(5));
...@@ -1061,7 +1109,6 @@ void SpirvShader::Impl::Debugger::process(const SpirvShader *shader, const InsnI ...@@ -1061,7 +1109,6 @@ void SpirvShader::Impl::Debugger::process(const SpirvShader *shader, const InsnI
case OpenCLDebugInfo100DebugTypePointer: case OpenCLDebugInfo100DebugTypePointer:
case OpenCLDebugInfo100DebugTypeQualifier: case OpenCLDebugInfo100DebugTypeQualifier:
case OpenCLDebugInfo100DebugTypeArray:
case OpenCLDebugInfo100DebugTypedef: case OpenCLDebugInfo100DebugTypedef:
case OpenCLDebugInfo100DebugTypeEnum: case OpenCLDebugInfo100DebugTypeEnum:
case OpenCLDebugInfo100DebugTypeInheritance: case OpenCLDebugInfo100DebugTypeInheritance:
...@@ -1070,7 +1117,6 @@ void SpirvShader::Impl::Debugger::process(const SpirvShader *shader, const InsnI ...@@ -1070,7 +1117,6 @@ void SpirvShader::Impl::Debugger::process(const SpirvShader *shader, const InsnI
case OpenCLDebugInfo100DebugTypeTemplateParameter: case OpenCLDebugInfo100DebugTypeTemplateParameter:
case OpenCLDebugInfo100DebugTypeTemplateTemplateParameter: case OpenCLDebugInfo100DebugTypeTemplateTemplateParameter:
case OpenCLDebugInfo100DebugTypeTemplateParameterPack: case OpenCLDebugInfo100DebugTypeTemplateParameterPack:
case OpenCLDebugInfo100DebugGlobalVariable:
case OpenCLDebugInfo100DebugFunctionDeclaration: case OpenCLDebugInfo100DebugFunctionDeclaration:
case OpenCLDebugInfo100DebugLexicalBlockDiscriminator: case OpenCLDebugInfo100DebugLexicalBlockDiscriminator:
case OpenCLDebugInfo100DebugInlinedVariable: case OpenCLDebugInfo100DebugInlinedVariable:
...@@ -1285,6 +1331,14 @@ void SpirvShader::Impl::Debugger::exposeVariable( ...@@ -1285,6 +1331,14 @@ void SpirvShader::Impl::Debugger::exposeVariable(
return; return;
} }
else if(auto ty = debug::cast<debug::ArrayType>(type))
{
// TODO(bclayton): Expose array types.
}
else
{
UNIMPLEMENTED("b/145351270: Debug type: %s", cstr(type->kind));
}
} }
// No debug type information. Derive from SPIR-V. // No debug type information. Derive from SPIR-V.
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment