mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-08-27 05:56:01 +00:00
58794ae118
Expand the Option argument paradigm to:
* Remove the requirement to always pass a 'type' parameter. Type inferencing is the easier, and increasingly common way to declare a variable, so this prevents a whole lot of `nullptr` smell which negatively impacts readability.
* Accept attributes directly as arguments, removing the `utils::Vector{ ... }` smell.
Rename `ProgramBuilder::VarOptionals` to `VarOptions`, and add equivalent `LetOptions`, `ConstOptions` and `OverrideOptions`.
Clean up all the calls to `Var()`, `Let()`, `Const()` and `Override()`:
* Use the `Group()` and `Binding()` helpers where possible
* Removing `nullptr` type arguments
* Replace attribute vectors with the list of attributes.
* Remove already-defaulted `ast::StorageClass::kNone` arguments.
* Remove already-defaulted `ast::Access::kUndefined` arguments.
Finally, remove the `GroupAndBinding()` helper, which only existed because you needed to pass attributes as a vector.
Change-Id: I8890e4eb0ffac9f9df2207b28a6f02a163e34d96
Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/99580
Reviewed-by: Antonio Maiorano <amaiorano@google.com>
Commit-Queue: Ben Clayton <bclayton@chromium.org>
232 lines
8.6 KiB
C++
232 lines
8.6 KiB
C++
// Copyright 2020 The Tint Authors.
|
|
//
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
#include "src/tint/writer/msl/test_helper.h"
|
|
|
|
namespace tint::writer::msl {
|
|
namespace {
|
|
|
|
struct BinaryData {
|
|
const char* result;
|
|
ast::BinaryOp op;
|
|
};
|
|
inline std::ostream& operator<<(std::ostream& out, BinaryData data) {
|
|
out << data.op;
|
|
return out;
|
|
}
|
|
using MslBinaryTest = TestParamHelper<BinaryData>;
|
|
TEST_P(MslBinaryTest, Emit) {
|
|
auto params = GetParam();
|
|
|
|
auto type = [&] {
|
|
return ((params.op == ast::BinaryOp::kLogicalAnd) ||
|
|
(params.op == ast::BinaryOp::kLogicalOr))
|
|
? static_cast<const ast::Type*>(ty.bool_())
|
|
: static_cast<const ast::Type*>(ty.u32());
|
|
};
|
|
|
|
auto* left = Var("left", type());
|
|
auto* right = Var("right", type());
|
|
|
|
auto* expr = create<ast::BinaryExpression>(params.op, Expr(left), Expr(right));
|
|
WrapInFunction(left, right, expr);
|
|
|
|
GeneratorImpl& gen = Build();
|
|
|
|
std::stringstream out;
|
|
ASSERT_TRUE(gen.EmitExpression(out, expr)) << gen.error();
|
|
EXPECT_EQ(out.str(), params.result);
|
|
}
|
|
INSTANTIATE_TEST_SUITE_P(
|
|
MslGeneratorImplTest,
|
|
MslBinaryTest,
|
|
testing::Values(BinaryData{"(left & right)", ast::BinaryOp::kAnd},
|
|
BinaryData{"(left | right)", ast::BinaryOp::kOr},
|
|
BinaryData{"(left ^ right)", ast::BinaryOp::kXor},
|
|
BinaryData{"(left && right)", ast::BinaryOp::kLogicalAnd},
|
|
BinaryData{"(left || right)", ast::BinaryOp::kLogicalOr},
|
|
BinaryData{"(left == right)", ast::BinaryOp::kEqual},
|
|
BinaryData{"(left != right)", ast::BinaryOp::kNotEqual},
|
|
BinaryData{"(left < right)", ast::BinaryOp::kLessThan},
|
|
BinaryData{"(left > right)", ast::BinaryOp::kGreaterThan},
|
|
BinaryData{"(left <= right)", ast::BinaryOp::kLessThanEqual},
|
|
BinaryData{"(left >= right)", ast::BinaryOp::kGreaterThanEqual},
|
|
BinaryData{"(left << right)", ast::BinaryOp::kShiftLeft},
|
|
BinaryData{"(left >> right)", ast::BinaryOp::kShiftRight},
|
|
BinaryData{"(left + right)", ast::BinaryOp::kAdd},
|
|
BinaryData{"(left - right)", ast::BinaryOp::kSubtract},
|
|
BinaryData{"(left * right)", ast::BinaryOp::kMultiply},
|
|
BinaryData{"(left / right)", ast::BinaryOp::kDivide},
|
|
BinaryData{"(left % right)", ast::BinaryOp::kModulo}));
|
|
|
|
using MslBinaryTest_SignedOverflowDefinedBehaviour = TestParamHelper<BinaryData>;
|
|
TEST_P(MslBinaryTest_SignedOverflowDefinedBehaviour, Emit) {
|
|
auto params = GetParam();
|
|
|
|
auto* a_type = ty.i32();
|
|
auto* b_type =
|
|
(params.op == ast::BinaryOp::kShiftLeft || params.op == ast::BinaryOp::kShiftRight)
|
|
? static_cast<const ast::Type*>(ty.u32())
|
|
: ty.i32();
|
|
|
|
auto* a = Var("a", a_type);
|
|
auto* b = Var("b", b_type);
|
|
|
|
auto* expr = create<ast::BinaryExpression>(params.op, Expr(a), Expr(b));
|
|
WrapInFunction(a, b, expr);
|
|
|
|
GeneratorImpl& gen = Build();
|
|
|
|
std::stringstream out;
|
|
ASSERT_TRUE(gen.EmitExpression(out, expr)) << gen.error();
|
|
EXPECT_EQ(out.str(), params.result);
|
|
}
|
|
using Op = ast::BinaryOp;
|
|
constexpr BinaryData signed_overflow_defined_behaviour_cases[] = {
|
|
{"as_type<int>((as_type<uint>(a) << b))", Op::kShiftLeft},
|
|
{"(a >> b)", Op::kShiftRight},
|
|
{"as_type<int>((as_type<uint>(a) + as_type<uint>(b)))", Op::kAdd},
|
|
{"as_type<int>((as_type<uint>(a) - as_type<uint>(b)))", Op::kSubtract},
|
|
{"as_type<int>((as_type<uint>(a) * as_type<uint>(b)))", Op::kMultiply}};
|
|
INSTANTIATE_TEST_SUITE_P(MslGeneratorImplTest,
|
|
MslBinaryTest_SignedOverflowDefinedBehaviour,
|
|
testing::ValuesIn(signed_overflow_defined_behaviour_cases));
|
|
|
|
using MslBinaryTest_SignedOverflowDefinedBehaviour_Chained = TestParamHelper<BinaryData>;
|
|
TEST_P(MslBinaryTest_SignedOverflowDefinedBehaviour_Chained, Emit) {
|
|
auto params = GetParam();
|
|
|
|
auto* a_type = ty.i32();
|
|
auto* b_type =
|
|
(params.op == ast::BinaryOp::kShiftLeft || params.op == ast::BinaryOp::kShiftRight)
|
|
? static_cast<const ast::Type*>(ty.u32())
|
|
: ty.i32();
|
|
|
|
auto* a = Var("a", a_type);
|
|
auto* b = Var("b", b_type);
|
|
|
|
auto* expr1 = create<ast::BinaryExpression>(params.op, Expr(a), Expr(b));
|
|
auto* expr2 = create<ast::BinaryExpression>(params.op, expr1, Expr(b));
|
|
WrapInFunction(a, b, expr2);
|
|
|
|
GeneratorImpl& gen = Build();
|
|
|
|
std::stringstream out;
|
|
ASSERT_TRUE(gen.EmitExpression(out, expr2)) << gen.error();
|
|
EXPECT_EQ(out.str(), params.result);
|
|
}
|
|
using Op = ast::BinaryOp;
|
|
constexpr BinaryData signed_overflow_defined_behaviour_chained_cases[] = {
|
|
{"as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(a) << b))) << "
|
|
"b))",
|
|
Op::kShiftLeft},
|
|
{"((a >> b) >> b)", Op::kShiftRight},
|
|
{"as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(a) + "
|
|
"as_type<uint>(b)))) + as_type<uint>(b)))",
|
|
Op::kAdd},
|
|
{"as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(a) - "
|
|
"as_type<uint>(b)))) - as_type<uint>(b)))",
|
|
Op::kSubtract},
|
|
{"as_type<int>((as_type<uint>(as_type<int>((as_type<uint>(a) * "
|
|
"as_type<uint>(b)))) * as_type<uint>(b)))",
|
|
Op::kMultiply}};
|
|
INSTANTIATE_TEST_SUITE_P(MslGeneratorImplTest,
|
|
MslBinaryTest_SignedOverflowDefinedBehaviour_Chained,
|
|
testing::ValuesIn(signed_overflow_defined_behaviour_chained_cases));
|
|
|
|
TEST_F(MslBinaryTest, ModF32) {
|
|
auto* left = Var("left", ty.f32());
|
|
auto* right = Var("right", ty.f32());
|
|
auto* expr = create<ast::BinaryExpression>(ast::BinaryOp::kModulo, Expr(left), Expr(right));
|
|
WrapInFunction(left, right, expr);
|
|
|
|
GeneratorImpl& gen = Build();
|
|
|
|
std::stringstream out;
|
|
ASSERT_TRUE(gen.EmitExpression(out, expr)) << gen.error();
|
|
EXPECT_EQ(out.str(), "fmod(left, right)");
|
|
}
|
|
|
|
TEST_F(MslBinaryTest, ModF16) {
|
|
Enable(ast::Extension::kF16);
|
|
|
|
auto* left = Var("left", ty.f16());
|
|
auto* right = Var("right", ty.f16());
|
|
auto* expr = create<ast::BinaryExpression>(ast::BinaryOp::kModulo, Expr(left), Expr(right));
|
|
WrapInFunction(left, right, expr);
|
|
|
|
GeneratorImpl& gen = Build();
|
|
|
|
std::stringstream out;
|
|
ASSERT_TRUE(gen.EmitExpression(out, expr)) << gen.error();
|
|
EXPECT_EQ(out.str(), "fmod(left, right)");
|
|
}
|
|
|
|
TEST_F(MslBinaryTest, ModVec3F32) {
|
|
auto* left = Var("left", ty.vec3<f32>());
|
|
auto* right = Var("right", ty.vec3<f32>());
|
|
auto* expr = create<ast::BinaryExpression>(ast::BinaryOp::kModulo, Expr(left), Expr(right));
|
|
WrapInFunction(left, right, expr);
|
|
|
|
GeneratorImpl& gen = Build();
|
|
|
|
std::stringstream out;
|
|
ASSERT_TRUE(gen.EmitExpression(out, expr)) << gen.error();
|
|
EXPECT_EQ(out.str(), "fmod(left, right)");
|
|
}
|
|
|
|
TEST_F(MslBinaryTest, ModVec3F16) {
|
|
Enable(ast::Extension::kF16);
|
|
|
|
auto* left = Var("left", ty.vec3<f16>());
|
|
auto* right = Var("right", ty.vec3<f16>());
|
|
auto* expr = create<ast::BinaryExpression>(ast::BinaryOp::kModulo, Expr(left), Expr(right));
|
|
WrapInFunction(left, right, expr);
|
|
|
|
GeneratorImpl& gen = Build();
|
|
|
|
std::stringstream out;
|
|
ASSERT_TRUE(gen.EmitExpression(out, expr)) << gen.error();
|
|
EXPECT_EQ(out.str(), "fmod(left, right)");
|
|
}
|
|
|
|
TEST_F(MslBinaryTest, BoolAnd) {
|
|
auto* left = Var("left", Expr(true));
|
|
auto* right = Var("right", Expr(false));
|
|
auto* expr = create<ast::BinaryExpression>(ast::BinaryOp::kAnd, Expr(left), Expr(right));
|
|
WrapInFunction(left, right, expr);
|
|
|
|
GeneratorImpl& gen = Build();
|
|
|
|
std::stringstream out;
|
|
ASSERT_TRUE(gen.EmitExpression(out, expr)) << gen.error();
|
|
EXPECT_EQ(out.str(), "bool(left & right)");
|
|
}
|
|
|
|
TEST_F(MslBinaryTest, BoolOr) {
|
|
auto* left = Var("left", Expr(true));
|
|
auto* right = Var("right", Expr(false));
|
|
auto* expr = create<ast::BinaryExpression>(ast::BinaryOp::kOr, Expr(left), Expr(right));
|
|
WrapInFunction(left, right, expr);
|
|
|
|
GeneratorImpl& gen = Build();
|
|
|
|
std::stringstream out;
|
|
ASSERT_TRUE(gen.EmitExpression(out, expr)) << gen.error();
|
|
EXPECT_EQ(out.str(), "bool(left | right)");
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace tint::writer::msl
|