[msl-writer] Add array accessors.
This CL adds the code to emit array accessors from the MSL backend.. Bug: tint:8 Change-Id: Ia6b49c11602d39aa559feac31fcfd592ab54928c Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/24000 Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
parent
d1bf87b9d8
commit
dc841f1bf2
1
BUILD.gn
1
BUILD.gn
|
@ -884,6 +884,7 @@ source_set("tint_unittests_wgsl_writer_src") {
|
||||||
|
|
||||||
source_set("tint_unittests_msl_writer_src") {
|
source_set("tint_unittests_msl_writer_src") {
|
||||||
sources = [
|
sources = [
|
||||||
|
"src/writer/msl/generator_impl_array_accessor_test.cc",
|
||||||
"src/writer/msl/generator_impl_as_test.cc",
|
"src/writer/msl/generator_impl_as_test.cc",
|
||||||
"src/writer/msl/generator_impl_assign_test.cc",
|
"src/writer/msl/generator_impl_assign_test.cc",
|
||||||
"src/writer/msl/generator_impl_binary_test.cc",
|
"src/writer/msl/generator_impl_binary_test.cc",
|
||||||
|
|
|
@ -492,6 +492,7 @@ endif()
|
||||||
|
|
||||||
if(${TINT_BUILD_MSL_WRITER})
|
if(${TINT_BUILD_MSL_WRITER})
|
||||||
list(APPEND TINT_TEST_SRCS
|
list(APPEND TINT_TEST_SRCS
|
||||||
|
writer/msl/generator_impl_array_accessor_test.cc
|
||||||
writer/msl/generator_impl_as_test.cc
|
writer/msl/generator_impl_as_test.cc
|
||||||
writer/msl/generator_impl_assign_test.cc
|
writer/msl/generator_impl_assign_test.cc
|
||||||
writer/msl/generator_impl_binary_test.cc
|
writer/msl/generator_impl_binary_test.cc
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
|
|
||||||
#include "src/writer/msl/generator_impl.h"
|
#include "src/writer/msl/generator_impl.h"
|
||||||
|
|
||||||
|
#include "src/ast/array_accessor_expression.h"
|
||||||
#include "src/ast/as_expression.h"
|
#include "src/ast/as_expression.h"
|
||||||
#include "src/ast/assignment_statement.h"
|
#include "src/ast/assignment_statement.h"
|
||||||
#include "src/ast/binary_expression.h"
|
#include "src/ast/binary_expression.h"
|
||||||
|
@ -62,6 +63,20 @@ bool GeneratorImpl::Generate(const ast::Module& module) {
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
bool GeneratorImpl::EmitArrayAccessor(ast::ArrayAccessorExpression* expr) {
|
||||||
|
if (!EmitExpression(expr->array())) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
out_ << "[";
|
||||||
|
|
||||||
|
if (!EmitExpression(expr->idx_expr())) {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
out_ << "]";
|
||||||
|
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
bool GeneratorImpl::EmitAs(ast::AsExpression* expr) {
|
bool GeneratorImpl::EmitAs(ast::AsExpression* expr) {
|
||||||
out_ << "as_type<";
|
out_ << "as_type<";
|
||||||
if (!EmitType(expr->type(), "")) {
|
if (!EmitType(expr->type(), "")) {
|
||||||
|
@ -251,6 +266,9 @@ bool GeneratorImpl::EmitLiteral(ast::Literal* lit) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GeneratorImpl::EmitExpression(ast::Expression* expr) {
|
bool GeneratorImpl::EmitExpression(ast::Expression* expr) {
|
||||||
|
if (expr->IsArrayAccessor()) {
|
||||||
|
return EmitArrayAccessor(expr->AsArrayAccessor());
|
||||||
|
}
|
||||||
if (expr->IsAs()) {
|
if (expr->IsAs()) {
|
||||||
return EmitAs(expr->AsAs());
|
return EmitAs(expr->AsAs());
|
||||||
}
|
}
|
||||||
|
|
|
@ -40,6 +40,10 @@ class GeneratorImpl : public TextGenerator {
|
||||||
/// @returns true on successful generation; false otherwise
|
/// @returns true on successful generation; false otherwise
|
||||||
bool Generate(const ast::Module& module);
|
bool Generate(const ast::Module& module);
|
||||||
|
|
||||||
|
/// Handles an array accessor expression
|
||||||
|
/// @param expr the expression to emit
|
||||||
|
/// @returns true if the array accessor was emitted
|
||||||
|
bool EmitArrayAccessor(ast::ArrayAccessorExpression* expr);
|
||||||
/// Handles generating an as expression
|
/// Handles generating an as expression
|
||||||
/// @param expr the as expression
|
/// @param expr the as expression
|
||||||
/// @returns true if the as was emitted
|
/// @returns true if the as was emitted
|
||||||
|
|
|
@ -0,0 +1,59 @@
|
||||||
|
// 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/identifier_expression.h"
|
||||||
|
#include "src/ast/scalar_constructor_expression.h"
|
||||||
|
#include "src/ast/sint_literal.h"
|
||||||
|
#include "src/ast/type/i32_type.h"
|
||||||
|
#include "src/writer/msl/generator_impl.h"
|
||||||
|
|
||||||
|
namespace tint {
|
||||||
|
namespace writer {
|
||||||
|
namespace msl {
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
using MslGeneratorImplTest = testing::Test;
|
||||||
|
|
||||||
|
TEST_F(MslGeneratorImplTest, EmitExpression_ArrayAccessor) {
|
||||||
|
ast::type::I32Type i32;
|
||||||
|
auto lit = std::make_unique<ast::SintLiteral>(&i32, 5);
|
||||||
|
auto idx = std::make_unique<ast::ScalarConstructorExpression>(std::move(lit));
|
||||||
|
auto ary = std::make_unique<ast::IdentifierExpression>("ary");
|
||||||
|
|
||||||
|
ast::ArrayAccessorExpression expr(std::move(ary), std::move(idx));
|
||||||
|
|
||||||
|
GeneratorImpl g;
|
||||||
|
ASSERT_TRUE(g.EmitExpression(&expr)) << g.error();
|
||||||
|
EXPECT_EQ(g.result(), "ary[5]");
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_F(MslGeneratorImplTest, EmitArrayAccessor) {
|
||||||
|
auto ary = std::make_unique<ast::IdentifierExpression>("ary");
|
||||||
|
auto idx = std::make_unique<ast::IdentifierExpression>("idx");
|
||||||
|
|
||||||
|
ast::ArrayAccessorExpression expr(std::move(ary), std::move(idx));
|
||||||
|
|
||||||
|
GeneratorImpl g;
|
||||||
|
ASSERT_TRUE(g.EmitArrayAccessor(&expr)) << g.error();
|
||||||
|
EXPECT_EQ(g.result(), "ary[idx]");
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
} // namespace msl
|
||||||
|
} // namespace writer
|
||||||
|
} // namespace tint
|
Loading…
Reference in New Issue