Skip to contentSkip to conversation

accel/tcg: Move perf and debuginfo support to tcg

PATCH Superseded Philippe Mathieu-Daudé 3 participants 11 messages Jan 24, 2024 – Jan 25, 2024 Arm/Amlogic Meson SoC support

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

v5 cover accel/tcg: Move perf and debuginfo support to tcg

Since v5:
- Rebased on commit 53e8868d69
("meson: remove OS definitions from config_targetos")

Ilya Leoshkevich (4):
target: Make qemu_target_page_mask() available for *-user
tcg: Make tb_cflags() usable from target-agnostic code accel/tcg: Remove #ifdef TARGET_I386 from perf.c accel/tcg: Move perf and debuginfo support to tcg

 include/exec/exec-all.h          |  6 ------
 include/exec/translation-block.h |  6 ++++++
 {accel/tcg => tcg}/debuginfo.h   |  4 ++--
 {accel/tcg => tcg}/perf.h        |  4 ++--
 accel/tcg/translate-all.c        |  2 +-
 hw/core/loader.c                 |  2 +-
 linux-user/elfload.c             |  2 +-
 linux-user/exit.c                |  2 +-
 linux-user/main.c                |  2 +-
 system/physmem.c                 |  5 -----
 system/vl.c                      |  2 +-
 target/target-common.c           | 10 ++++++++++
 {accel/tcg => tcg}/debuginfo.c   |  0
 {accel/tcg => tcg}/perf.c        |  9 +++------
 tcg/tcg.c                        |  2 +-
 accel/tcg/meson.build            |  4 ----
 target/meson.build               |  2 ++
 tcg/meson.build                  |  5 +++++
 18 files changed, 37 insertions(+), 32 deletions(-)
 rename {accel/tcg => tcg}/debuginfo.h (96%)
 rename {accel/tcg => tcg}/perf.h (95%)
 create mode 100644 target/target-common.c
 rename {accel/tcg => tcg}/debuginfo.c (100%)
 rename {accel/tcg => tcg}/perf.c (98%)
Signature · 1 line
2.41.0
#1 lore raw

PATCH v5 1/4 target: Make qemu_target_page_mask() available for *-user

From: Ilya Leoshkevich <[email protected]>

Currently qemu_target_page_mask() is usable only from the softmmu code. Make it possible to use it from the *-user code as well.

Make use of it in perf.c.

Message-ID: <[email protected]>

---
 accel/tcg/perf.c       |  3 ++-
 system/physmem.c       |  5 -----
 target/target-common.c | 10 ++++++++++
 target/meson.build     |  2 ++
 4 files changed, 14 insertions(+), 6 deletions(-)
 create mode 100644 target/target-common.c
accel/tcg/perf.c +2 -1
index cd1aa99a7e..ba75c1bbe4 100644
@@ -10,6 +10,7 @@
 
 #include "qemu/osdep.h"
 #include "elf.h"
+#include "exec/target_page.h"
 #include "exec/exec-all.h"
 #include "qemu/timer.h"
 #include "tcg/tcg.h"
