From patchwork Thu Jan 25 05:46:30 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= X-Patchwork-Id: 765938 Delivered-To: patch@linaro.org Received: by 2002:a05:6000:10c4:b0:337:62d3:c6d5 with SMTP id b4csp2456316wrx; Wed, 24 Jan 2024 21:48:07 -0800 (PST) X-Google-Smtp-Source: AGHT+IHGZUAOR1SQYURc8Xu1MzPRLsxDUnfqwLQRYKXEuE+mnL0QlTxg1h7QpkCExgHccSDR/7J+ X-Received: by 2002:a05:6808:654b:b0:3bd:9443:a565 with SMTP id fn11-20020a056808654b00b003bd9443a565mr464553oib.67.1706161687571; Wed, 24 Jan 2024 21:48:07 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1706161687; cv=none; d=google.com; s=arc-20160816; b=kygTeEqvFUaNzORcpwJQmC0HaoFFwOwAJA3Sc651DH5AXxT5iGONu5AuR0lcZ7b6nl 7bhh3dQJgF9EB09g4eN+7Tk1qIfH1TdsimI8f+bMitUwIOzQ7fMo31GIxx0MXSn2WvRb a/AOcJKTrpMckOjd+x2TxUXdt5dcZH8nCxvB0jafVtWHEtu5bxHaQmzxsxcq0YD0fadv cAOdcfeRAIm4dKckRNvRh7Bf4l2GCSiAa7O4LJ3YR8jtFlc3scoHWwVTvczfEquzCtHX IwwRfpMlBOHmrkX54sczzogqbgplDTWbQI2uuNnxISRvKQEd4rx9vtV16kjbqF2d22xX Rjrg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=AgoSHvj3ItDsNB7xFCor4QnrVXlVBkw1Thjsp8Wtfjk=; fh=0Le5rrZoRzk7mp1WVwZvEmf4sg2/sCIatJkU6I7fkh8=; b=Ikj0lN5IYbtxEqhViWHq9WuUVp+wcTWtm8tjKtNMG3r6x7gPwpe5s+JbDUyqGI72J9 g9AYq0Wfg9o7aoYgqeKEBdz0HxJevGgbwR6Mrba8Dg+1h7AiMW7gFo/ulJXsFaHtuqe2 BimFLxGxdevjou29kzaBQgdzx6FCgfhw5/CU4RmNjpcJ0GppOhMo3UO3Uvk1tXd9sEcU BIBMbYR9kxlsxD48J/S7giNTOB33SByyYc9EaBOETkiObXqbiYUqepXIuM/Ndg7ZKTxD 4F0SxiYVICTC7BfDFHRolwQr5YoskSXJA0TQQOC8dFuhoDV5PugEGWkLEKsY5TnAoh5T k6VA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gB472egg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id f3-20020ac85d03000000b0042a2e150cf5si12256774qtx.756.2024.01.24.21.48.07 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Wed, 24 Jan 2024 21:48:07 -0800 (PST) Received-SPF: pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) client-ip=209.51.188.17; Authentication-Results: mx.google.com; dkim=pass header.i=@linaro.org header.s=google header.b=gB472egg; spf=pass (google.com: domain of qemu-devel-bounces+patch=linaro.org@nongnu.org designates 209.51.188.17 as permitted sender) smtp.mailfrom="qemu-devel-bounces+patch=linaro.org@nongnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linaro.org Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1rSsZp-0007qQ-K8; Thu, 25 Jan 2024 00:47:01 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1rSsZo-0007qG-FM for qemu-devel@nongnu.org; Thu, 25 Jan 2024 00:47:00 -0500 Received: from mail-wm1-x336.google.com ([2a00:1450:4864:20::336]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.90_1) (envelope-from ) id 1rSsZm-0008C8-C5 for qemu-devel@nongnu.org; Thu, 25 Jan 2024 00:47:00 -0500 Received: by mail-wm1-x336.google.com with SMTP id 5b1f17b1804b1-40e9101b5f9so69802385e9.3 for ; Wed, 24 Jan 2024 21:46:57 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=linaro.org; s=google; t=1706161617; x=1706766417; darn=nongnu.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc:subject:date :message-id:reply-to; bh=AgoSHvj3ItDsNB7xFCor4QnrVXlVBkw1Thjsp8Wtfjk=; b=gB472eggtugrdtFfXOJbeMGTw0ff5kTewRCsTJB6t8CuB6Tek1ou0VpsPJZqjWwfDZ 3YZv0Ndr5UA8qYZAcug+rxfKbWr3H3sq9fHAyfQGO98qX7gDLGwL4tyiGCBd+zASiKqo dZm5lVz3at/cU10tPDaH8hB065oThtAwp47l5B+PAdGy/k6QVSQQOMN8xq4V1iea6K2c DBUTruo2q8RY2LRp7qqNW9Crsam8pj6krp6ytPlR4f66gH0jx985Elmh/2nT8jUv+Ew5 c8Tz26M3ccpkgyyy+y/Zxm3cNZFR1vMXOBC8BkqasDemX7Vz83AiaazuPpKVNAFu3mKU 1Ptw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706161617; x=1706766417; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc :subject:date:message-id:reply-to; bh=AgoSHvj3ItDsNB7xFCor4QnrVXlVBkw1Thjsp8Wtfjk=; b=M9WahJfyUE7/tOftMnJpo0jAGhJIjABK1sbfG6zzkd2ZA+JSzkLrmv423qkUFUVj7v qERaDUNQA2RlJXnqxv7yQIqLFO47DDqC7wo2SigyjHC6jbwB0hodBKfTPzTLkF/nf5t6 45qgsob+ysD3bxLZVz+Tc8z4+Ca9/ftQIIjmj6gRpTC3cQ+Z9q1HqNQQPduBgwc00/h4 f8Zv6EdmtOds3gmJaM7dPPqmSHTevuqEfTD5e4WYsjVsboEm6RX6R4pSvroK//owSbqM TphvpIVFnuVdteKMF8SiSls3SyZLHOZ/b12vFLcQd8OKLGcFRQ0S4oyhJfSVTWLW5Fzu Kiew== X-Gm-Message-State: AOJu0YzkdwMYMBoMrspwpy0cwEfAniAijT+WY9fx53xLVqEBPSqOmUq8 EBlxZYIBUvvVxj2ntysFN8c+sq5j/LX1UMOaM+vUjrqVuCa/GVq/mNIkKIseVjf4PVCpz9KHdv+ 0 X-Received: by 2002:a05:600c:4694:b0:40d:271e:67bc with SMTP id p20-20020a05600c469400b0040d271e67bcmr170448wmo.112.1706161616842; Wed, 24 Jan 2024 21:46:56 -0800 (PST) Received: from m1x-phil.lan (lec62-h02-176-184-19-125.dsl.sta.abo.bbox.fr. [176.184.19.125]) by smtp.gmail.com with ESMTPSA id iv16-20020a05600c549000b0040e3635ca65sm1242378wmb.2.2024.01.24.21.46.55 (version=TLS1_3 cipher=TLS_CHACHA20_POLY1305_SHA256 bits=256/256); Wed, 24 Jan 2024 21:46:56 -0800 (PST) From: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= To: qemu-devel@nongnu.org Cc: Laurent Vivier , Paolo Bonzini , Richard Henderson , Ilya Leoshkevich , =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= Subject: [PATCH v6 4/4] accel/tcg: Move perf and debuginfo support to tcg/ Date: Thu, 25 Jan 2024 06:46:30 +0100 Message-ID: <20240125054631.78867-5-philmd@linaro.org> X-Mailer: git-send-email 2.41.0 In-Reply-To: <20240125054631.78867-1-philmd@linaro.org> References: <20240125054631.78867-1-philmd@linaro.org> MIME-Version: 1.0 Received-SPF: pass client-ip=2a00:1450:4864:20::336; envelope-from=philmd@linaro.org; helo=mail-wm1-x336.google.com X-Spam_score_int: -20 X-Spam_score: -2.1 X-Spam_bar: -- X-Spam_report: (-2.1 / 5.0 requ) BAYES_00=-1.9, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, SPF_HELO_NONE=0.001, SPF_PASS=-0.001, T_SCC_BODY_TEXT_LINE=-0.01 autolearn=ham autolearn_force=no X-Spam_action: no action X-BeenThere: qemu-devel@nongnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: qemu-devel-bounces+patch=linaro.org@nongnu.org Sender: qemu-devel-bounces+patch=linaro.org@nongnu.org From: Ilya Leoshkevich 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/. Suggested-by: Philippe Mathieu-Daudé Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Ilya Leoshkevich Reviewed-by: Richard Henderson Message-ID: <20231212003837.64090-5-iii@linux.ibm.com> --- {accel => include}/tcg/debuginfo.h | 4 ++-- {accel => include}/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 | 3 +-- {accel/tcg => tcg}/perf.c | 7 +++---- tcg/tcg.c | 2 +- accel/tcg/meson.build | 4 ---- tcg/meson.build | 5 +++++ 13 files changed, 20 insertions(+), 21 deletions(-) rename {accel => include}/tcg/debuginfo.h (96%) rename {accel => include}/tcg/perf.h (95%) rename {accel/tcg => tcg}/debuginfo.c (98%) rename {accel/tcg => tcg}/perf.c (99%) diff --git a/accel/tcg/debuginfo.h b/include/tcg/debuginfo.h similarity index 96% rename from accel/tcg/debuginfo.h rename to include/tcg/debuginfo.h index f064e1c144..858535b5da 100644 --- a/accel/tcg/debuginfo.h +++ b/include/tcg/debuginfo.h @@ -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" diff --git a/accel/tcg/perf.h b/include/tcg/perf.h similarity index 95% rename from accel/tcg/perf.h rename to include/tcg/perf.h index f92dd52c69..c96b5920a3 100644 --- a/accel/tcg/perf.h +++ b/include/tcg/perf.h @@ -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-.map. */ diff --git a/accel/tcg/translate-all.c b/accel/tcg/translate-all.c index 1737bb3da5..1c695efe02 100644 --- a/accel/tcg/translate-all.c +++ b/accel/tcg/translate-all.c @@ -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; diff --git a/hw/core/loader.c b/hw/core/loader.c index e7a9b3775b..b8e52f3fb0 100644 --- a/hw/core/loader.c +++ b/hw/core/loader.c @@ -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 diff --git a/linux-user/elfload.c b/linux-user/elfload.c index cf9e74468b..62120c7615 100644 --- a/linux-user/elfload.c +++ b/linux-user/elfload.c @@ -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" diff --git a/linux-user/exit.c b/linux-user/exit.c index 50266314e0..1ff8fe4f07 100644 --- a/linux-user/exit.c +++ b/linux-user/exit.c @@ -17,7 +17,7 @@ * along with this program; if not, see . */ #include "qemu/osdep.h" -#include "accel/tcg/perf.h" +#include "tcg/perf.h" #include "gdbstub/syscalls.h" #include "qemu.h" #include "user-internals.h" diff --git a/linux-user/main.c b/linux-user/main.c index c9470eeccf..74b2fbb393 100644 --- a/linux-user/main.c +++ b/linux-user/main.c @@ -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" diff --git a/system/vl.c b/system/vl.c index 788d88ea03..60fd1e56b6 100644 --- a/system/vl.c +++ b/system/vl.c @@ -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" diff --git a/accel/tcg/debuginfo.c b/tcg/debuginfo.c similarity index 98% rename from accel/tcg/debuginfo.c rename to tcg/debuginfo.c index 71c66d04d1..3753f7ef67 100644 --- a/accel/tcg/debuginfo.c +++ b/tcg/debuginfo.c @@ -6,11 +6,10 @@ #include "qemu/osdep.h" #include "qemu/lockable.h" +#include "tcg/debuginfo.h" #include -#include "debuginfo.h" - static QemuMutex lock; static Dwfl *dwfl; static const Dwfl_Callbacks dwfl_callbacks = { diff --git a/accel/tcg/perf.c b/tcg/perf.c similarity index 99% rename from accel/tcg/perf.c rename to tcg/perf.c index 68a46b1b52..412a987d95 100644 --- a/accel/tcg/perf.c +++ b/tcg/perf.c @@ -11,13 +11,12 @@ #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/debuginfo.h" +#include "tcg/perf.h" #include "tcg/tcg.h" -#include "debuginfo.h" -#include "perf.h" - static FILE *safe_fopen_w(const char *path) { int saved_errno; diff --git a/tcg/tcg.c b/tcg/tcg.c index e2c38f6d11..eeff4c1d51 100644 --- a/tcg/tcg.c +++ b/tcg/tcg.c @@ -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 diff --git a/accel/tcg/meson.build b/accel/tcg/meson.build index c15ac9ac8f..46f7d53eeb 100644 --- a/accel/tcg/meson.build +++ b/accel/tcg/meson.build @@ -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( diff --git a/tcg/meson.build b/tcg/meson.build index 5afdec1e1a..8251589fd4 100644 --- a/tcg/meson.build +++ b/tcg/meson.build @@ -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',