Skip to content

Optimize vector allocations in FunctionRegistry::FindStaticOverloadsByArity by pre-allocating the result vector. #2160

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
copybara-service wants to merge 1 commit into
base: master
Choose a base branch
from
+40 −8
Open

Optimize vector allocations in FunctionRegistry::FindStaticOverloadsByArity by pre-allocating the result vector. #2160

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions runtime/function_registry.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,6 +145,19 @@ FunctionRegistry::FindStaticOverloadsByArity(absl::string_view name,
return matched_funcs;
}

size_t count = 0;
for (const auto& overload : overloads->second.static_overloads) {
if (overload.descriptor->receiver_style() == receiver_style &&
overload.descriptor->types().size() == arity) {
++count;
}
}
// per go/dram-cy we are OK trading CPU for RAM as long as it's net positive
// in SWE terms
if (count > 1) {
matched_funcs.reserve(count);
}

for (const auto& overload : overloads->second.static_overloads) {
if (overload.descriptor->receiver_style() == receiver_style &&
overload.descriptor->types().size() == arity) {
Expand Down
35 changes: 27 additions & 8 deletions runtime/function_registry_test.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ TEST(FunctionRegistryTest, InsertAndRetrieveLazyFunction) {
cel::FunctionDescriptor lazy_function_desc{"LazyFunction", false, {}};
FunctionRegistry registry;
Activation activation;
ASSERT_OK(registry.RegisterLazyFunction(lazy_function_desc));
ASSERT_THAT(registry.RegisterLazyFunction(lazy_function_desc));

const auto descriptors =
registry.FindLazyOverloads("LazyFunction", false, {});
Expand All @@ -72,7 +72,7 @@ TEST(FunctionRegistryTest, InsertAndRetrieveLazyFunction) {
TEST(FunctionRegistryTest, LazyAndStaticFunctionShareDescriptorSpace) {
FunctionRegistry registry;
cel::FunctionDescriptor desc = ConstIntFunction::MakeDescriptor();
ASSERT_OK(registry.RegisterLazyFunction(desc));
ASSERT_THAT(registry.RegisterLazyFunction(desc));

absl::Status status = registry.Register(ConstIntFunction::MakeDescriptor(),
std::make_unique<ConstIntFunction>());
Expand All @@ -82,7 +82,7 @@ TEST(FunctionRegistryTest, LazyAndStaticFunctionShareDescriptorSpace) {
TEST(FunctionRegistryTest, FindStaticOverloadsReturns) {
FunctionRegistry registry;
cel::FunctionDescriptor desc = ConstIntFunction::MakeDescriptor();
ASSERT_OK(registry.Register(desc, std::make_unique<ConstIntFunction>()));
ASSERT_THAT(registry.Register(desc, std::make_unique<ConstIntFunction>()));

std::vector<cel::FunctionOverloadReference> overloads =
registry.FindStaticOverloads(desc.name(), false, {});
Expand All @@ -95,13 +95,32 @@ TEST(FunctionRegistryTest, FindStaticOverloadsReturns) {
<< "Expected single ConstFunction()";
}

TEST(FunctionRegistryTest, FindStaticOverloadsByArityExactCapacity) {
FunctionRegistry registry;
ASSERT_THAT(registry.Register({"Func", false, {Kind::kInt64}},
std::make_unique<ConstIntFunction>()),
IsOk());
ASSERT_THAT(registry.Register({"Func", false, {Kind::kDouble}},
std::make_unique<ConstIntFunction>()),
IsOk());
ASSERT_THAT(registry.Register({"Func", false, {Kind::kBool}},
std::make_unique<ConstIntFunction>()),
IsOk());

std::vector<cel::FunctionOverloadReference> overloads =
registry.FindStaticOverloadsByArity("Func", false, 1);
EXPECT_EQ(overloads.size(), 3);
EXPECT_EQ(overloads.size(), overloads.capacity());
}

TEST(FunctionRegistryTest, ListFunctions) {
cel::FunctionDescriptor lazy_function_desc{"LazyFunction", false, {}};
FunctionRegistry registry;

ASSERT_OK(registry.RegisterLazyFunction(lazy_function_desc));
ASSERT_THAT(registry.RegisterLazyFunction(lazy_function_desc));
EXPECT_OK(registry.Register(ConstIntFunction::MakeDescriptor(),
std::make_unique<ConstIntFunction>()));
std::make_unique<ConstIntFunction>()),
IsOk());

auto registered_functions = registry.ListFunctions();

Expand Down Expand Up @@ -217,7 +236,7 @@ TEST_P(NonStrictRegistrationFailTest,
/*receiver_style=*/false, {Kind::kAny},
/*is_strict=*/true);
if (existing_function_is_lazy) {
ASSERT_OK(registry.RegisterLazyFunction(descriptor));
ASSERT_THAT(registry.RegisterLazyFunction(descriptor));
} else {
ASSERT_OK(
registry.Register(descriptor, std::make_unique<ConstIntFunction>()));
Expand Down Expand Up @@ -246,7 +265,7 @@ TEST_P(NonStrictRegistrationFailTest,
/*receiver_style=*/false, {Kind::kAny},
/*is_strict=*/false);
if (existing_function_is_lazy) {
ASSERT_OK(registry.RegisterLazyFunction(descriptor));
ASSERT_THAT(registry.RegisterLazyFunction(descriptor));
} else {
ASSERT_OK(
registry.Register(descriptor, std::make_unique<ConstIntFunction>()));
Expand Down Expand Up @@ -274,7 +293,7 @@ TEST_P(NonStrictRegistrationFailTest, CanRegisterStrictFunctionsWithoutLimit) {
/*receiver_style=*/false, {Kind::kAny},
/*is_strict=*/true);
if (existing_function_is_lazy) {
ASSERT_OK(registry.RegisterLazyFunction(descriptor));
ASSERT_THAT(registry.RegisterLazyFunction(descriptor));
} else {
ASSERT_OK(
registry.Register(descriptor, std::make_unique<ConstIntFunction>()));
Expand Down
Loading