From e3de74fd2b25d6f63454f986c0b1dfaee89b2cfb Mon Sep 17 00:00:00 2001 From: dan sinclair Date: Tue, 21 Jul 2020 17:44:44 +0000 Subject: [PATCH] [spirv-writer] Emit select intrinsic. This CL adds the select intrinsic to the SPIR-V backend. Bug: tint:106 Change-Id: Ib5b4c1f25ff8620055f75f0291a949a950a50b7f Reviewed-on: https://dawn-review.googlesource.com/c/tint/+/25381 Reviewed-by: David Neto --- src/writer/spirv/builder.cc | 2 + src/writer/spirv/builder_intrinsic_test.cc | 52 ++++++++++++++++++++++ 2 files changed, 54 insertions(+) diff --git a/src/writer/spirv/builder.cc b/src/writer/spirv/builder.cc index bfad844ff9..d5c956f5c4 100644 --- a/src/writer/spirv/builder.cc +++ b/src/writer/spirv/builder.cc @@ -1469,6 +1469,8 @@ uint32_t Builder::GenerateIntrinsic(const std::string& name, op = spv::Op::OpIsNan; } else if (name == "outer_product") { op = spv::Op::OpOuterProduct; + } else if (name == "select") { + op = spv::Op::OpSelect; } if (op == spv::Op::OpNop) { error_ = "unable to determine operator for: " + name; diff --git a/src/writer/spirv/builder_intrinsic_test.cc b/src/writer/spirv/builder_intrinsic_test.cc index ea4974c0e4..3bb0b31622 100644 --- a/src/writer/spirv/builder_intrinsic_test.cc +++ b/src/writer/spirv/builder_intrinsic_test.cc @@ -356,6 +356,58 @@ TEST_F(BuilderTest, Call_OuterProduct) { )"); } +TEST_F(BuilderTest, Call_Select) { + ast::type::F32Type f32; + ast::type::BoolType bool_type; + ast::type::VectorType bool_vec3(&bool_type, 3); + ast::type::VectorType vec3(&f32, 3); + + auto v3 = + std::make_unique("v3", ast::StorageClass::kPrivate, &vec3); + auto bool_v3 = std::make_unique( + "bool_v3", ast::StorageClass::kPrivate, &bool_vec3); + + ast::ExpressionList params; + params.push_back(std::make_unique("v3")); + params.push_back(std::make_unique("v3")); + params.push_back(std::make_unique("bool_v3")); + ast::CallExpression expr( + std::make_unique("select"), std::move(params)); + + Context ctx; + ast::Module mod; + TypeDeterminer td(&ctx, &mod); + td.RegisterVariableForTesting(v3.get()); + td.RegisterVariableForTesting(bool_v3.get()); + + ASSERT_TRUE(td.DetermineResultType(&expr)) << td.error(); + + Builder b(&mod); + b.push_function(Function{}); + ASSERT_TRUE(b.GenerateGlobalVariable(v3.get())) << b.error(); + ASSERT_TRUE(b.GenerateGlobalVariable(bool_v3.get())) << b.error(); + + EXPECT_EQ(b.GenerateCallExpression(&expr), 11u) << b.error(); + + EXPECT_EQ(DumpInstructions(b.types()), R"(%4 = OpTypeFloat 32 +%3 = OpTypeVector %4 3 +%2 = OpTypePointer Private %3 +%5 = OpConstantNull %3 +%1 = OpVariable %2 Private %5 +%9 = OpTypeBool +%8 = OpTypeVector %9 3 +%7 = OpTypePointer Private %8 +%10 = OpConstantNull %8 +%6 = OpVariable %7 Private %10 +)"); + EXPECT_EQ(DumpInstructions(b.functions()[0].instructions()), + R"(%12 = OpLoad %3 %1 +%13 = OpLoad %3 %1 +%14 = OpLoad %8 %6 +%11 = OpSelect %3 %12 %13 %14 +)"); +} + } // namespace } // namespace spirv } // namespace writer