inspector: Expose map of names to constant IDs
This will be needed by Dawn to handle overriding pipeline constants by name in the API. Bug: tint:755 Change-Id: I857d8ef086b1964dac8d5cfff5c78d794234e8a8 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/50843 Commit-Queue: James Price <jrprice@google.com> Reviewed-by: Ben Clayton <bclayton@google.com> Reviewed-by: Ryan Harrison <rharrison@chromium.org>
This commit is contained in:
parent
60ade8939a
commit
2edb8d4064
|
@ -275,7 +275,8 @@ std::string Inspector::GetRemappedNameForEntryPoint(
|
||||||
std::map<uint32_t, Scalar> Inspector::GetConstantIDs() {
|
std::map<uint32_t, Scalar> Inspector::GetConstantIDs() {
|
||||||
std::map<uint32_t, Scalar> result;
|
std::map<uint32_t, Scalar> result;
|
||||||
for (auto* var : program_->AST().GlobalVariables()) {
|
for (auto* var : program_->AST().GlobalVariables()) {
|
||||||
if (!ast::HasDecoration<ast::OverrideDecoration>(var->decorations())) {
|
auto* sem_var = program_->Sem().Get(var);
|
||||||
|
if (!sem_var->IsPipelineConstant()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -283,7 +284,7 @@ std::map<uint32_t, Scalar> Inspector::GetConstantIDs() {
|
||||||
// WGSL, so the resolver should catch it. Thus here the inspector just
|
// WGSL, so the resolver should catch it. Thus here the inspector just
|
||||||
// assumes all definitions of the constant id are the same, so only needs
|
// assumes all definitions of the constant id are the same, so only needs
|
||||||
// to find the first reference to constant id.
|
// to find the first reference to constant id.
|
||||||
uint32_t constant_id = var->constant_id();
|
uint32_t constant_id = sem_var->ConstantId();
|
||||||
if (result.find(constant_id) != result.end()) {
|
if (result.find(constant_id) != result.end()) {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
@ -342,6 +343,18 @@ std::map<uint32_t, Scalar> Inspector::GetConstantIDs() {
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
std::map<std::string, uint32_t> Inspector::GetConstantNameToIdMap() {
|
||||||
|
std::map<std::string, uint32_t> result;
|
||||||
|
for (auto* var : program_->AST().GlobalVariables()) {
|
||||||
|
auto* sem_var = program_->Sem().Get(var);
|
||||||
|
if (sem_var->IsPipelineConstant()) {
|
||||||
|
auto name = program_->Symbols().NameFor(var->symbol());
|
||||||
|
result[name] = sem_var->ConstantId();
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return result;
|
||||||
|
}
|
||||||
|
|
||||||
std::vector<ResourceBinding> Inspector::GetResourceBindings(
|
std::vector<ResourceBinding> Inspector::GetResourceBindings(
|
||||||
const std::string& entry_point) {
|
const std::string& entry_point) {
|
||||||
auto* func = FindEntryPointByName(entry_point);
|
auto* func = FindEntryPointByName(entry_point);
|
||||||
|
|
|
@ -151,6 +151,9 @@ class Inspector {
|
||||||
/// @returns map of const_id to initial value
|
/// @returns map of const_id to initial value
|
||||||
std::map<uint32_t, Scalar> GetConstantIDs();
|
std::map<uint32_t, Scalar> GetConstantIDs();
|
||||||
|
|
||||||
|
/// @returns map of module-constant name to pipeline constant ID
|
||||||
|
std::map<std::string, uint32_t> GetConstantNameToIdMap();
|
||||||
|
|
||||||
/// @param entry_point name of the entry point to get information about.
|
/// @param entry_point name of the entry point to get information about.
|
||||||
/// @returns vector of all of the resource bindings.
|
/// @returns vector of all of the resource bindings.
|
||||||
std::vector<ResourceBinding> GetResourceBindings(
|
std::vector<ResourceBinding> GetResourceBindings(
|
||||||
|
|
|
@ -21,6 +21,7 @@
|
||||||
#include "src/sem/depth_texture_type.h"
|
#include "src/sem/depth_texture_type.h"
|
||||||
#include "src/sem/multisampled_texture_type.h"
|
#include "src/sem/multisampled_texture_type.h"
|
||||||
#include "src/sem/sampled_texture_type.h"
|
#include "src/sem/sampled_texture_type.h"
|
||||||
|
#include "src/sem/variable.h"
|
||||||
#include "tint/tint.h"
|
#include "tint/tint.h"
|
||||||
|
|
||||||
namespace tint {
|
namespace tint {
|
||||||
|
@ -137,21 +138,45 @@ class InspectorHelper : public ProgramBuilder {
|
||||||
return Func(caller, ast::VariableList(), ty.void_(), stmts, decorations);
|
return Func(caller, ast::VariableList(), ty.void_(), stmts, decorations);
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Add a Constant ID to the global variables.
|
/// Add a pipeline constant to the global variables, with a specific ID.
|
||||||
/// @param name name of the variable to add
|
/// @param name name of the variable to add
|
||||||
/// @param id id number for the constant id
|
/// @param id id number for the constant id
|
||||||
/// @param type type of the variable
|
/// @param type type of the variable
|
||||||
/// @param val value to initialize the variable with, if NULL no initializer
|
/// @param val value to initialize the variable with, if NULL no initializer
|
||||||
/// will be added.
|
/// will be added.
|
||||||
|
/// @returns the constant that was created
|
||||||
template <class T>
|
template <class T>
|
||||||
void AddConstantID(std::string name, uint32_t id, ast::Type* type, T* val) {
|
ast::Variable* AddConstantWithID(std::string name,
|
||||||
|
uint32_t id,
|
||||||
|
ast::Type* type,
|
||||||
|
T* val) {
|
||||||
ast::Expression* constructor = nullptr;
|
ast::Expression* constructor = nullptr;
|
||||||
if (val) {
|
if (val) {
|
||||||
constructor = Expr(*val);
|
constructor = Expr(*val);
|
||||||
}
|
}
|
||||||
GlobalConst(name, type, constructor,
|
return GlobalConst(name, type, constructor,
|
||||||
ast::DecorationList{
|
ast::DecorationList{
|
||||||
create<ast::OverrideDecoration>(id),
|
Override(id),
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
/// Add a pipeline constant to the global variables, without a specific ID.
|
||||||
|
/// @param name name of the variable to add
|
||||||
|
/// @param type type of the variable
|
||||||
|
/// @param val value to initialize the variable with, if NULL no initializer
|
||||||
|
/// will be added.
|
||||||
|
/// @returns the constant that was created
|
||||||
|
template <class T>
|
||||||
|
ast::Variable* AddConstantWithoutID(std::string name,
|
||||||
|
ast::Type* type,
|
||||||
|
T* val) {
|
||||||
|
ast::Expression* constructor = nullptr;
|
||||||
|
if (val) {
|
||||||
|
constructor = Expr(*val);
|
||||||
|
}
|
||||||
|
return GlobalConst(name, type, constructor,
|
||||||
|
ast::DecorationList{
|
||||||
|
Override(),
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -604,7 +629,7 @@ class InspectorHelper : public ProgramBuilder {
|
||||||
return ty.sampler(ast::SamplerKind::kComparisonSampler);
|
return ty.sampler(ast::SamplerKind::kComparisonSampler);
|
||||||
}
|
}
|
||||||
|
|
||||||
private:
|
protected:
|
||||||
std::unique_ptr<Program> program_;
|
std::unique_ptr<Program> program_;
|
||||||
std::unique_ptr<Inspector> inspector_;
|
std::unique_ptr<Inspector> inspector_;
|
||||||
};
|
};
|
||||||
|
@ -618,6 +643,8 @@ class InspectorGetRemappedNameForEntryPointTest : public InspectorHelper,
|
||||||
public testing::Test {};
|
public testing::Test {};
|
||||||
class InspectorGetConstantIDsTest : public InspectorHelper,
|
class InspectorGetConstantIDsTest : public InspectorHelper,
|
||||||
public testing::Test {};
|
public testing::Test {};
|
||||||
|
class InspectorGetConstantNameToIdMapTest : public InspectorHelper,
|
||||||
|
public testing::Test {};
|
||||||
class InspectorGetResourceBindingsTest : public InspectorHelper,
|
class InspectorGetResourceBindingsTest : public InspectorHelper,
|
||||||
public testing::Test {};
|
public testing::Test {};
|
||||||
class InspectorGetUniformBufferResourceBindingsTest : public InspectorHelper,
|
class InspectorGetUniformBufferResourceBindingsTest : public InspectorHelper,
|
||||||
|
@ -1484,9 +1511,9 @@ TEST_F(InspectorGetRemappedNameForEntryPointTest,
|
||||||
TEST_F(InspectorGetConstantIDsTest, Bool) {
|
TEST_F(InspectorGetConstantIDsTest, Bool) {
|
||||||
bool val_true = true;
|
bool val_true = true;
|
||||||
bool val_false = false;
|
bool val_false = false;
|
||||||
AddConstantID<bool>("foo", 1, ty.bool_(), nullptr);
|
AddConstantWithID<bool>("foo", 1, ty.bool_(), nullptr);
|
||||||
AddConstantID<bool>("bar", 20, ty.bool_(), &val_true);
|
AddConstantWithID<bool>("bar", 20, ty.bool_(), &val_true);
|
||||||
AddConstantID<bool>("baz", 300, ty.bool_(), &val_false);
|
AddConstantWithID<bool>("baz", 300, ty.bool_(), &val_false);
|
||||||
|
|
||||||
Inspector& inspector = Build();
|
Inspector& inspector = Build();
|
||||||
|
|
||||||
|
@ -1507,8 +1534,8 @@ TEST_F(InspectorGetConstantIDsTest, Bool) {
|
||||||
|
|
||||||
TEST_F(InspectorGetConstantIDsTest, U32) {
|
TEST_F(InspectorGetConstantIDsTest, U32) {
|
||||||
uint32_t val = 42;
|
uint32_t val = 42;
|
||||||
AddConstantID<uint32_t>("foo", 1, ty.u32(), nullptr);
|
AddConstantWithID<uint32_t>("foo", 1, ty.u32(), nullptr);
|
||||||
AddConstantID<uint32_t>("bar", 20, ty.u32(), &val);
|
AddConstantWithID<uint32_t>("bar", 20, ty.u32(), &val);
|
||||||
|
|
||||||
Inspector& inspector = Build();
|
Inspector& inspector = Build();
|
||||||
|
|
||||||
|
@ -1526,9 +1553,9 @@ TEST_F(InspectorGetConstantIDsTest, U32) {
|
||||||
TEST_F(InspectorGetConstantIDsTest, I32) {
|
TEST_F(InspectorGetConstantIDsTest, I32) {
|
||||||
int32_t val_neg = -42;
|
int32_t val_neg = -42;
|
||||||
int32_t val_pos = 42;
|
int32_t val_pos = 42;
|
||||||
AddConstantID<int32_t>("foo", 1, ty.i32(), nullptr);
|
AddConstantWithID<int32_t>("foo", 1, ty.i32(), nullptr);
|
||||||
AddConstantID<int32_t>("bar", 20, ty.i32(), &val_neg);
|
AddConstantWithID<int32_t>("bar", 20, ty.i32(), &val_neg);
|
||||||
AddConstantID<int32_t>("baz", 300, ty.i32(), &val_pos);
|
AddConstantWithID<int32_t>("baz", 300, ty.i32(), &val_pos);
|
||||||
|
|
||||||
Inspector& inspector = Build();
|
Inspector& inspector = Build();
|
||||||
|
|
||||||
|
@ -1551,10 +1578,10 @@ TEST_F(InspectorGetConstantIDsTest, Float) {
|
||||||
float val_zero = 0.0f;
|
float val_zero = 0.0f;
|
||||||
float val_neg = -10.0f;
|
float val_neg = -10.0f;
|
||||||
float val_pos = 15.0f;
|
float val_pos = 15.0f;
|
||||||
AddConstantID<float>("foo", 1, ty.f32(), nullptr);
|
AddConstantWithID<float>("foo", 1, ty.f32(), nullptr);
|
||||||
AddConstantID<float>("bar", 20, ty.f32(), &val_zero);
|
AddConstantWithID<float>("bar", 20, ty.f32(), &val_zero);
|
||||||
AddConstantID<float>("baz", 300, ty.f32(), &val_neg);
|
AddConstantWithID<float>("baz", 300, ty.f32(), &val_neg);
|
||||||
AddConstantID<float>("x", 4000, ty.f32(), &val_pos);
|
AddConstantWithID<float>("x", 4000, ty.f32(), &val_pos);
|
||||||
|
|
||||||
Inspector& inspector = Build();
|
Inspector& inspector = Build();
|
||||||
|
|
||||||
|
@ -1577,6 +1604,41 @@ TEST_F(InspectorGetConstantIDsTest, Float) {
|
||||||
EXPECT_FLOAT_EQ(15.0, result[4000].AsFloat());
|
EXPECT_FLOAT_EQ(15.0, result[4000].AsFloat());
|
||||||
}
|
}
|
||||||
|
|
||||||
|
TEST_F(InspectorGetConstantNameToIdMapTest, WithAndWithoutIds) {
|
||||||
|
AddConstantWithID<float>("v1", 1, ty.f32(), nullptr);
|
||||||
|
AddConstantWithID<float>("v20", 20, ty.f32(), nullptr);
|
||||||
|
AddConstantWithID<float>("v300", 300, ty.f32(), nullptr);
|
||||||
|
auto* a = AddConstantWithoutID<float>("a", ty.f32(), nullptr);
|
||||||
|
auto* b = AddConstantWithoutID<float>("b", ty.f32(), nullptr);
|
||||||
|
auto* c = AddConstantWithoutID<float>("c", ty.f32(), nullptr);
|
||||||
|
|
||||||
|
Inspector& inspector = Build();
|
||||||
|
|
||||||
|
auto result = inspector.GetConstantNameToIdMap();
|
||||||
|
ASSERT_EQ(6u, result.size());
|
||||||
|
|
||||||
|
ASSERT_TRUE(result.count("v1"));
|
||||||
|
EXPECT_EQ(result["v1"], 1u);
|
||||||
|
|
||||||
|
ASSERT_TRUE(result.count("v20"));
|
||||||
|
EXPECT_EQ(result["v20"], 20u);
|
||||||
|
|
||||||
|
ASSERT_TRUE(result.count("v300"));
|
||||||
|
EXPECT_EQ(result["v300"], 300u);
|
||||||
|
|
||||||
|
ASSERT_TRUE(result.count("a"));
|
||||||
|
ASSERT_TRUE(program_->Sem().Get(a));
|
||||||
|
EXPECT_EQ(result["a"], program_->Sem().Get(a)->ConstantId());
|
||||||
|
|
||||||
|
ASSERT_TRUE(result.count("b"));
|
||||||
|
ASSERT_TRUE(program_->Sem().Get(b));
|
||||||
|
EXPECT_EQ(result["b"], program_->Sem().Get(b)->ConstantId());
|
||||||
|
|
||||||
|
ASSERT_TRUE(result.count("c"));
|
||||||
|
ASSERT_TRUE(program_->Sem().Get(c));
|
||||||
|
EXPECT_EQ(result["c"], program_->Sem().Get(c)->ConstantId());
|
||||||
|
}
|
||||||
|
|
||||||
TEST_F(InspectorGetResourceBindingsTest, Empty) {
|
TEST_F(InspectorGetResourceBindingsTest, Empty) {
|
||||||
MakeCallerBodyFunction("ep_func", {},
|
MakeCallerBodyFunction("ep_func", {},
|
||||||
ast::DecorationList{
|
ast::DecorationList{
|
||||||
|
|
Loading…
Reference in New Issue