encounter
/
dawn-cmake
mirror of https://github.com/encounter/dawn-cmake.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

tint/inspector: Fix GetOverrideDefaultValues() 

Override values no longer need to be a literal.
Use the constant value to infer the initializer value.

Bug: chromium:1362256
Change-Id: Ie0eef49291c568fef2197dfa91fcb5f3e3197d65
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/105960
Auto-Submit: Ben Clayton <bclayton@google.com>
Reviewed-by: Corentin Wallez <cwallez@chromium.org>
Commit-Queue: Corentin Wallez <cwallez@chromium.org>
Kokoro: Kokoro <noreply+kokoro@google.com>
This commit is contained in:
Ben Clayton 2022-10-14 12:09:59 +00:00 committed by Dawn LUCI CQ
parent ec7ba9f1f8
commit aecf1a2ab5
2 changed files with 85 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
src/tint/inspector/inspector.cc
View File

@ -29,6 +29,7 @@
#include "src/tint/ast/override.h" #include "src/tint/ast/override.h"
#include "src/tint/ast/var.h" #include "src/tint/ast/var.h"
#include "src/tint/sem/array.h" #include "src/tint/sem/array.h"
#include "src/tint/sem/bool.h"
#include "src/tint/sem/call.h" #include "src/tint/sem/call.h"
#include "src/tint/sem/depth_multisampled_texture.h" #include "src/tint/sem/depth_multisampled_texture.h"
#include "src/tint/sem/depth_texture.h" #include "src/tint/sem/depth_texture.h"
@ -301,40 +302,19 @@ std::map<OverrideId, Scalar> Inspector::GetOverrideDefaultValues() {
continue; continue;
} }
if (!var->constructor) { if (global->Constructor()) {
result[override_id] = Scalar(); if (auto* value = global->Constructor()->ConstantValue()) {
continue; result[override_id] = Switch(
} value->Type(), //
[&](const sem::I32*) { return Scalar(value->As<i32>()); },
auto* literal = var->constructor->As<ast::LiteralExpression>(); [&](const sem::U32*) { return Scalar(value->As<u32>()); },
if (!literal) { [&](const sem::F32*) { return Scalar(value->As<f32>()); },
// This is invalid WGSL, but handling gracefully. [&](const sem::Bool*) { return Scalar(value->As<bool>()); });
result[override_id] = Scalar();
continue;
}
if (auto* l = literal->As<ast::BoolLiteralExpression>()) {
result[override_id] = Scalar(l->value);
continue;
}
if (auto* l = literal->As<ast::IntLiteralExpression>()) {
switch (l->suffix) {
case ast::IntLiteralExpression::Suffix::kNone:
case ast::IntLiteralExpression::Suffix::kI:
result[override_id] = Scalar(static_cast<int32_t>(l->value));
continue;
case ast::IntLiteralExpression::Suffix::kU:
result[override_id] = Scalar(static_cast<uint32_t>(l->value));
continue; continue;
} }
} }
if (auto* l = literal->As<ast::FloatLiteralExpression>()) { // No const-expression initializer for the override
result[override_id] = Scalar(static_cast<float>(l->value));
continue;
}
result[override_id] = Scalar(); result[override_id] = Scalar();
} }

90
src/tint/inspector/inspector_test.cc
View File

