[msl] Add member function call validation tests Make sure that regular builtin functions do not match member functions and vice versa. Bug: 42251016 Change-Id: I0591988ece1f74edd1d857d1cf048a480b1c0100 Reviewed-on: https://dawn-review.googlesource.com/c/dawn/+/192306 Reviewed-by: dan sinclair <dsinclair@chromium.org>
diff --git a/src/tint/lang/msl/ir/BUILD.bazel b/src/tint/lang/msl/ir/BUILD.bazel index a4afc1f..d7f30cb 100644 --- a/src/tint/lang/msl/ir/BUILD.bazel +++ b/src/tint/lang/msl/ir/BUILD.bazel
@@ -79,6 +79,7 @@ alwayslink = True, srcs = [ "builtin_call_test.cc", + "member_builtin_call_test.cc", ], deps = [ "//src/tint/api/common",
diff --git a/src/tint/lang/msl/ir/BUILD.cmake b/src/tint/lang/msl/ir/BUILD.cmake index 872daf1..e76dd1b 100644 --- a/src/tint/lang/msl/ir/BUILD.cmake +++ b/src/tint/lang/msl/ir/BUILD.cmake
@@ -77,6 +77,7 @@ ################################################################################ tint_add_target(tint_lang_msl_ir_test test lang/msl/ir/builtin_call_test.cc + lang/msl/ir/member_builtin_call_test.cc ) tint_target_add_dependencies(tint_lang_msl_ir_test test
diff --git a/src/tint/lang/msl/ir/BUILD.gn b/src/tint/lang/msl/ir/BUILD.gn index 53b4f67..80ffdd7 100644 --- a/src/tint/lang/msl/ir/BUILD.gn +++ b/src/tint/lang/msl/ir/BUILD.gn
@@ -77,7 +77,10 @@ } if (tint_build_unittests) { tint_unittests_source_set("unittests") { - sources = [ "builtin_call_test.cc" ] + sources = [ + "builtin_call_test.cc", + "member_builtin_call_test.cc", + ] deps = [ "${tint_src_dir}:gmock_and_gtest", "${tint_src_dir}/api/common",
diff --git a/src/tint/lang/msl/ir/builtin_call_test.cc b/src/tint/lang/msl/ir/builtin_call_test.cc index 9e76938..b30feaf3 100644 --- a/src/tint/lang/msl/ir/builtin_call_test.cc +++ b/src/tint/lang/msl/ir/builtin_call_test.cc
@@ -26,8 +26,16 @@ // OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #include "src/tint/lang/msl/ir/builtin_call.h" -#include "gmock/gmock.h" + +#include "gtest/gtest.h" +#include "src/tint/lang/core/fluent_types.h" #include "src/tint/lang/core/ir/ir_helper_test.h" +#include "src/tint/lang/core/ir/validator.h" +#include "src/tint/lang/core/type/sampled_texture.h" +#include "src/tint/lang/core/type/texture_dimension.h" +#include "src/tint/utils/result/result.h" + +using namespace tint::core::fluent_types; // NOLINT namespace tint::msl::ir { namespace { @@ -54,5 +62,40 @@ EXPECT_EQ(0_u, val0->As<core::constant::Scalar<core::u32>>()->ValueAs<core::u32>()); } +TEST_F(IR_MslBuiltinCallTest, DoesNotMatchMemberFunction) { + auto* t = b.FunctionParam( + "t", ty.Get<core::type::SampledTexture>(core::type::TextureDimension::k2d, ty.f32())); + auto* s = b.FunctionParam("s", ty.sampler()); + auto* coords = b.FunctionParam("coords", ty.vec2<f32>()); + auto* func = b.Function("foo", ty.vec4<f32>()); + func->SetParams({t, s, coords}); + b.Append(func->Block(), [&] { + auto* result = b.Call<BuiltinCall>(ty.vec4<f32>(), msl::BuiltinFn::kSample, t, s, coords); + b.Return(func, result); + }); + + auto res = core::ir::Validate(mod); + ASSERT_NE(res, Success); + EXPECT_EQ( + res.Failure().reason.Str(), + R"(:3:20 error: msl.sample: no matching call to 'msl.sample(texture_2d<f32>, sampler, vec2<f32>)' + + %5:vec4<f32> = msl.sample %t, %s, %coords + ^^^^^^^^^^ + +:2:3 note: in block + $B1: { + ^^^ + +note: # Disassembly +%foo = func(%t:texture_2d<f32>, %s:sampler, %coords:vec2<f32>):vec4<f32> { + $B1: { + %5:vec4<f32> = msl.sample %t, %s, %coords + ret %5 + } +} +)"); +} + } // namespace } // namespace tint::msl::ir
diff --git a/src/tint/lang/msl/ir/member_builtin_call_test.cc b/src/tint/lang/msl/ir/member_builtin_call_test.cc new file mode 100644 index 0000000..5c0e4d4 --- /dev/null +++ b/src/tint/lang/msl/ir/member_builtin_call_test.cc
@@ -0,0 +1,109 @@ +// Copyright 2023 The Dawn & Tint Authors +// +// Redistribution and use in source and binary forms, with or without +// modification, are permitted provided that the following conditions are met: +// +// 1. Redistributions of source code must retain the above copyright notice, this +// list of conditions and the following disclaimer. +// +// 2. Redistributions in binary form must reproduce the above copyright notice, +// this list of conditions and the following disclaimer in the documentation +// and/or other materials provided with the distribution. +// +// 3. Neither the name of the copyright holder nor the names of its +// contributors may be used to endorse or promote products derived from +// this software without specific prior written permission. +// +// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" +// AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +// IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +// DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE +// FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL +// DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR +// SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER +// CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, +// OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE +// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +#include "src/tint/lang/msl/ir/member_builtin_call.h" + +#include "gtest/gtest.h" + +#include "src/tint/lang/core/fluent_types.h" +#include "src/tint/lang/core/ir/ir_helper_test.h" +#include "src/tint/lang/core/ir/validator.h" +#include "src/tint/lang/core/number.h" +#include "src/tint/lang/core/type/sampled_texture.h" +#include "src/tint/lang/core/type/sampler.h" +#include "src/tint/lang/core/type/texture_dimension.h" +#include "src/tint/lang/core/type/vector.h" +#include "src/tint/lang/msl/builtin_fn.h" +#include "src/tint/utils/result/result.h" + +using namespace tint::core::fluent_types; // NOLINT +using namespace tint::core::number_suffixes; // NOLINT + +namespace tint::msl::ir { +namespace { + +using IR_MslMemberBuiltinCallTest = core::ir::IRTestHelper; + +TEST_F(IR_MslMemberBuiltinCallTest, Clone) { + auto* t = b.FunctionParam( + "t", ty.Get<core::type::SampledTexture>(core::type::TextureDimension::k2d, ty.f32())); + auto* s = b.FunctionParam("s", ty.sampler()); + auto* coords = b.FunctionParam("coords", ty.vec2<f32>()); + auto* builtin = + b.MemberCall<MemberBuiltinCall>(mod.Types().void_(), BuiltinFn::kSample, t, s, coords); + + auto* new_b = clone_ctx.Clone(builtin); + + EXPECT_NE(builtin, new_b); + EXPECT_NE(builtin->Result(0), new_b->Result(0)); + EXPECT_EQ(mod.Types().void_(), new_b->Result(0)->Type()); + + EXPECT_EQ(BuiltinFn::kSample, new_b->Func()); + + EXPECT_TRUE(new_b->Object()->Type()->Is<core::type::SampledTexture>()); + + auto args = new_b->Args(); + ASSERT_EQ(2u, args.Length()); + EXPECT_TRUE(args[0]->Type()->Is<core::type::Sampler>()); + EXPECT_TRUE(args[1]->Type()->Is<core::type::Vector>()); +} + +TEST_F(IR_MslMemberBuiltinCallTest, DoesNotMatchNonMemberFunction) { + auto* a = b.FunctionParam("t", ty.ptr<workgroup>(ty.atomic<u32>())); + auto* func = b.Function("foo", ty.u32()); + func->SetParams({a}); + b.Append(func->Block(), [&] { + auto* result = + b.MemberCall<MemberBuiltinCall>(ty.u32(), msl::BuiltinFn::kAtomicLoadExplicit, a, 0_u); + b.Return(func, result); + }); + + auto res = core::ir::Validate(mod); + ASSERT_NE(res, Success); + EXPECT_EQ( + res.Failure().reason.Str(), + R"(:3:17 error: atomic_load_explicit: no matching call to 'atomic_load_explicit(ptr<workgroup, atomic<u32>, read_write>, u32)' + + %3:u32 = %t.atomic_load_explicit 0u + ^^^^^^^^^^^^^^^^^^^^ + +:2:3 note: in block + $B1: { + ^^^ + +note: # Disassembly +%foo = func(%t:ptr<workgroup, atomic<u32>, read_write>):u32 { + $B1: { + %3:u32 = %t.atomic_load_explicit 0u + ret %3 + } +} +)"); +} + +} // namespace +} // namespace tint::msl::ir