[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>
diff --git a/BUILD.gn b/BUILD.gn
index 69cf8b8..b9b93bf 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -884,6 +884,7 @@
source_set("tint_unittests_msl_writer_src") {
sources = [
+ "src/writer/msl/generator_impl_array_accessor_test.cc",
"src/writer/msl/generator_impl_as_test.cc",
"src/writer/msl/generator_impl_assign_test.cc",
"src/writer/msl/generator_impl_binary_test.cc",
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index fbf8a75..a08940d 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -492,6 +492,7 @@
if(${TINT_BUILD_MSL_WRITER})
list(APPEND TINT_TEST_SRCS
+ writer/msl/generator_impl_array_accessor_test.cc
writer/msl/generator_impl_as_test.cc
writer/msl/generator_impl_assign_test.cc
writer/msl/generator_impl_binary_test.cc
diff --git a/src/writer/msl/generator_impl.cc b/src/writer/msl/generator_impl.cc
index 7935c46..6190f19 100644
--- a/src/writer/msl/generator_impl.cc
+++ b/src/writer/msl/generator_impl.cc
@@ -14,6 +14,7 @@
#include "src/writer/msl/generator_impl.h"
+#include "src/ast/array_accessor_expression.h"
#include "src/ast/as_expression.h"
#include "src/ast/assignment_statement.h"
#include "src/ast/binary_expression.h"
@@ -62,6 +63,20 @@
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) {
out_ << "as_type<";
if (!EmitType(expr->type(), "")) {
@@ -251,6 +266,9 @@
}
bool GeneratorImpl::EmitExpression(ast::Expression* expr) {
+ if (expr->IsArrayAccessor()) {
+ return EmitArrayAccessor(expr->AsArrayAccessor());
+ }
if (expr->IsAs()) {
return EmitAs(expr->AsAs());
}
diff --git a/src/writer/msl/generator_impl.h b/src/writer/msl/generator_impl.h
index 319690e..7e93178 100644
--- a/src/writer/msl/generator_impl.h
+++ b/src/writer/msl/generator_impl.h
@@ -40,6 +40,10 @@
/// @returns true on successful generation; false otherwise
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
/// @param expr the as expression
/// @returns true if the as was emitted
diff --git a/src/writer/msl/generator_impl_array_accessor_test.cc b/src/writer/msl/generator_impl_array_accessor_test.cc
new file mode 100644
index 0000000..5957e00
--- /dev/null
+++ b/src/writer/msl/generator_impl_array_accessor_test.cc
@@ -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