@ -1269,14 +1269,17 @@ INSTANTIATE_TEST_SUITE_P(
InterpolationType::kFlat, InterpolationSampling::kNone})); InterpolationType::kFlat, InterpolationSampling::kNone}));
TEST_F(InspectorGetOverrideDefaultValuesTest, Bool) { TEST_F(InspectorGetOverrideDefaultValuesTest, Bool) {
Override("foo", ty.bool_(), Id(1_a)); GlobalConst("C", Expr(true));
Override("bar", ty.bool_(), Expr(true), Id(20_a)); Override("a", ty.bool_(), Id(1_a));
Override("baz", ty.bool_(), Expr(false), Id(300_a)); Override("b", ty.bool_(), Expr(true), Id(20_a));
Override("c", Expr(false), Id(300_a));
Override("d", Or(true, false), Id(400_a));
Override("e", Expr("C"), Id(500_a));
Inspector& inspector = Build(); Inspector& inspector = Build();
auto result = inspector.GetOverrideDefaultValues(); auto result = inspector.GetOverrideDefaultValues();
ASSERT_EQ(3u, result.size()); ASSERT_EQ(5u, result.size());
ASSERT_TRUE(result.find(OverrideId{1}) != result.end()); ASSERT_TRUE(result.find(OverrideId{1}) != result.end());
EXPECT_TRUE(result[OverrideId{1}].IsNull()); EXPECT_TRUE(result[OverrideId{1}].IsNull());
@ -1288,16 +1291,29 @@ TEST_F(InspectorGetOverrideDefaultValuesTest, Bool) {
ASSERT_TRUE(result.find(OverrideId{300}) != result.end()); ASSERT_TRUE(result.find(OverrideId{300}) != result.end());
EXPECT_TRUE(result[OverrideId{300}].IsBool()); EXPECT_TRUE(result[OverrideId{300}].IsBool());
EXPECT_FALSE(result[OverrideId{300}].AsBool()); EXPECT_FALSE(result[OverrideId{300}].AsBool());
ASSERT_TRUE(result.find(OverrideId{400}) != result.end());
EXPECT_TRUE(result[OverrideId{400}].IsBool());
EXPECT_TRUE(result[OverrideId{400}].AsBool());
ASSERT_TRUE(result.find(OverrideId{500}) != result.end());
EXPECT_TRUE(result[OverrideId{500}].IsBool());
EXPECT_TRUE(result[OverrideId{500}].AsBool());
} }
TEST_F(InspectorGetOverrideDefaultValuesTest, U32) { TEST_F(InspectorGetOverrideDefaultValuesTest, U32) {
Override("foo", ty.u32(), Id(1_a)); GlobalConst("C", Expr(100_u));
Override("bar", ty.u32(), Expr(42_u), Id(20_a)); Override("a", ty.u32(), Id(1_a));
Override("b", ty.u32(), Expr(42_u), Id(20_a));
Override("c", ty.u32(), Expr(42_a), Id(30_a));
Override("d", ty.u32(), Add(42_a, 10_a), Id(40_a));
Override("e", Add(42_a, 10_u), Id(50_a));
Override("f", Expr("C"), Id(60_a));
Inspector& inspector = Build(); Inspector& inspector = Build();
auto result = inspector.GetOverrideDefaultValues(); auto result = inspector.GetOverrideDefaultValues();
ASSERT_EQ(2u, result.size()); ASSERT_EQ(6u, result.size());
ASSERT_TRUE(result.find(OverrideId{1}) != result.end()); ASSERT_TRUE(result.find(OverrideId{1}) != result.end());
EXPECT_TRUE(result[OverrideId{1}].IsNull()); EXPECT_TRUE(result[OverrideId{1}].IsNull());
@ -1305,17 +1321,37 @@ TEST_F(InspectorGetOverrideDefaultValuesTest, U32) {
ASSERT_TRUE(result.find(OverrideId{20}) != result.end()); ASSERT_TRUE(result.find(OverrideId{20}) != result.end());
EXPECT_TRUE(result[OverrideId{20}].IsU32()); EXPECT_TRUE(result[OverrideId{20}].IsU32());
EXPECT_EQ(42u, result[OverrideId{20}].AsU32()); EXPECT_EQ(42u, result[OverrideId{20}].AsU32());
ASSERT_TRUE(result.find(OverrideId{30}) != result.end());
EXPECT_TRUE(result[OverrideId{30}].IsU32());
EXPECT_EQ(42u, result[OverrideId{30}].AsU32());
ASSERT_TRUE(result.find(OverrideId{40}) != result.end());
EXPECT_TRUE(result[OverrideId{40}].IsU32());
EXPECT_EQ(52u, result[OverrideId{40}].AsU32());
ASSERT_TRUE(result.find(OverrideId{50}) != result.end());
EXPECT_TRUE(result[OverrideId{50}].IsU32());
EXPECT_EQ(52u, result[OverrideId{50}].AsU32());
ASSERT_TRUE(result.find(OverrideId{60}) != result.end());
EXPECT_TRUE(result[OverrideId{60}].IsU32());
EXPECT_EQ(100u, result[OverrideId{60}].AsU32());
} }
TEST_F(InspectorGetOverrideDefaultValuesTest, I32) { TEST_F(InspectorGetOverrideDefaultValuesTest, I32) {
Override("foo", ty.i32(), Id(1_a)); GlobalConst("C", Expr(100_a));
Override("bar", ty.i32(), Expr(-42_i), Id(20_a)); Override("a", ty.i32(), Id(1_a));
Override("baz", ty.i32(), Expr(42_i), Id(300_a)); Override("b", ty.i32(), Expr(-42_i), Id(20_a));
Override("c", ty.i32(), Expr(42_i), Id(300_a));
Override("d", Expr(42_a), Id(400_a));
Override("e", Add(42_a, 7_a), Id(500_a));
Override("f", Expr("C"), Id(6000_a));
Inspector& inspector = Build(); Inspector& inspector = Build();
auto result = inspector.GetOverrideDefaultValues(); auto result = inspector.GetOverrideDefaultValues();
ASSERT_EQ(3u, result.size()); ASSERT_EQ(6u, result.size());
ASSERT_TRUE(result.find(OverrideId{1}) != result.end()); ASSERT_TRUE(result.find(OverrideId{1}) != result.end());
EXPECT_TRUE(result[OverrideId{1}].IsNull()); EXPECT_TRUE(result[OverrideId{1}].IsNull());
@ -1327,18 +1363,32 @@ TEST_F(InspectorGetOverrideDefaultValuesTest, I32) {
ASSERT_TRUE(result.find(OverrideId{300}) != result.end()); ASSERT_TRUE(result.find(OverrideId{300}) != result.end());
EXPECT_TRUE(result[OverrideId{300}].IsI32()); EXPECT_TRUE(result[OverrideId{300}].IsI32());
EXPECT_EQ(42, result[OverrideId{300}].AsI32()); EXPECT_EQ(42, result[OverrideId{300}].AsI32());
ASSERT_TRUE(result.find(OverrideId{400}) != result.end());
EXPECT_TRUE(result[OverrideId{400}].IsI32());
EXPECT_EQ(42, result[OverrideId{400}].AsI32());
ASSERT_TRUE(result.find(OverrideId{500}) != result.end());
EXPECT_TRUE(result[OverrideId{500}].IsI32());
EXPECT_EQ(49, result[OverrideId{500}].AsI32());
ASSERT_TRUE(result.find(OverrideId{6000}) != result.end());
EXPECT_TRUE(result[OverrideId{6000}].IsI32());
EXPECT_EQ(100, result[OverrideId{6000}].AsI32());
} }
TEST_F(InspectorGetOverrideDefaultValuesTest, Float) { TEST_F(InspectorGetOverrideDefaultValuesTest, Float) {
Override("foo", ty.f32(), Id(1_a)); Override("a", ty.f32(), Id(1_a));
Override("bar", ty.f32(), Expr(0_f), Id(20_a)); Override("b", ty.f32(), Expr(0_f), Id(20_a));
Override("baz", ty.f32(), Expr(-10_f), Id(300_a)); Override("c", ty.f32(), Expr(-10_f), Id(300_a));
Override("x", ty.f32(), Expr(15_f), Id(4000_a)); Override("d", Expr(15_f), Id(4000_a));
Override("3", Expr(42.0_a), Id(5000_a));
Override("e", ty.f32(), Mul(15_f, 10_a), Id(6000_a));
Inspector& inspector = Build(); Inspector& inspector = Build();
auto result = inspector.GetOverrideDefaultValues(); auto result = inspector.GetOverrideDefaultValues();
ASSERT_EQ(4u, result.size()); ASSERT_EQ(6u, result.size());
ASSERT_TRUE(result.find(OverrideId{1}) != result.end()); ASSERT_TRUE(result.find(OverrideId{1}) != result.end());
EXPECT_TRUE(result[OverrideId{1}].IsNull()); EXPECT_TRUE(result[OverrideId{1}].IsNull());
@ -1354,6 +1404,14 @@ TEST_F(InspectorGetOverrideDefaultValuesTest, Float) {
ASSERT_TRUE(result.find(OverrideId{4000}) != result.end()); ASSERT_TRUE(result.find(OverrideId{4000}) != result.end());
EXPECT_TRUE(result[OverrideId{4000}].IsFloat()); EXPECT_TRUE(result[OverrideId{4000}].IsFloat());
EXPECT_FLOAT_EQ(15.0f, result[OverrideId{4000}].AsFloat()); EXPECT_FLOAT_EQ(15.0f, result[OverrideId{4000}].AsFloat());
ASSERT_TRUE(result.find(OverrideId{5000}) != result.end());
EXPECT_TRUE(result[OverrideId{5000}].IsFloat());
EXPECT_FLOAT_EQ(42.0f, result[OverrideId{5000}].AsFloat());
ASSERT_TRUE(result.find(OverrideId{6000}) != result.end());
EXPECT_TRUE(result[OverrideId{6000}].IsFloat());
EXPECT_FLOAT_EQ(150.0f, result[OverrideId{6000}].AsFloat());
} }
TEST_F(InspectorGetConstantNameToIdMapTest, WithAndWithoutIds) { TEST_F(InspectorGetConstantNameToIdMapTest, WithAndWithoutIds) {