Skip to content

Build operator lookup names without snprintf #24217

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

Merged
rascani merged 6 commits into from
Oct 28, 2026
Merged

Build operator lookup names without snprintf #24217

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
17b99e6
Update
rascani Oct 27, 2026
def700c
Update
rascani Oct 27, 2026
038aacb
Update
rascani Oct 27, 2026
922e173
Update
rascani Oct 27, 2026
320adcd
Merge branch 'main' into gh/rascani/49/head
rascani Oct 28, 2026
74ccc1d
Update
rascani Oct 28, 2026
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
4 changes: 2 additions & 2 deletions .github/workflows/pull.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -729,12 +729,12 @@ jobs:
setup_script_args=""
if [[ ${{ matrix.os}} == "bare_metal" ]]; then
toolchain_prefix=arm-none-eabi-
threshold="34000" # GCC 15.2, minimal PAL + nano baseline: 33372 bytes, 2026-10-27
threshold="35000" # GCC 15.2, minimal PAL + nano baseline: 32180 bytes, 2026-10-28
toolchain_cmake=examples/arm/ethos-u-setup/arm-none-eabi-gcc.cmake
elif [[ ${{ matrix.os}} == "zephyr-preset" ]]; then
setup_script_args="--target-toolchain zephyr"
toolchain_prefix=arm-zephyr-eabi-
threshold="57000" # Zephyr SDK 1.0.1, minimal PAL baseline: 55800 bytes, 2026-10-27
threshold="50000" # Zephyr SDK 1.0.1, minimal PAL baseline: 46112 bytes, 2026-10-28
toolchain_cmake=examples/zephyr/x86_64-linux-arm-zephyr-eabi-gcc.cmake
else
echo "Unsupported OS selection: ${{ matrix.os }}"
Expand Down
31 changes: 17 additions & 14 deletions runtime/executor/method.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
#include <array>
#include <cinttypes> // @donotremove
#include <cstdint>
#include <cstdio>
#include <cstring>

#include <executorch/runtime/backend/interface.h>
#include <executorch/runtime/core/event_tracer_hooks.h>
Expand Down Expand Up @@ -769,26 +769,29 @@ Error populate_operator_name(

ET_CHECK_OR_RETURN_ERROR(
op->name() != nullptr, InvalidProgram, "Missing operator name");
int cx = snprintf(
operator_name,
operator_name_size,
"%s%s%s",
op->name()->c_str(),
// Don't append any overload if the overload string is empty.
has_overload ? "." : "",
has_overload ? op->overload()->c_str() : "");
ET_CHECK_OR_RETURN_ERROR(cx >= 0, Internal, "snprintf failed: %d", cx);
// Avoid pulling printf formatting code into builds that otherwise omit it.
const size_t name_size = strlen(op->name()->c_str());
const size_t overload_size =
has_overload ? strlen(op->overload()->c_str()) : 0;
const uint64_t needed_size = static_cast<uint64_t>(name_size) +
overload_size + (has_overload ? 1 : 0) + 1;
ET_CHECK_OR_RETURN_ERROR(
static_cast<size_t>(cx) < operator_name_size,
needed_size <= operator_name_size,
Internal,
"Operator name %s%s%s with length %d "
"truncated to %" ET_PRIsize_t " due to internal buffer limit.",
"Operator name %s%s%s exceeds internal buffer limit of %" ET_PRIsize_t,
op->name()->c_str(),
has_overload ? "." : "",
has_overload ? op->overload()->c_str() : "",
cx,
operator_name_size);

memcpy(operator_name, op->name()->c_str(), name_size);
size_t pos = name_size;
if (has_overload) {
operator_name[pos++] = '.';
memcpy(operator_name + pos, op->overload()->c_str(), overload_size);
pos += overload_size;
}
operator_name[pos] = '\0';
return Error::Ok;
}
} // namespace
Expand Down
Loading