mirror of
https://github.com/encounter/dawn-cmake.git
synced 2025-06-05 06:03:34 +00:00
4bfe461646
Remove all redundant std::move()s. I've also removed calls to
std::move() in tests, even if they act as an optimization. This is for
two reasons:
(a) Performance is not important for testing, and this helps with
readability.
(b) A whole bunch tests were relying on std::move() clearing vectors so
they can be repopulated and used again. This is undefined behavior:
> Objects of types defined in the C++ standard library may be moved from
> (12.8). Move operations may be explicitly specified or implicitly
> generated. Unless otherwise specified, such moved-from objects shall
> be placed in a valid but unspecified state.
All of these UB cases have been fixed.
Removed all duplicate variables left over from:
`auto* foo_ptr = foo.get()`
which became:
`auto* foo_ptr = foo`
Bug: tint:322
Change-Id: Ibd08a2379671382320fd4d8da296ccc6a378b8af
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/32900
Commit-Queue: Ben Clayton <bclayton@google.com>
Reviewed-by: dan sinclair <dsinclair@chromium.org>
404 lines
12 KiB
C++
404 lines
12 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 <memory>
|
|
|
|
#include "gtest/gtest.h"
|
|
#include "src/ast/array_accessor_expression.h"
|
|
#include "src/ast/assignment_statement.h"
|
|
#include "src/ast/float_literal.h"
|
|
#include "src/ast/identifier_expression.h"
|
|
#include "src/ast/member_accessor_expression.h"
|
|
#include "src/ast/scalar_constructor_expression.h"
|
|
#include "src/ast/sint_literal.h"
|
|
#include "src/ast/struct.h"
|
|
#include "src/ast/struct_member.h"
|
|
#include "src/ast/type/f32_type.h"
|
|
#include "src/ast/type/i32_type.h"
|
|
#include "src/ast/type/struct_type.h"
|
|
#include "src/ast/type/vector_type.h"
|
|
#include "src/ast/type_constructor_expression.h"
|
|
#include "src/context.h"
|
|
#include "src/type_determiner.h"
|
|
#include "src/writer/spirv/builder.h"
|
|
#include "src/writer/spirv/spv_dump.h"
|
|
#include "src/writer/spirv/test_helper.h"
|
|
|
|
namespace tint {
|
|
namespace writer {
|
|
namespace spirv {
|
|
namespace {
|
|
|
|
using BuilderTest = TestHelper;
|
|
|
|
TEST_F(BuilderTest, Assign_Var) {
|
|
ast::type::F32Type f32;
|
|
|
|
ast::Variable v("var", ast::StorageClass::kOutput, &f32);
|
|
|
|
auto* ident = create<ast::IdentifierExpression>("var");
|
|
auto* val = create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 1.0f));
|
|
|
|
ast::AssignmentStatement assign(ident, val);
|
|
|
|
td.RegisterVariableForTesting(&v);
|
|
|
|
ASSERT_TRUE(td.DetermineResultType(&assign)) << td.error();
|
|
|
|
b.push_function(Function{});
|
|
EXPECT_TRUE(b.GenerateGlobalVariable(&v)) << b.error();
|
|
ASSERT_FALSE(b.has_error()) << b.error();
|
|
|
|
EXPECT_TRUE(b.GenerateAssignStatement(&assign)) << b.error();
|
|
EXPECT_FALSE(b.has_error());
|
|
|
|
EXPECT_EQ(DumpInstructions(b.types()), R"(%3 = OpTypeFloat 32
|
|
%2 = OpTypePointer Output %3
|
|
%4 = OpConstantNull %3
|
|
%1 = OpVariable %2 Output %4
|
|
%5 = OpConstant %3 1
|
|
)");
|
|
|
|
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()), R"(OpStore %1 %5
|
|
)");
|
|
}
|
|
|
|
TEST_F(BuilderTest, Assign_Var_ZeroConstructor) {
|
|
ast::type::F32Type f32;
|
|
ast::type::VectorType vec(&f32, 3);
|
|
|
|
ast::Variable v("var", ast::StorageClass::kOutput, &vec);
|
|
|
|
auto* ident = create<ast::IdentifierExpression>("var");
|
|
ast::ExpressionList vals;
|
|
auto* val = create<ast::TypeConstructorExpression>(&vec, vals);
|
|
|
|
ast::AssignmentStatement assign(ident, val);
|
|
|
|
td.RegisterVariableForTesting(&v);
|
|
|
|
ASSERT_TRUE(td.DetermineResultType(&assign)) << td.error();
|
|
|
|
b.push_function(Function{});
|
|
EXPECT_TRUE(b.GenerateGlobalVariable(&v)) << b.error();
|
|
ASSERT_FALSE(b.has_error()) << b.error();
|
|
|
|
EXPECT_TRUE(b.GenerateAssignStatement(&assign)) << b.error();
|
|
EXPECT_FALSE(b.has_error());
|
|
|
|
EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeFloat 32
|
|
%3 = OpTypeVector %4 3
|
|
%2 = OpTypePointer Output %3
|
|
%5 = OpConstantNull %3
|
|
%1 = OpVariable %2 Output %5
|
|
)");
|
|
|
|
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()), R"(OpStore %1 %5
|
|
)");
|
|
}
|
|
|
|
TEST_F(BuilderTest, Assign_Var_Complex_ConstructorWithExtract) {
|
|
ast::type::F32Type f32;
|
|
ast::type::VectorType vec3(&f32, 3);
|
|
ast::type::VectorType vec2(&f32, 2);
|
|
|
|
auto* first = create<ast::TypeConstructorExpression>(
|
|
&vec2, ast::ExpressionList{
|
|
create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 1.0f)),
|
|
create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 2.0f)),
|
|
});
|
|
|
|
auto* init = create<ast::TypeConstructorExpression>(
|
|
&vec3, ast::ExpressionList{
|
|
first,
|
|
create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 3.0f)),
|
|
});
|
|
|
|
ast::Variable v("var", ast::StorageClass::kOutput, &vec3);
|
|
|
|
ast::AssignmentStatement assign(create<ast::IdentifierExpression>("var"),
|
|
init);
|
|
|
|
td.RegisterVariableForTesting(&v);
|
|
ASSERT_TRUE(td.DetermineResultType(&assign)) << td.error();
|
|
|
|
b.push_function(Function{});
|
|
EXPECT_TRUE(b.GenerateGlobalVariable(&v)) << b.error();
|
|
ASSERT_FALSE(b.has_error()) << b.error();
|
|
|
|
EXPECT_TRUE(b.GenerateAssignStatement(&assign)) << b.error();
|
|
EXPECT_FALSE(b.has_error());
|
|
|
|
EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeFloat 32
|
|
%3 = OpTypeVector %4 3
|
|
%2 = OpTypePointer Output %3
|
|
%5 = OpConstantNull %3
|
|
%1 = OpVariable %2 Output %5
|
|
%6 = OpTypeVector %4 2
|
|
%7 = OpConstant %4 1
|
|
%8 = OpConstant %4 2
|
|
%9 = OpConstantComposite %6 %7 %8
|
|
%12 = OpConstant %4 3
|
|
)");
|
|
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
|
R"(%10 = OpCompositeExtract %4 %9 0
|
|
%11 = OpCompositeExtract %4 %9 1
|
|
%13 = OpCompositeConstruct %3 %10 %11 %12
|
|
OpStore %1 %13
|
|
)");
|
|
}
|
|
|
|
TEST_F(BuilderTest, Assign_Var_Complex_Constructor) {
|
|
ast::type::F32Type f32;
|
|
ast::type::VectorType vec3(&f32, 3);
|
|
|
|
ast::ExpressionList vals;
|
|
vals.push_back(create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 1.0f)));
|
|
vals.push_back(create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 2.0f)));
|
|
vals.push_back(create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 3.0f)));
|
|
|
|
auto* init = create<ast::TypeConstructorExpression>(&vec3, vals);
|
|
|
|
ast::Variable v("var", ast::StorageClass::kOutput, &vec3);
|
|
|
|
ast::AssignmentStatement assign(create<ast::IdentifierExpression>("var"),
|
|
init);
|
|
|
|
td.RegisterVariableForTesting(&v);
|
|
ASSERT_TRUE(td.DetermineResultType(&assign)) << td.error();
|
|
|
|
b.push_function(Function{});
|
|
EXPECT_TRUE(b.GenerateGlobalVariable(&v)) << b.error();
|
|
ASSERT_FALSE(b.has_error()) << b.error();
|
|
|
|
EXPECT_TRUE(b.GenerateAssignStatement(&assign)) << b.error();
|
|
EXPECT_FALSE(b.has_error());
|
|
|
|
EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeFloat 32
|
|
%3 = OpTypeVector %4 3
|
|
%2 = OpTypePointer Output %3
|
|
%5 = OpConstantNull %3
|
|
%1 = OpVariable %2 Output %5
|
|
%6 = OpConstant %4 1
|
|
%7 = OpConstant %4 2
|
|
%8 = OpConstant %4 3
|
|
%9 = OpConstantComposite %3 %6 %7 %8
|
|
)");
|
|
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()), R"(OpStore %1 %9
|
|
)");
|
|
}
|
|
|
|
TEST_F(BuilderTest, Assign_StructMember) {
|
|
ast::type::F32Type f32;
|
|
|
|
// my_struct {
|
|
// a : f32
|
|
// b : f32
|
|
// }
|
|
// var ident : my_struct
|
|
// ident.b = 4.0;
|
|
|
|
ast::StructMemberDecorationList decos;
|
|
ast::StructMemberList members;
|
|
members.push_back(create<ast::StructMember>("a", &f32, decos));
|
|
members.push_back(create<ast::StructMember>("b", &f32, decos));
|
|
|
|
auto* s = create<ast::Struct>(members);
|
|
ast::type::StructType s_type("my_struct", s);
|
|
|
|
ast::Variable v("ident", ast::StorageClass::kFunction, &s_type);
|
|
|
|
auto* ident = create<ast::MemberAccessorExpression>(
|
|
create<ast::IdentifierExpression>("ident"),
|
|
create<ast::IdentifierExpression>("b"));
|
|
|
|
auto* val = create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 4.0f));
|
|
|
|
ast::AssignmentStatement assign(ident, val);
|
|
|
|
td.RegisterVariableForTesting(&v);
|
|
|
|
ASSERT_TRUE(td.DetermineResultType(&assign)) << td.error();
|
|
|
|
b.push_function(Function{});
|
|
EXPECT_TRUE(b.GenerateGlobalVariable(&v)) << b.error();
|
|
ASSERT_FALSE(b.has_error()) << b.error();
|
|
|
|
EXPECT_TRUE(b.GenerateAssignStatement(&assign)) << b.error();
|
|
EXPECT_FALSE(b.has_error());
|
|
|
|
EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeFloat 32
|
|
%3 = OpTypeStruct %4 %4
|
|
%2 = OpTypePointer Function %3
|
|
%1 = OpVariable %2 Function
|
|
%5 = OpTypeInt 32 0
|
|
%6 = OpConstant %5 1
|
|
%7 = OpTypePointer Function %4
|
|
%9 = OpConstant %4 4
|
|
)");
|
|
|
|
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
|
R"(%8 = OpAccessChain %7 %1 %6
|
|
OpStore %8 %9
|
|
)");
|
|
}
|
|
|
|
TEST_F(BuilderTest, Assign_Vector) {
|
|
ast::type::F32Type f32;
|
|
ast::type::VectorType vec3(&f32, 3);
|
|
|
|
ast::Variable v("var", ast::StorageClass::kOutput, &vec3);
|
|
|
|
auto* ident = create<ast::IdentifierExpression>("var");
|
|
|
|
ast::ExpressionList vals;
|
|
vals.push_back(create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 1.0f)));
|
|
vals.push_back(create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 1.0f)));
|
|
vals.push_back(create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 3.0f)));
|
|
|
|
auto* val = create<ast::TypeConstructorExpression>(&vec3, vals);
|
|
|
|
ast::AssignmentStatement assign(ident, val);
|
|
|
|
td.RegisterVariableForTesting(&v);
|
|
|
|
ASSERT_TRUE(td.DetermineResultType(&assign)) << td.error();
|
|
|
|
b.push_function(Function{});
|
|
EXPECT_TRUE(b.GenerateGlobalVariable(&v)) << b.error();
|
|
ASSERT_FALSE(b.has_error()) << b.error();
|
|
|
|
EXPECT_TRUE(b.GenerateAssignStatement(&assign)) << b.error();
|
|
EXPECT_FALSE(b.has_error());
|
|
|
|
EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeFloat 32
|
|
%3 = OpTypeVector %4 3
|
|
%2 = OpTypePointer Output %3
|
|
%5 = OpConstantNull %3
|
|
%1 = OpVariable %2 Output %5
|
|
%6 = OpConstant %4 1
|
|
%7 = OpConstant %4 3
|
|
%8 = OpConstantComposite %3 %6 %6 %7
|
|
)");
|
|
|
|
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()), R"(OpStore %1 %8
|
|
)");
|
|
}
|
|
|
|
TEST_F(BuilderTest, Assign_Vector_MemberByName) {
|
|
ast::type::F32Type f32;
|
|
ast::type::VectorType vec3(&f32, 3);
|
|
|
|
// var.y = 1
|
|
|
|
ast::Variable v("var", ast::StorageClass::kOutput, &vec3);
|
|
|
|
auto* ident = create<ast::MemberAccessorExpression>(
|
|
create<ast::IdentifierExpression>("var"),
|
|
create<ast::IdentifierExpression>("y"));
|
|
auto* val = create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 1.0f));
|
|
|
|
ast::AssignmentStatement assign(ident, val);
|
|
|
|
td.RegisterVariableForTesting(&v);
|
|
|
|
ASSERT_TRUE(td.DetermineResultType(&assign)) << td.error();
|
|
|
|
b.push_function(Function{});
|
|
EXPECT_TRUE(b.GenerateGlobalVariable(&v)) << b.error();
|
|
ASSERT_FALSE(b.has_error()) << b.error();
|
|
|
|
EXPECT_TRUE(b.GenerateAssignStatement(&assign)) << b.error();
|
|
EXPECT_FALSE(b.has_error());
|
|
|
|
EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeFloat 32
|
|
%3 = OpTypeVector %4 3
|
|
%2 = OpTypePointer Output %3
|
|
%5 = OpConstantNull %3
|
|
%1 = OpVariable %2 Output %5
|
|
%6 = OpTypeInt 32 0
|
|
%7 = OpConstant %6 1
|
|
%8 = OpTypePointer Output %4
|
|
%10 = OpConstant %4 1
|
|
)");
|
|
|
|
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
|
R"(%9 = OpAccessChain %8 %1 %7
|
|
OpStore %9 %10
|
|
)");
|
|
}
|
|
|
|
TEST_F(BuilderTest, Assign_Vector_MemberByIndex) {
|
|
ast::type::I32Type i32;
|
|
ast::type::F32Type f32;
|
|
ast::type::VectorType vec3(&f32, 3);
|
|
|
|
// var[1] = 1
|
|
|
|
ast::Variable v("var", ast::StorageClass::kOutput, &vec3);
|
|
|
|
auto* ident = create<ast::ArrayAccessorExpression>(
|
|
create<ast::IdentifierExpression>("var"),
|
|
create<ast::ScalarConstructorExpression>(
|
|
create<ast::SintLiteral>(&i32, 1)));
|
|
auto* val = create<ast::ScalarConstructorExpression>(
|
|
create<ast::FloatLiteral>(&f32, 1.0f));
|
|
|
|
ast::AssignmentStatement assign(ident, val);
|
|
|
|
td.RegisterVariableForTesting(&v);
|
|
|
|
ASSERT_TRUE(td.DetermineResultType(&assign)) << td.error();
|
|
|
|
b.push_function(Function{});
|
|
EXPECT_TRUE(b.GenerateGlobalVariable(&v)) << b.error();
|
|
ASSERT_FALSE(b.has_error()) << b.error();
|
|
|
|
EXPECT_TRUE(b.GenerateAssignStatement(&assign)) << b.error();
|
|
EXPECT_FALSE(b.has_error());
|
|
|
|
EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeFloat 32
|
|
%3 = OpTypeVector %4 3
|
|
%2 = OpTypePointer Output %3
|
|
%5 = OpConstantNull %3
|
|
%1 = OpVariable %2 Output %5
|
|
%6 = OpTypeInt 32 1
|
|
%7 = OpConstant %6 1
|
|
%8 = OpTypePointer Output %4
|
|
%10 = OpConstant %4 1
|
|
)");
|
|
|
|
EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()),
|
|
R"(%9 = OpAccessChain %8 %1 %7
|
|
OpStore %9 %10
|
|
)");
|
|
}
|
|
|
|
} // namespace
|
|
} // namespace spirv
|
|
} // namespace writer
|
|
} // namespace tint
|