[v2,02/14] tcg: Move stubs in tcg/perf.h to tcg/perf-stubs.c

Commit Message

Richard Henderson Feb. 3, 2025, 3:18 a.m. UTC

These are not called so frequently as to be
performance sensitive.

Signed-off-by: Richard Henderson <[e-mail]>
---
 include/tcg/perf.h | 23 -----------------------
 tcg/perf-stubs.c   | 26 ++++++++++++++++++++++++++
 tcg/meson.build    |  2 ++
 3 files changed, 28 insertions(+), 23 deletions(-)
 create mode 100644 tcg/perf-stubs.c

Comments

Thomas Huth Feb. 3, 2025, 10 a.m. UTC | #1

On 03/02/2025 04.18, Richard Henderson wrote:
> These are not called so frequently as to be
> performance sensitive.
> 
> Signed-off-by: Richard Henderson <[e-mail]>
> ---
>   include/tcg/perf.h | 23 -----------------------
>   tcg/perf-stubs.c   | 26 ++++++++++++++++++++++++++
>   tcg/meson.build    |  2 ++
>   3 files changed, 28 insertions(+), 23 deletions(-)
>   create mode 100644 tcg/perf-stubs.c

Reviewed-by: Thomas Huth <[e-mail]>

Alex Bennée Feb. 3, 2025, 11:34 a.m. UTC | #2

Richard Henderson <[e-mail]> writes:

> These are not called so frequently as to be
> performance sensitive.
>
> Signed-off-by: Richard Henderson <[e-mail]>

Reviewed-by: Alex Bennée <[e-mail]>

Patch

diff --git a/include/tcg/perf.h b/include/tcg/perf.h
index c96b5920a3..050ba855ab 100644
--- a/include/tcg/perf.h
+++ b/include/tcg/perf.h
@@ -7,7 +7,6 @@ 
 #ifndef TCG_PERF_H
 #define TCG_PERF_H
 
-#if defined(CONFIG_TCG) && defined(CONFIG_LINUX)
 /* Start writing perf-<pid>.map. */
 void perf_enable_perfmap(void);
 
@@ -23,27 +22,5 @@  void perf_report_code(uint64_t guest_pc, TranslationBlock *tb,
 
 /* Stop writing perf-<pid>.map and/or jit-<pid>.dump. */
 void perf_exit(void);
-#else
-static inline void perf_enable_perfmap(void)
-{
-}
-
-static inline void perf_enable_jitdump(void)
-{
-}
-
-static inline void perf_report_prologue(const void *start, size_t size)
-{
-}
-
-static inline void perf_report_code(uint64_t guest_pc, TranslationBlock *tb,
-                                    const void *start)
-{
-}
-
-static inline void perf_exit(void)
-{
-}
-#endif
 
 #endif
diff --git a/tcg/perf-stubs.c b/tcg/perf-stubs.c
new file mode 100644
index 0000000000..ce2dd1a4b7
--- /dev/null
+++ b/tcg/perf-stubs.c
@@ -0,0 +1,26 @@ 
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+/* TCG perf stubs */
+
+#include "qemu/osdep.h"
+#include "tcg/perf.h"
+
+void perf_enable_perfmap(void)
+{
+}
+
+void perf_enable_jitdump(void)
+{
+}
+
+void perf_report_prologue(const void *start, size_t size)
+{
+}
+
+void perf_report_code(uint64_t guest_pc, TranslationBlock *tb,
+                                    const void *start)
+{
+}
+
+void perf_exit(void)
+{
+}
diff --git a/tcg/meson.build b/tcg/meson.build
index 69ebb4908a..2977df5862 100644
--- a/tcg/meson.build
+++ b/tcg/meson.build
@@ -25,6 +25,8 @@  endif
 tcg_ss.add(when: libdw, if_true: files('debuginfo.c'))
 if host_os == 'linux'
   tcg_ss.add(files('perf.c'))
+else
+  tcg_ss.add(files('perf-stubs.c'))
 endif
 
 tcg_ss = tcg_ss.apply({})