From nobody Wed May 7 23:47:49 2025
Delivered-To: importer@patchew.org
Authentication-Results: mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass(p=none dis=none) header.from=linaro.org
ARC-Seal: i=1; a=rsa-sha256; t=1696354946; cv=none;
d=zohomail.com; s=zohoarc;
b=LsOGx4dt557DX25eIrulxG8ZeKsmAUjB448bOvm40kS5gBydd3rtVc/mDH1hnw28etZm7csMAJxrVwIiYHYyT+ZmOJk4hEhLrekPXMU4xevGnZQfz1UG4kEnRpTsMuLinjeQtqWTKXH8/ZIObuXm8S9XwD7/BKMouz2GSfOohqw=
ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=zohomail.com;
s=zohoarc;
t=1696354946;
h=Content-Type:Content-Transfer-Encoding:Cc:Date:From:In-Reply-To:List-Subscribe:List-Post:List-Id:List-Archive:List-Help:List-Unsubscribe:MIME-Version:Message-ID:References:Sender:Subject:To;
bh=l1SHewYP4HhsBBXjSXABh2TulTh4eqal54HIe2ta578=;
b=VYABRPF0XitnNxcsLOIh1iJumIMZLcRTIrNB0ojBgPZdiSpwLHNI3vHycJ61zCF7UYhK6j/I53Ly1WCkYDa2Gsp/3c4eS0StynHSpV6yz+OaEawt9fgrmqKcZZJmqPMqIW16xXkaLKKsn2qo2ryAbnk48yDBLDFf7zkYPAwS1DU=
ARC-Authentication-Results: i=1; mx.zohomail.com;
dkim=pass;
spf=pass (zohomail.com: domain of gnu.org designates 209.51.188.17 as
permitted sender)
smtp.mailfrom=qemu-devel-bounces+importer=patchew.org@nongnu.org;
dmarc=pass header.from=<richard.henderson@linaro.org> (p=none dis=none)
Return-Path: <qemu-devel-bounces+importer=patchew.org@nongnu.org>
Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) by
mx.zohomail.com
with SMTPS id 1696354946093782.0663703110409;
Tue, 3 Oct 2023 10:42:26 -0700 (PDT)
Received: from localhost ([::1] helo=lists1p.gnu.org)
by lists.gnu.org with esmtp (Exim 4.90_1)
(envelope-from <qemu-devel-bounces@nongnu.org>)
id 1qnjIh-0000PW-HG; Tue, 03 Oct 2023 13:35:15 -0400
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 <richard.henderson@linaro.org>)
id 1qnjIG-0000Av-HH
for qemu-devel@nongnu.org; Tue, 03 Oct 2023 13:34:52 -0400
Received: from mail-pl1-x631.google.com ([2607:f8b0:4864:20::631])
by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_128_GCM_SHA256:128)
(Exim 4.90_1) (envelope-from <richard.henderson@linaro.org>)
id 1qnjIE-0007sw-BE
for qemu-devel@nongnu.org; Tue, 03 Oct 2023 13:34:48 -0400
Received: by mail-pl1-x631.google.com with SMTP id
d9443c01a7336-1c434c33ec0so8956605ad.3
for <qemu-devel@nongnu.org>; Tue, 03 Oct 2023 10:34:44 -0700 (PDT)
Received: from stoup.. ([71.212.149.95]) by smtp.gmail.com with ESMTPSA id
y9-20020a17090322c900b001bc676df6a9sm1855118plg.132.2023.10.03.10.34.42
(version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
Tue, 03 Oct 2023 10:34:42 -0700 (PDT)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=linaro.org; s=google; t=1696354483; x=1696959283; 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=l1SHewYP4HhsBBXjSXABh2TulTh4eqal54HIe2ta578=;
b=m9vZaxl9F+ekTJ5q5cgQlbegdcOmaZWXVVm4Pvft0919mVJnYqRR0C7SKnuQYfB8CN
GBA5YSWC/aQwPli+yW4m1OM8aEoCUkyDB5w898D4QXgbH+t5+Zl7PSmzHTTrWzx79Bpp
m2L59ZrXPh3+7wN3gn0K0Ab/33T18E6/3FGzqw9EbHbosFKT29jDlJecd02fXxWBii5R
nbLU6Z9dr1HVOt8Jcz1fc2644nziq/lM6nG4TO8S4rs3+NHvBfXY3xRkjGqK1wrngqvb
1n1wsEBKpo2H8r/XPt7/autr9jg0gHrSnhrqa913Oss4a3zSdsP9E0liG1P2UQGmMOCk
wNpQ==
X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
d=1e100.net; s=20230601; t=1696354483; x=1696959283;
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=l1SHewYP4HhsBBXjSXABh2TulTh4eqal54HIe2ta578=;
b=CHi/cU3JFruqUn+H+mMtjDyX/FM7R4CWHH5as6P8+E2CSSm7jVh8usSniRsarhB9+0
YCxGD0WAHiyZxtsPknXe1XIdH3qKfwDiBLrtdBHMDLqoWSpiHLJRZE6E9IHrkYw5xEBL
fYnc9rkf6YrechfElglnw3boE8y8kS2z5Gzp98VoD7324jufHfy29sF1cy1zJM4YX/cX
s92zdnH2IYdLQxfHS5Ln8n+2TZGPSh7O0ghMM0pfUZpR0zp1fVNqzgi+dM4KWsB2EQep
oETAro4xlJcmxEGFil8JO6tej6pi7wx56UTcUWi3jAC8One8y4sJCTPAuDFO1rrl4cFR
S69w==
X-Gm-Message-State: AOJu0YwqFeFjrjIfJMZV7aIsPV7KESM+I/2lQ2kXikQY2S/Vm00vjd+0
ruPtIXQH6LfVba0LMBoCSn3nUzsaw25Uu1baWtQ=
X-Google-Smtp-Source:
AGHT+IGGUJU1j0dhTgNnqF9TDUISfNB3Gge/rBxkyD/H2qA8rvxy71kDoDDcLYYhJAilkQP99BUr4A==
X-Received: by 2002:a17:902:bc4b:b0:1c6:f56:9315 with SMTP id
t11-20020a170902bc4b00b001c60f569315mr187415plz.68.1696354483280;
Tue, 03 Oct 2023 10:34:43 -0700 (PDT)
From: Richard Henderson <richard.henderson@linaro.org>
To: qemu-devel@nongnu.org
Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= <alex.bennee@linaro.org>,
=?UTF-8?q?Philippe=20Mathieu-Daud=C3=A9?= <philmd@linaro.org>,
Paolo Bonzini <pbonzini@redhat.com>
Subject: [PULL 45/47] build: Remove --enable-gprof
Date: Tue, 3 Oct 2023 10:30:50 -0700
Message-Id: <20231003173052.1601813-46-richard.henderson@linaro.org>
X-Mailer: git-send-email 2.34.1
In-Reply-To: <20231003173052.1601813-1-richard.henderson@linaro.org>
References: <20231003173052.1601813-1-richard.henderson@linaro.org>
MIME-Version: 1.0
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable
Received-SPF: pass (zohomail.com: domain of gnu.org designates 209.51.188.17
as permitted sender) client-ip=209.51.188.17;
envelope-from=qemu-devel-bounces+importer=patchew.org@nongnu.org;
helo=lists.gnu.org;
Received-SPF: pass client-ip=2607:f8b0:4864:20::631;
envelope-from=richard.henderson@linaro.org; helo=mail-pl1-x631.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 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: <qemu-devel.nongnu.org>
List-Unsubscribe: <https://lists.nongnu.org/mailman/options/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=unsubscribe>
List-Archive: <https://lists.nongnu.org/archive/html/qemu-devel>
List-Post: <mailto:qemu-devel@nongnu.org>
List-Help: <mailto:qemu-devel-request@nongnu.org?subject=help>
List-Subscribe: <https://lists.nongnu.org/mailman/listinfo/qemu-devel>,
<mailto:qemu-devel-request@nongnu.org?subject=subscribe>
Errors-To: qemu-devel-bounces+importer=patchew.org@nongnu.org
Sender: qemu-devel-bounces+importer=patchew.org@nongnu.org
X-ZohoMail-DKIM: pass (identity @linaro.org)
X-ZM-MESSAGEID: 1696354947412100001
This build option has been deprecated since 8.0.
Remove all CONFIG_GPROF code that depends on that,
including one errant check using TARGET_GPROF.
Acked-by: Alex Benn=C3=A9e <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daud=C3=A9 <philmd@linaro.org>
Acked-by: Paolo Bonzini <pbonzini@redhat.com>
Signed-off-by: Richard Henderson <richard.henderson@linaro.org>
---
docs/about/deprecated.rst | 14 --------------
meson.build | 12 ------------
bsd-user/bsd-proc.h | 3 ---
bsd-user/signal.c | 5 -----
linux-user/exit.c | 6 ------
linux-user/signal.c | 5 -----
meson_options.txt | 3 ---
scripts/meson-buildoptions.sh | 3 ---
tests/qemu-iotests/meson.build | 2 +-
9 files changed, 1 insertion(+), 52 deletions(-)
diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst
index 2f51cf770a..3b074b9ed4 100644
--- a/docs/about/deprecated.rst
+++ b/docs/about/deprecated.rst
@@ -20,20 +20,6 @@ they were first deprecated in the 2.10.0 release.
What follows is a list of all features currently marked as
deprecated.
=20
-Build options
--------------
-
-``gprof`` builds (since 8.0)
-''''''''''''''''''''''''''''
-
-The ``--enable-gprof`` configure setting relies on compiler
-instrumentation to gather its data which can distort the generated
-profile. As other non-instrumenting tools are available that give a
-more holistic view of the system with non-instrumented binaries we are
-deprecating the build option and no longer defend it in CI. The
-``--enable-gcov`` build option remains for analysis test case
-coverage.
-
System emulator command line arguments
--------------------------------------
=20
diff --git a/meson.build b/meson.build
index 12df8fe0de..b8bb69f9ea 100644
--- a/meson.build
+++ b/meson.build
@@ -254,11 +254,6 @@ if host_arch =3D=3D 'i386' and not cc.links('''
qemu_common_flags =3D ['-march=3Di486'] + qemu_common_flags
endif
=20
-if get_option('gprof')
- qemu_common_flags +=3D ['-p']
- qemu_ldflags +=3D ['-p']
-endif
-
if get_option('prefer_static')
qemu_ldflags +=3D get_option('b_pie') ? '-static-pie' : '-static'
endif
@@ -2214,7 +2209,6 @@ config_host_data.set('CONFIG_DEBUG_GRAPH_LOCK', get_o=
ption('debug_graph_lock'))
config_host_data.set('CONFIG_DEBUG_MUTEX', get_option('debug_mutex'))
config_host_data.set('CONFIG_DEBUG_STACK_USAGE', get_option('debug_stack_u=
sage'))
config_host_data.set('CONFIG_DEBUG_TCG', get_option('debug_tcg'))
-config_host_data.set('CONFIG_GPROF', get_option('gprof'))
config_host_data.set('CONFIG_LIVE_BLOCK_MIGRATION', get_option('live_block=
_migration').allowed())
config_host_data.set('CONFIG_QOM_CAST_DEBUG', get_option('qom_cast_debug'))
config_host_data.set('CONFIG_REPLICATION', get_option('replication').allow=
ed())
@@ -4128,12 +4122,6 @@ summary_info +=3D {'memory allocator': get_option('=
malloc')}
summary_info +=3D {'avx2 optimization': config_host_data.get('CONFIG_AVX2_=
OPT')}
summary_info +=3D {'avx512bw optimization': config_host_data.get('CONFIG_A=
VX512BW_OPT')}
summary_info +=3D {'avx512f optimization': config_host_data.get('CONFIG_AV=
X512F_OPT')}
-if get_option('gprof')
- gprof_info =3D 'YES (deprecated)'
-else
- gprof_info =3D get_option('gprof')
-endif
-summary_info +=3D {'gprof': gprof_info}
summary_info +=3D {'gcov': get_option('b_coverage')}
summary_info +=3D {'thread sanitizer': get_option('tsan')}
summary_info +=3D {'CFI support': get_option('cfi')}
diff --git a/bsd-user/bsd-proc.h b/bsd-user/bsd-proc.h
index a1061bffb8..0e1d461c4c 100644
--- a/bsd-user/bsd-proc.h
+++ b/bsd-user/bsd-proc.h
@@ -25,9 +25,6 @@
/* exit(2) */
static inline abi_long do_bsd_exit(void *cpu_env, abi_long arg1)
{
-#ifdef TARGET_GPROF
- _mcleanup();
-#endif
gdb_exit(arg1);
qemu_plugin_user_exit();
_exit(arg1);
diff --git a/bsd-user/signal.c b/bsd-user/signal.c
index dc5ad06a78..9ebff382f6 100644
--- a/bsd-user/signal.c
+++ b/bsd-user/signal.c
@@ -848,11 +848,6 @@ void signal_init(void)
act.sa_flags =3D SA_SIGINFO;
=20
for (i =3D 1; i <=3D TARGET_NSIG; i++) {
-#ifdef CONFIG_GPROF
- if (i =3D=3D TARGET_SIGPROF) {
- continue;
- }
-#endif
host_sig =3D target_to_host_signal(i);
sigaction(host_sig, NULL, &oact);
if (oact.sa_sigaction =3D=3D (void *)SIG_IGN) {
diff --git a/linux-user/exit.c b/linux-user/exit.c
index 3017d28a3c..50266314e0 100644
--- a/linux-user/exit.c
+++ b/linux-user/exit.c
@@ -22,9 +22,6 @@
#include "qemu.h"
#include "user-internals.h"
#include "qemu/plugin.h"
-#ifdef CONFIG_GPROF
-#include <sys/gmon.h>
-#endif
=20
#ifdef CONFIG_GCOV
extern void __gcov_dump(void);
@@ -32,9 +29,6 @@ extern void __gcov_dump(void);
=20
void preexit_cleanup(CPUArchState *env, int code)
{
-#ifdef CONFIG_GPROF
- _mcleanup();
-#endif
#ifdef CONFIG_GCOV
__gcov_dump();
#endif
diff --git a/linux-user/signal.c b/linux-user/signal.c
index a7ba2ccaf4..a67ab47d30 100644
--- a/linux-user/signal.c
+++ b/linux-user/signal.c
@@ -588,11 +588,6 @@ void signal_init(void)
act.sa_flags =3D SA_SIGINFO;
act.sa_sigaction =3D host_signal_handler;
for(i =3D 1; i <=3D TARGET_NSIG; i++) {
-#ifdef CONFIG_GPROF
- if (i =3D=3D TARGET_SIGPROF) {
- continue;
- }
-#endif
host_sig =3D target_to_host_signal(i);
sigaction(host_sig, NULL, &oact);
if (oact.sa_sigaction =3D=3D (void *)SIG_IGN) {
diff --git a/meson_options.txt b/meson_options.txt
index 57e265c871..6a17b90968 100644
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -348,9 +348,6 @@ option('debug_stack_usage', type: 'boolean', value: fal=
se,
description: 'measure coroutine stack usage')
option('qom_cast_debug', type: 'boolean', value: true,
description: 'cast debugging support')
-option('gprof', type: 'boolean', value: false,
- description: 'QEMU profiling with gprof',
- deprecated: true)
option('slirp_smbd', type : 'feature', value : 'auto',
description: 'use smbd (at path --smbd=3D*) in slirp networking')
=20
diff --git a/scripts/meson-buildoptions.sh b/scripts/meson-buildoptions.sh
index e4b46d5715..2a74b0275b 100644
--- a/scripts/meson-buildoptions.sh
+++ b/scripts/meson-buildoptions.sh
@@ -34,7 +34,6 @@ meson_options_help() {
printf "%s\n" ' (choices: auto/disabled/enable=
d/internal/system)'
printf "%s\n" ' --enable-fuzzing build fuzzing targets'
printf "%s\n" ' --enable-gcov Enable coverage tracking.'
- printf "%s\n" ' --enable-gprof QEMU profiling with gprof'
printf "%s\n" ' --enable-lto Use link time optimization'
printf "%s\n" ' --enable-malloc=3DCHOICE choose memory allocator to u=
se [system] (choices:'
printf "%s\n" ' jemalloc/system/tcmalloc)'
@@ -309,8 +308,6 @@ _meson_option_parse() {
--disable-glusterfs) printf "%s" -Dglusterfs=3Ddisabled ;;
--enable-gnutls) printf "%s" -Dgnutls=3Denabled ;;
--disable-gnutls) printf "%s" -Dgnutls=3Ddisabled ;;
- --enable-gprof) printf "%s" -Dgprof=3Dtrue ;;
- --disable-gprof) printf "%s" -Dgprof=3Dfalse ;;
--enable-gtk) printf "%s" -Dgtk=3Denabled ;;
--disable-gtk) printf "%s" -Dgtk=3Ddisabled ;;
--enable-gtk-clipboard) printf "%s" -Dgtk_clipboard=3Denabled ;;
diff --git a/tests/qemu-iotests/meson.build b/tests/qemu-iotests/meson.build
index 44761e1e4d..53847cb98f 100644
--- a/tests/qemu-iotests/meson.build
+++ b/tests/qemu-iotests/meson.build
@@ -1,4 +1,4 @@
-if not have_tools or targetos =3D=3D 'windows' or get_option('gprof')
+if not have_tools or targetos =3D=3D 'windows'
subdir_done()
endif
=20
--=20
2.34.1