tint: Fix Resolver erroneously materializing matrices of abstract numeric type
ShouldMaterializeArgument must check that the deepest element is not
abstract numeric to support matrices.
This CL also enables the "no materialize" tests for binary ops, as
constant evaluation of binary addition was recently landed, and that's
what the test uses. The fix in this CL is also necessary for this test
to pass the matrix addition case (it would fail because it erroneously
materialized).
Bug: tint:1581
Change-Id: Id55341c05604c1ac560127826fc415eb38792503
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/98682
Kokoro: Kokoro <noreply+kokoro@google.com>
Reviewed-by: Ben Clayton <bclayton@google.com>
Commit-Queue: Antonio Maiorano <amaiorano@google.com>
diff --git a/src/tint/resolver/materialize_test.cc b/src/tint/resolver/materialize_test.cc
index b68bad5..26f109f 100644
--- a/src/tint/resolver/materialize_test.cc
+++ b/src/tint/resolver/materialize_test.cc
@@ -464,9 +464,10 @@
/// Methods that do not materialize
constexpr Method kNoMaterializeMethods[] = {
- Method::kPhonyAssign,
- // TODO(crbug.com/tint/1504): Enable once we have abstract overloads of builtins / binary
- // ops: Method::kBuiltinArg, Method::kBinaryOp,
+ Method::kPhonyAssign, //
+ Method::kBinaryOp,
+ // TODO(crbug.com/tint/1504): Enable once "min" supports const evaluation
+ // Method::kBuiltinArg,
};
INSTANTIATE_TEST_SUITE_P(
MaterializeScalar,
diff --git a/src/tint/resolver/resolver.cc b/src/tint/resolver/resolver.cc
index 317a91a..046cf6f 100644
--- a/src/tint/resolver/resolver.cc
+++ b/src/tint/resolver/resolver.cc
@@ -1452,7 +1452,7 @@
}
bool Resolver::ShouldMaterializeArgument(const sem::Type* parameter_ty) const {
- const auto* param_el_ty = sem::Type::ElementOf(parameter_ty);
+ const auto* param_el_ty = sem::Type::DeepestElementOf(parameter_ty);
return param_el_ty && !param_el_ty->Is<sem::AbstractNumeric>();
}
