[hlsl-writer] Emit array accessors.
This CL adds array accessor expressions to the HLSL backend. Bug: tint:7 Change-Id: I46d60f5d8ef74fee2a2f4da48c2d792969bfa365 Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/25820 Reviewed-by: David Neto <dneto@google.com>
This commit is contained in:
parent
0e48082549
commit
ec007b98c7
1
BUILD.gn
1
BUILD.gn
|
@ -1042,6 +1042,7 @@ source_set("tint_unittests_msl_writer_src") {
|
||||||
source_set("tint_unittests_hlsl_writer_src") {
|
source_set("tint_unittests_hlsl_writer_src") {
|
||||||
sources = [
|
sources = [
|
||||||
"src/writer/hlsl/generator_impl_alias_type_test.cc",
|
"src/writer/hlsl/generator_impl_alias_type_test.cc",
|
||||||
|
"src/writer/hlsl/generator_impl_array_accessor_test.cc",
|
||||||
"src/writer/hlsl/generator_impl_assign_test.cc",
|
"src/writer/hlsl/generator_impl_assign_test.cc",
|
||||||
"src/writer/hlsl/generator_impl_binary_test.cc",
|
"src/writer/hlsl/generator_impl_binary_test.cc",
|
||||||
"src/writer/hlsl/generator_impl_break_test.cc",
|
"src/writer/hlsl/generator_impl_break_test.cc",
|
||||||
|
|
|
@ -550,6 +550,7 @@ endif()
|
||||||
if (${TINT_BUILD_HLSL_WRITER})
|
if (${TINT_BUILD_HLSL_WRITER})
|
||||||
list(APPEND TINT_TEST_SRCS
|
list(APPEND TINT_TEST_SRCS
|
||||||
writer/hlsl/generator_impl_alias_type_test.cc
|
writer/hlsl/generator_impl_alias_type_test.cc
|
||||||
|
writer/hlsl/generator_impl_array_accessor_test.cc
|
||||||
writer/hlsl/generator_impl_assign_test.cc
|
writer/hlsl/generator_impl_assign_test.cc
|
||||||
writer/hlsl/generator_impl_binary_test.cc
|
writer/hlsl/generator_impl_binary_test.cc
|
||||||
writer/hlsl/generator_impl_break_test.cc
|
writer/hlsl/generator_impl_break_test.cc
|
||||||
|
|
|
@ -14,6 +14,7 @@
|
||||||
|
|
||||||
#include "src/writer/hlsl/generator_impl.h"
|
#include "src/writer/hlsl/generator_impl.h"
|
||||||
|
|
||||||
|
#include "src/ast/array_accessor_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"
|
||||||
#include "src/ast/bool_literal.h"
|
#include "src/ast/bool_literal.h"
|
||||||
|
@ -102,6 +103,20 @@ bool GeneratorImpl::EmitAliasType(const ast::type::AliasType* alias) {
|
||||||
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::EmitAssign(ast::AssignmentStatement* stmt) {
|
bool GeneratorImpl::EmitAssign(ast::AssignmentStatement* stmt) {
|
||||||
make_indent();
|
make_indent();
|
||||||
|
|
||||||
|
@ -311,6 +326,9 @@ bool GeneratorImpl::EmitContinue(ast::ContinueStatement*) {
|
||||||
}
|
}
|
||||||
|
|
||||||
bool GeneratorImpl::EmitExpression(ast::Expression* expr) {
|
bool GeneratorImpl::EmitExpression(ast::Expression* expr) {
|
||||||
|
if (expr->IsArrayAccessor()) {
|
||||||
|
return EmitArrayAccessor(expr->AsArrayAccessor());
|
||||||
|
}
|
||||||
if (expr->IsBinary()) {
|
if (expr->IsBinary()) {
|
||||||
return EmitBinary(expr->AsBinary());
|
return EmitBinary(expr->AsBinary());
|
||||||
}
|
}
|
||||||
|
|
|
@ -42,6 +42,10 @@ class GeneratorImpl : public TextGenerator {
|
||||||
/// @param alias the alias to generate
|
/// @param alias the alias to generate
|
||||||
/// @returns true if the alias was emitted
|
/// @returns true if the alias was emitted
|
||||||
bool EmitAliasType(const ast::type::AliasType* alias);
|
bool EmitAliasType(const ast::type::AliasType* alias);
|
||||||
|
/// 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 an assignment statement
|
/// Handles an assignment statement
|
||||||
/// @param stmt the statement to emit
|
/// @param stmt the statement to emit
|
||||||
/// @returns true if the statement was emitted successfully
|
/// @returns true if the statement was emitted successfully
|
||||||
|
|
|
@ -0,0 +1,62 @@
|
||||||
|
// 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/module.h"
|
||||||
|
#include "src/ast/scalar_constructor_expression.h"
|
||||||
|
#include "src/ast/sint_literal.h"
|
||||||
|
#include "src/ast/type/i32_type.h"
|
||||||
|
#include "src/writer/hlsl/generator_impl.h"
|
||||||
|
|
||||||
|
namespace tint {
|
||||||
|
namespace writer {
|
||||||
|
namespace hlsl {
|
||||||
|
namespace {
|
||||||
|
|
||||||
|
using HlslGeneratorImplTest = testing::Test;
|
||||||
|
|
||||||
|
TEST_F(HlslGeneratorImplTest, 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));
|
||||||
|
|
||||||
|
ast::Module m;
|
||||||
|
GeneratorImpl g(&m);
|
||||||
|
ASSERT_TRUE(g.EmitExpression(&expr)) << g.error();
|
||||||
|
EXPECT_EQ(g.result(), "ary[5]");
|
||||||
|
}
|
||||||
|
|
||||||
|
TEST_F(HlslGeneratorImplTest, 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));
|
||||||
|
|
||||||
|
ast::Module m;
|
||||||
|
GeneratorImpl g(&m);
|
||||||
|
ASSERT_TRUE(g.EmitExpression(&expr)) << g.error();
|
||||||
|
EXPECT_EQ(g.result(), "ary[idx]");
|
||||||
|
}
|
||||||
|
|
||||||
|
} // namespace
|
||||||
|
} // namespace hlsl
|
||||||
|
} // namespace writer
|
||||||
|
} // namespace tint
|
Loading…
Reference in New Issue