@@ -335,7 +336,7 @@ void perf_report_code(uint64_t guest_pc, TranslationBlock *tb,
         /* FIXME: This replicates the restore_state_to_opc() logic. */
         q[insn].address = gen_insn_data[insn * start_words + 0];
         if (tb_cflags(tb) & CF_PCREL) {
-            q[insn].address |= (guest_pc & TARGET_PAGE_MASK);
+            q[insn].address |= (guest_pc & qemu_target_page_mask());
         } else {
 #if defined(TARGET_I386)
             q[insn].address -= tb->cs_base;
system/physmem.c +0 -5
index cc68a79763..5e66d9ae36 100644
@@ -3431,11 +3431,6 @@ size_t qemu_target_page_size(void)
     return TARGET_PAGE_SIZE;
 }
 
-int qemu_target_page_mask(void)
-{
-    return TARGET_PAGE_MASK;
-}
-
 int qemu_target_page_bits(void)
 {
     return TARGET_PAGE_BITS;
target/target-common.c new file +10 -0
new file mode 100644
index 0000000000..903b10cfe4
@@ -0,0 +1,10 @@
+/* SPDX-License-Identifier: GPL-2.0-or-later */
+#include "qemu/osdep.h"
+
+#include "cpu.h"
+#include "exec/target_page.h"
+
+int qemu_target_page_mask(void)
+{
+    return TARGET_PAGE_MASK;
+}
target/meson.build +2 -0
index a53a60486f..dee2ac47e0 100644
@@ -19,3 +19,5 @@ subdir('sh4')
 subdir('sparc')
 subdir('tricore')
 subdir('xtensa')
+
+specific_ss.add(files('target-common.c'))
Signature · 1 line
2.41.0
Reviewed-by on v5 1/4
#2 lore raw

Re: [PATCH v5 1/4] target: Make qemu_target_page_mask() available for *-user

Quoted 9 lines · Philippe Mathieu-Daudé

From: Ilya Leoshkevich<[email protected]>

Currently qemu_target_page_mask() is usable only from the softmmu code. Make it possible to use it from the *-user code as well.

Make use of it in perf.c.

Message-ID:<[email protected]>

Quoted 8 lines
---
  accel/tcg/perf.c       |  3 ++-
  system/physmem.c       |  5 -----
  target/target-common.c | 10 ++++++++++
  target/meson.build     |  2 ++
  4 files changed, 14 insertions(+), 6 deletions(-)

create mode 100644 target/target-common.c

r~

#3 lore raw

PATCH v5 2/4 tcg: Make tb_cflags() usable from target-agnostic code

In reply to Philippe Mathieu-Daudé

From: Ilya Leoshkevich <[email protected]>

Currently tb_cflags() is defined in exec-all.h, which is not usable from target-agnostic code. Move it to translation-block.h, which is.

Message-ID: <[email protected]>

---
 include/exec/exec-all.h          | 6 ------
 include/exec/translation-block.h | 6 ++++++
 2 files changed, 6 insertions(+), 6 deletions(-)
include/exec/exec-all.h +0 -6
index df3d93a2e2..ce36bb10d4 100644
@@ -459,12 +459,6 @@ int probe_access_full_mmu(CPUArchState *env, vaddr addr, int size,
 
 #endif
 
-/* Hide the qatomic_read to make code a little easier on the eyes */
-static inline uint32_t tb_cflags(const TranslationBlock *tb)
-{
-    return qatomic_read(&tb->cflags);
-}
-
 static inline tb_page_addr_t tb_page_addr0(const TranslationBlock *tb)
 {
 #ifdef CONFIG_USER_ONLY
include/exec/translation-block.h +6 -0
index e2b26e16da..48211c890a 100644
@@ -145,4 +145,10 @@ struct TranslationBlock {
 /* The alignment given to TranslationBlock during allocation. */
 #define CODE_GEN_ALIGN  16
 
+/* Hide the qatomic_read to make code a little easier on the eyes */
+static inline uint32_t tb_cflags(const TranslationBlock *tb)
+{
+    return qatomic_read(&tb->cflags);
+}
+
 #endif /* EXEC_TRANSLATION_BLOCK_H */
Signature · 1 line
2.41.0
Reviewed-by on v5 2/4
#4 lore raw

Re: [PATCH v5 2/4] tcg: Make tb_cflags() usable from target-agnostic code

Quoted 5 lines · Philippe Mathieu-Daudé

From: Ilya Leoshkevich<[email protected]>

Currently tb_cflags() is defined in exec-all.h, which is not usable from target-agnostic code. Move it to translation-block.h, which is.

Quoted 8 lines

Message-ID:<[email protected]>

---
  include/exec/exec-all.h          | 6 ------
  include/exec/translation-block.h | 6 ++++++
  2 files changed, 6 insertions(+), 6 deletions(-)

r~

#5 lore raw

PATCH v5 3/4 accel/tcg: Remove #ifdef TARGET_I386 from perf.c

In reply to Philippe Mathieu-Daudé

From: Ilya Leoshkevich <[email protected]>

Preparation for moving perf.c to tcg/.

This affects only profiling guest code, which has code in a non-0 based segment, e.g., 16-bit code, which is not particularly important.

Message-ID: <[email protected]>

---
 accel/tcg/perf.c | 4 ----
 1 file changed, 4 deletions(-)
accel/tcg/perf.c +0 -4
index ba75c1bbe4..68a46b1b52 100644
@@ -337,10 +337,6 @@ void perf_report_code(uint64_t guest_pc, TranslationBlock *tb,
         q[insn].address = gen_insn_data[insn * start_words + 0];
         if (tb_cflags(tb) & CF_PCREL) {
             q[insn].address |= (guest_pc & qemu_target_page_mask());
-        } else {
-#if defined(TARGET_I386)
-            q[insn].address -= tb->cs_base;
-#endif
         }
         q[insn].flags = DEBUGINFO_SYMBOL | (jitdump ? DEBUGINFO_LINE : 0);
     }
Signature · 1 line
2.41.0
Reviewed-by on v5 3/4
#6 lore raw

Re: [PATCH v5 3/4] accel/tcg: Remove #ifdef TARGET_I386 from perf.c

Quoted 7 lines · Philippe Mathieu-Daudé

From: Ilya Leoshkevich<[email protected]>

Preparation for moving perf.c to tcg/.

This affects only profiling guest code, which has code in a non-0 based segment, e.g., 16-bit code, which is not particularly important.

Quoted 8 lines

Message-ID:<[email protected]>

---
  accel/tcg/perf.c | 4 ----
  1 file changed, 4 deletions(-)

r~

#7 lore raw

PATCH v5 4/4 accel/tcg: Move perf and debuginfo support to tcg

In reply to Philippe Mathieu-Daudé

From: Ilya Leoshkevich <[email protected]>

tcg/ should not depend on accel/tcg/, but perf and debuginfo support provided by the latter are being used by tcg/tcg.c.

Since that's the only user, move both to tcg/.

Message-ID: <[email protected]>

---
 {accel/tcg => tcg}/debuginfo.h | 4 ++--
 {accel/tcg => tcg}/perf.h      | 4 ++--
 accel/tcg/translate-all.c      | 2 +-
 hw/core/loader.c               | 2 +-
 linux-user/elfload.c           | 2 +-
 linux-user/exit.c              | 2 +-
 linux-user/main.c              | 2 +-
 system/vl.c                    | 2 +-
 {accel/tcg => tcg}/debuginfo.c | 0
 {accel/tcg => tcg}/perf.c      | 2 +-
 tcg/tcg.c                      | 2 +-
 accel/tcg/meson.build          | 4 ----
 tcg/meson.build                | 5 +++++
 13 files changed, 17 insertions(+), 16 deletions(-)
 rename {accel/tcg => tcg}/debuginfo.h (96%)
 rename {accel/tcg => tcg}/perf.h (95%)
 rename {accel/tcg => tcg}/debuginfo.c (100%)
 rename {accel/tcg => tcg}/perf.c (99%)
tcg/debuginfo.h renamed from accel/tcg/debuginfo.h +2 -2
similarity index 96%
rename from accel/tcg/debuginfo.h
rename to tcg/debuginfo.h
index f064e1c144..858535b5da 100644
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifndef ACCEL_TCG_DEBUGINFO_H
-#define ACCEL_TCG_DEBUGINFO_H
+#ifndef TCG_DEBUGINFO_H
+#define TCG_DEBUGINFO_H
 
 #include "qemu/bitops.h"
 
tcg/perf.h renamed from accel/tcg/perf.h +2 -2
similarity index 95%
rename from accel/tcg/perf.h
rename to tcg/perf.h
index f92dd52c69..c96b5920a3 100644
@@ -4,8 +4,8 @@
  * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
-#ifndef ACCEL_TCG_PERF_H
-#define ACCEL_TCG_PERF_H
+#ifndef TCG_PERF_H
+#define TCG_PERF_H
 
 #if defined(CONFIG_TCG) && defined(CONFIG_LINUX)
 /* Start writing perf-<pid>.map. */
accel/tcg/translate-all.c +1 -1
index 1737bb3da5..1c695efe02 100644
@@ -63,7 +63,7 @@
 #include "tb-context.h"
 #include "internal-common.h"
 #include "internal-target.h"
-#include "perf.h"
+#include "tcg/perf.h"
 #include "tcg/insn-start-words.h"
 
 TBContext tb_ctx;
hw/core/loader.c +1 -1
index e7a9b3775b..b8e52f3fb0 100644
@@ -62,7 +62,7 @@
 #include "hw/boards.h"
 #include "qemu/cutils.h"
 #include "sysemu/runstate.h"
-#include "accel/tcg/debuginfo.h"
+#include "tcg/debuginfo.h"
 
 #include <zlib.h>
 
linux-user/elfload.c +1 -1
index cf9e74468b..62120c7615 100644
@@ -21,7 +21,7 @@
 #include "qapi/error.h"
 #include "qemu/error-report.h"
 #include "target_signal.h"
-#include "accel/tcg/debuginfo.h"
+#include "tcg/debuginfo.h"
 
 #ifdef TARGET_ARM
 #include "target/arm/cpu-features.h"
linux-user/exit.c +1 -1
index 50266314e0..1ff8fe4f07 100644
@@ -17,7 +17,7 @@
  *  along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 #include "qemu/osdep.h"
-#include "accel/tcg/perf.h"
+#include "tcg/perf.h"
 #include "gdbstub/syscalls.h"
 #include "qemu.h"
 #include "user-internals.h"
linux-user/main.c +1 -1
index c9470eeccf..74b2fbb393 100644
@@ -54,7 +54,7 @@
 #include "signal-common.h"
 #include "loader.h"
 #include "user-mmap.h"
-#include "accel/tcg/perf.h"
+#include "tcg/perf.h"
 
 #ifdef CONFIG_SEMIHOSTING
 #include "semihosting/semihost.h"
system/vl.c +1 -1
index 788d88ea03..60fd1e56b6 100644
@@ -96,7 +96,7 @@
 #endif
 #include "sysemu/qtest.h"
 #ifdef CONFIG_TCG
-#include "accel/tcg/perf.h"
+#include "tcg/perf.h"
 #endif
 
 #include "disas/disas.h"
tcg/debuginfo.c renamed from accel/tcg/debuginfo.c +0 -0
similarity index 100%
rename from accel/tcg/debuginfo.c
rename to tcg/debuginfo.c
tcg/perf.c renamed from accel/tcg/perf.c +1 -1
similarity index 99%
rename from accel/tcg/perf.c
rename to tcg/perf.c
index 68a46b1b52..de34248d92 100644
@@ -11,7 +11,7 @@
 #include "qemu/osdep.h"
 #include "elf.h"
 #include "exec/target_page.h"
-#include "exec/exec-all.h"
+#include "exec/translation-block.h"
 #include "qemu/timer.h"
 #include "tcg/tcg.h"
 
tcg/tcg.c +1 -1
index e2c38f6d11..eeff4c1d51 100644
@@ -55,7 +55,7 @@
 #include "tcg/tcg-ldst.h"
 #include "tcg/tcg-temp-internal.h"
 #include "tcg-internal.h"
-#include "accel/tcg/perf.h"
+#include "tcg/perf.h"
 #ifdef CONFIG_USER_ONLY
 #include "exec/user/guest-base.h"
 #endif
accel/tcg/meson.build +0 -4
index c15ac9ac8f..46f7d53eeb 100644
@@ -16,10 +16,6 @@ tcg_ss.add(when: 'CONFIG_SYSTEM_ONLY', if_false: files('user-exec-stub.c'))
 if get_option('plugins')
   tcg_ss.add(files('plugin-gen.c'))
 endif
-tcg_ss.add(when: libdw, if_true: files('debuginfo.c'))
-if host_os == 'linux'
-  tcg_ss.add(files('perf.c'))
-endif
 specific_ss.add_all(when: 'CONFIG_TCG', if_true: tcg_ss)
 
 specific_ss.add(when: ['CONFIG_SYSTEM_ONLY', 'CONFIG_TCG'], if_true: files(
tcg/meson.build +5 -0
index 5afdec1e1a..8251589fd4 100644
@@ -22,6 +22,11 @@ if get_option('tcg_interpreter')
   tcg_ss.add(files('tci.c'))
 endif
 
+tcg_ss.add(when: libdw, if_true: files('debuginfo.c'))
+if host_os == 'linux'
+  tcg_ss.add(files('perf.c'))
+endif
+
 tcg_ss = tcg_ss.apply({})
 
 libtcg_user = static_library('tcg_user',
Signature · 1 line
2.41.0
Reviewed-by on v5 4/4
#8 lore raw
Quoted 7 lines · Philippe Mathieu-Daudé

From: Ilya Leoshkevich <[email protected]>

tcg/ should not depend on accel/tcg/, but perf and debuginfo support provided by the latter are being used by tcg/tcg.c.

Since that's the only user, move both to tcg/.

Quoted 8 lines

Message-ID: <[email protected]>

---
  {accel/tcg => tcg}/debuginfo.h | 4 ++--
  {accel/tcg => tcg}/perf.h      | 4 ++--

Headers should be in include/tcg/.

accel/tcg/translate-all.c line 66

Quoted 8 lines
accel/tcg/translate-all.c +1 -1
@@ -63,7 +63,7 @@
  #include "tb-context.h"
  #include "internal-common.h"
  #include "internal-target.h"
-#include "perf.h"
+#include "tcg/perf.h"

Since it is used from accel/tcg/,

hw/core/loader.c line 65

Quoted 13 lines
accel/tcg/translate-all.c +0 -0
  #include "tcg/insn-start-words.h"
 
  TBContext tb_ctx;
hw/core/loader.c +1 -1
index e7a9b3775b..b8e52f3fb0 100644
@@ -62,7 +62,7 @@
  #include "hw/boards.h"
  #include "qemu/cutils.h"
  #include "sysemu/runstate.h"
-#include "accel/tcg/debuginfo.h"
+#include "tcg/debuginfo.h"

... and hw/core/.

Otherwise,

r~

#9 lore raw
Quoted 46 lines · Richard Henderson
Quoted 7 lines · Philippe Mathieu-Daudé

From: Ilya Leoshkevich <[email protected]>

tcg/ should not depend on accel/tcg/, but perf and debuginfo support provided by the latter are being used by tcg/tcg.c.

Since that's the only user, move both to tcg/.

Quoted 8 lines

Message-ID: <[email protected]>

---
  {accel/tcg => tcg}/debuginfo.h | 4 ++--
  {accel/tcg => tcg}/perf.h      | 4 ++--

Headers should be in include/tcg/.

accel/tcg/translate-all.c line 66

Quoted 8 lines
accel/tcg/translate-all.c +1 -1
@@ -63,7 +63,7 @@
   #include "tb-context.h"
   #include "internal-common.h"
   #include "internal-target.h"
-#include "perf.h"
+#include "tcg/perf.h"

Since it is used from accel/tcg/,

hw/core/loader.c line 65

Quoted 13 lines
accel/tcg/translate-all.c +0 -0
   #include "tcg/insn-start-words.h"


  TBContext tb_ctx;

hw/core/loader.c +1 -1
index e7a9b3775b..b8e52f3fb0 100644
@@ -62,7 +62,7 @@
   #include "hw/boards.h"
   #include "qemu/cutils.h"
   #include "sysemu/runstate.h"
-#include "accel/tcg/debuginfo.h"
+#include "tcg/debuginfo.h"

... and hw/core/.

Quoted 4 lines

Otherwise,

r~

Can it be that this is the rebased v3?
v4 seems to have these issues fixed:

https://patchew.org/QEMU/[email protected]/

#10 lore raw
Quoted 50 lines · Ilya Leoshkevich
Quoted 49 lines · Richard Henderson
Quoted 7 lines · Philippe Mathieu-Daudé

From: Ilya Leoshkevich <[email protected]>

tcg/ should not depend on accel/tcg/, but perf and debuginfo support provided by the latter are being used by tcg/tcg.c.

Since that's the only user, move both to tcg/.

Quoted 8 lines

Message-ID: <[email protected]>

---
   {accel/tcg => tcg}/debuginfo.h | 4 ++--
   {accel/tcg => tcg}/perf.h      | 4 ++--

Headers should be in include/tcg/.

accel/tcg/translate-all.c line 66

Quoted 8 lines
accel/tcg/translate-all.c +1 -1
@@ -63,7 +63,7 @@
   #include "tb-context.h"
   #include "internal-common.h"
   #include "internal-target.h"
-#include "perf.h"
+#include "tcg/perf.h"

Since it is used from accel/tcg/,

hw/core/loader.c line 65

Quoted 13 lines
accel/tcg/translate-all.c +0 -0
   #include "tcg/insn-start-words.h"
 
   TBContext tb_ctx;
hw/core/loader.c +1 -1
index e7a9b3775b..b8e52f3fb0 100644
@@ -62,7 +62,7 @@
   #include "hw/boards.h"
   #include "qemu/cutils.h"
   #include "sysemu/runstate.h"
-#include "accel/tcg/debuginfo.h"
+#include "tcg/debuginfo.h"

... and hw/core/.

Otherwise,

Quoted 6 lines
Quoted 1 line

r~

Can it be that this is the rebased v3?
v4 seems to have these issues fixed:

https://patchew.org/QEMU/[email protected]/

Indeed 🤦‍♂️ v6 on the way...