From be56be5201f23d41e060f3cee458607f0bf97729 Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 1 Apr 2026 16:14:45 -1000
Subject: [PATCH 1/2] [core] Reduce runtime_stats measurement overhead (#15359)

---
 esphome/core/component.cpp | 7 -------
 esphome/core/component.h   | 9 ++++-----
 2 files changed, 4 insertions(+), 12 deletions(-)

diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index 955596ce95..288c3f01a3 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -519,13 +519,6 @@ WarnIfComponentBlockingGuard::warn_blocking(Component *component, uint32_t block
   }
 }
 
-#ifdef USE_RUNTIME_STATS
-void WarnIfComponentBlockingGuard::record_runtime_stats_() {
-  uint32_t duration_us = micros() - this->started_us_;
-  this->component_->runtime_stats_.record_time(duration_us);
-}
-#endif
-
 #ifdef USE_SETUP_PRIORITY_OVERRIDE
 void clear_setup_priority_overrides() {
   // Free the setup priority map completely
diff --git a/esphome/core/component.h b/esphome/core/component.h
index c5a331ee29..d09b42b936 100644
--- a/esphome/core/component.h
+++ b/esphome/core/component.h
@@ -630,17 +630,17 @@ class WarnIfComponentBlockingGuard {
   {
   }
 
-  // Finish the timing operation and return the current time
+  // Finish the timing operation and return the current time (millis)
   // Inlined: the fast path is just millis() + subtract + compare
   inline uint32_t HOT finish() {
-    uint32_t curr_time = millis();
-    uint32_t blocking_time = curr_time - this->started_;
 #ifdef USE_RUNTIME_STATS
-    this->record_runtime_stats_();
+    this->component_->runtime_stats_.record_time(micros() - this->started_us_);
 #endif
+    uint32_t curr_time = millis();
 #ifndef USE_BENCHMARK
     // Fast path: compare against constant threshold in ms (computed at compile time from centiseconds)
     static constexpr uint32_t WARN_IF_BLOCKING_OVER_MS = static_cast<uint32_t>(WARN_IF_BLOCKING_OVER_CS) * 10U;
+    uint32_t blocking_time = curr_time - this->started_;
     if (blocking_time > WARN_IF_BLOCKING_OVER_MS) [[unlikely]] {
       warn_blocking(this->component_, blocking_time);
     }
@@ -655,7 +655,6 @@ class WarnIfComponentBlockingGuard {
   Component *component_;
 #ifdef USE_RUNTIME_STATS
   uint32_t started_us_;
-  void record_runtime_stats_();
 #endif
 
  private:

From f36d78e09c866136111c260d03c99820ff71fcee Mon Sep 17 00:00:00 2001
From: "J. Nick Koston" <nick@koston.org>
Date: Wed, 1 Apr 2026 16:15:00 -1000
Subject: [PATCH 2/2] [core] Force inline Component::get_component_log_str()
 (#15363)

---
 esphome/core/component.cpp | 3 ---
 esphome/core/component.h   | 4 +++-
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/esphome/core/component.cpp b/esphome/core/component.cpp
index 288c3f01a3..2b5aba2a7b 100644
--- a/esphome/core/component.cpp
+++ b/esphome/core/component.cpp
@@ -267,9 +267,6 @@ void Component::call() {
       break;
   }
 }
-const LogString *Component::get_component_log_str() const {
-  return component_source_lookup(this->component_source_index_);
-}
 bool Component::should_warn_of_blocking(uint32_t blocking_time) {
   // Convert centisecond threshold to milliseconds for comparison
   uint32_t threshold_ms = static_cast<uint32_t>(this->warn_if_blocking_over_) * 10U;
diff --git a/esphome/core/component.h b/esphome/core/component.h
index d09b42b936..f091f9434c 100644
--- a/esphome/core/component.h
+++ b/esphome/core/component.h
@@ -323,7 +323,9 @@ class Component {
    *
    * Returns LOG_STR("<unknown>") if source not set
    */
-  const LogString *get_component_log_str() const;
+  inline const LogString *get_component_log_str() const ESPHOME_ALWAYS_INLINE {
+    return component_source_lookup(this->component_source_index_);
+  }
 
   bool should_warn_of_blocking(uint32_t blocking_time);