Run formatter
TBR=dneto@google.com
Change-Id: Idccbc5eeec6d763cdacd8d050bb396a0c897c7ca
Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/19400
Reviewed-by: dan sinclair <dsinclair@google.com>
diff --git a/src/reader/spirv/function_arithmetic_test.cc b/src/reader/spirv/function_arithmetic_test.cc
index 426e80e..0b61c09 100644
--- a/src/reader/spirv/function_arithmetic_test.cc
+++ b/src/reader/spirv/function_arithmetic_test.cc
@@ -12,12 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/reader/spirv/function.h"
-
#include <string>
#include <vector>
#include "gmock/gmock.h"
+#include "src/reader/spirv/function.h"
#include "src/reader/spirv/parser_impl.h"
#include "src/reader/spirv/parser_impl_test_helper.h"
#include "src/reader/spirv/spirv_tools_helpers_test.h"
@@ -137,50 +136,38 @@
<< "\n " << GetParam().ast_rhs;
EXPECT_THAT(ToString(fe.ast_body()), HasSubstr(ss.str())) << assembly;
}
-INSTANTIATE_TEST_SUITE_P(SpvParserTest,
- SpvBinaryTest,
- ::testing::Values(
- // Both uint
- BinaryData{
- "uint", "uint_10", "OpIAdd", "uint_20", "__u32",
- "ScalarConstructor{10}", "add",
- "ScalarConstructor{20}"},
- // Both int
- BinaryData{
- "int", "int_30", "OpIAdd", "int_40", "__i32",
- "ScalarConstructor{30}", "add",
- "ScalarConstructor{40}"},
- // Mixed, returning uint
- BinaryData{
- "uint", "int_30", "OpIAdd", "uint_10", "__u32",
- "ScalarConstructor{30}", "add",
- "ScalarConstructor{10}"},
- // Mixed, returning int
- BinaryData{
- "int", "int_30", "OpIAdd", "uint_10", "__i32",
- "ScalarConstructor{30}", "add",
- "ScalarConstructor{10}"},
- // Both v2uint
- BinaryData{
- "v2uint", "v2uint_10_20", "OpIAdd", "v2uint_20_10", "__vec_2__u32",
- AstFor("v2uint_10_20"), "add",
- AstFor("v2uint_20_10")},
- // Both v2int
- BinaryData{
- "v2int", "v2int_30_40", "OpIAdd", "v2int_40_30", "__vec_2__i32",
- AstFor("v2int_30_40"), "add",
- AstFor("v2int_40_30")},
- // Mixed, returning v2uint
- BinaryData{
- "v2uint", "v2int_30_40", "OpIAdd", "v2uint_10_20", "__vec_2__u32",
- AstFor("v2int_30_40"), "add",
- AstFor("v2uint_10_20")},
- // Mixed, returning v2int
- BinaryData{
- "v2int", "v2int_40_30", "OpIAdd", "v2uint_20_10", "__vec_2__i32",
- AstFor("v2int_40_30"), "add",
- AstFor("v2uint_20_10")}
- ));
+INSTANTIATE_TEST_SUITE_P(
+ SpvParserTest,
+ SpvBinaryTest,
+ ::testing::Values(
+ // Both uint
+ BinaryData{"uint", "uint_10", "OpIAdd", "uint_20", "__u32",
+ "ScalarConstructor{10}", "add", "ScalarConstructor{20}"},
+ // Both int
+ BinaryData{"int", "int_30", "OpIAdd", "int_40", "__i32",
+ "ScalarConstructor{30}", "add", "ScalarConstructor{40}"},
+ // Mixed, returning uint
+ BinaryData{"uint", "int_30", "OpIAdd", "uint_10", "__u32",
+ "ScalarConstructor{30}", "add", "ScalarConstructor{10}"},
+ // Mixed, returning int
+ BinaryData{"int", "int_30", "OpIAdd", "uint_10", "__i32",
+ "ScalarConstructor{30}", "add", "ScalarConstructor{10}"},
+ // Both v2uint
+ BinaryData{"v2uint", "v2uint_10_20", "OpIAdd", "v2uint_20_10",
+ "__vec_2__u32", AstFor("v2uint_10_20"), "add",
+ AstFor("v2uint_20_10")},
+ // Both v2int
+ BinaryData{"v2int", "v2int_30_40", "OpIAdd", "v2int_40_30",
+ "__vec_2__i32", AstFor("v2int_30_40"), "add",
+ AstFor("v2int_40_30")},
+ // Mixed, returning v2uint
+ BinaryData{"v2uint", "v2int_30_40", "OpIAdd", "v2uint_10_20",
+ "__vec_2__u32", AstFor("v2int_30_40"), "add",
+ AstFor("v2uint_10_20")},
+ // Mixed, returning v2int
+ BinaryData{"v2int", "v2int_40_30", "OpIAdd", "v2uint_20_10",
+ "__vec_2__i32", AstFor("v2int_40_30"), "add",
+ AstFor("v2uint_20_10")}));
} // namespace
} // namespace spirv
diff --git a/src/reader/spirv/function_memory_test.cc b/src/reader/spirv/function_memory_test.cc
index 1067fa2..4b9899b 100644
--- a/src/reader/spirv/function_memory_test.cc
+++ b/src/reader/spirv/function_memory_test.cc
@@ -12,12 +12,11 @@
// See the License for the specific language governing permissions and
// limitations under the License.
-#include "src/reader/spirv/function.h"
-
#include <string>
#include <vector>
#include "gmock/gmock.h"
+#include "src/reader/spirv/function.h"
#include "src/reader/spirv/parser_impl.h"
#include "src/reader/spirv/parser_impl_test_helper.h"
#include "src/reader/spirv/spirv_tools_helpers_test.h"
diff --git a/src/writer/spirv/builder_ident_expression_test.cc b/src/writer/spirv/builder_ident_expression_test.cc
index d38a3b9..699de11 100644
--- a/src/writer/spirv/builder_ident_expression_test.cc
+++ b/src/writer/spirv/builder_ident_expression_test.cc
@@ -15,20 +15,20 @@
#include <memory>
#include "gtest/gtest.h"
+#include "src/ast/binary_expression.h"
#include "src/ast/float_literal.h"
#include "src/ast/identifier_expression.h"
+#include "src/ast/int_literal.h"
#include "src/ast/scalar_constructor_expression.h"
-#include "src/ast/type/i32_type.h"
#include "src/ast/type/f32_type.h"
-#include "src/context.h"
-#include "src/type_determiner.h"
+#include "src/ast/type/i32_type.h"
#include "src/ast/type/vector_type.h"
#include "src/ast/type_constructor_expression.h"
#include "src/ast/variable.h"
-#include "src/ast/int_literal.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/ast/binary_expression.h"
namespace tint {
namespace writer {
@@ -185,7 +185,7 @@
ast::Variable var("var", ast::StorageClass::kNone, &i32);
var.set_constructor(std::make_unique<ast::ScalarConstructorExpression>(
- std::make_unique<ast::IntLiteral>(&i32, 2)));
+ std::make_unique<ast::IntLiteral>(&i32, 2)));
var.set_is_const(true);
td.RegisterVariableForTesting(&var);
