From patchwork Tue Feb 7 20:14:43 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Thomas Huth X-Patchwork-Id: 651267 Delivered-To: patch@linaro.org Received: by 2002:a17:522:d8c:b0:4be:c3dc:14d8 with SMTP id d12csp3090356pva; Tue, 7 Feb 2023 12:15:47 -0800 (PST) X-Google-Smtp-Source: AK7set8wjnl54oL2TIuLDFxilPnsKxmFCk7srZ1ASCj81I3UHICAvXYULnhmRf5Li/Z5vMY8HQRj X-Received: by 2002:a05:6214:401c:b0:56c:52e:b169 with SMTP id kd28-20020a056214401c00b0056c052eb169mr6744022qvb.50.1675800947110; Tue, 07 Feb 2023 12:15:47 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1675800947; cv=none; d=google.com; s=arc-20160816; b=o/0oZZQcGRZULbGVZ9E5/33/6g+8W3ejLUOEn1j6pnyh1+onyNXKnlNa3+++xwR7or vy+pNbBTXZhQEWTHe+b9txlMi2fanqw4Z36nU3wZaYzcrRV8pgZyBXSyO+4uRxvaq75w pyDC25y0aOq71nkMvt9MPwA/Hoe/ojfcdZu26Dse+F8pMbJyueLFh0rALtvWspkkAnaB n4yt4njjDaXYXE4JaXiwunmHwZPVjIovkRqnQJlaEYN8g8zHmnIXsLWjkVPTN6ISvK/Q uQhfAPr6gxGJ0KoQSrZBh9DV6230n7mHCzcHMApG04wWw0o7HmEKJNXksW1Tc3j+D2k9 clKQ== 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=RT+calkQzOfc76YQqxKcCGbpujDbUe5qLV+fxpDYTmA=; b=S7FBszTB7bW1G1ysK2i0KLw5oM8JGbgkbhP2XKYDTeToAJMiCVoJLZYEu/u1YtRkCb bx0qOH/irIExNpHsJ+8qhAu/fEEOjaQtLCP+KNZQ9mCQQIcVjVeYus4Q+rbpzssSwo6d QtlnA1+kI1HuWbYm0BJ2EKjcbh3gIaO+GcFUvSs2A97Fujp0agpdsvC0rJFCDeNv+f21 ax/f87/XRN5kWNhnX6emyn+iXr08V1qjVrnUmPHAjcDLCiDCQB7IEfLJiQtP1G7/phB+ qsPDUsO1XIyx1PEj8qT/1RAKwaweWLBh8I2s1o1VEaQAQ4aWrRG90hbFN4UwAUkY4gM7 uo3A== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=XvbObIeg; 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=redhat.com Return-Path: Received: from lists.gnu.org (lists.gnu.org. [209.51.188.17]) by mx.google.com with ESMTPS id l124-20020a378982000000b0071e48ce96fbsi10593398qkd.482.2023.02.07.12.15.46 for (version=TLS1_2 cipher=ECDHE-ECDSA-CHACHA20-POLY1305 bits=256/256); Tue, 07 Feb 2023 12:15:47 -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=@redhat.com header.s=mimecast20190719 header.b=XvbObIeg; 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=redhat.com Received: from localhost ([::1] helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1pPUNP-0007M7-AG; Tue, 07 Feb 2023 15:15:39 -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 1pPUMy-0006sN-EA for qemu-devel@nongnu.org; Tue, 07 Feb 2023 15:15:12 -0500 Received: from us-smtp-delivery-124.mimecast.com ([170.10.129.124]) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1pPUMq-0007PE-2I for qemu-devel@nongnu.org; Tue, 07 Feb 2023 15:15:06 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1675800903; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=RT+calkQzOfc76YQqxKcCGbpujDbUe5qLV+fxpDYTmA=; b=XvbObIegXByAFBAP88/tXN750SmemEmqAObacFtQyYL+N2guaqTh/UjleU1+NQ1AZ9LCIS LYD7k6GE8UFtKA2J3GuC2mdfz7sSi8KrqYSYMc8NctHo0I662lC85RKM4FY12NLIJhP2YF Sv4FlMu6Ksh52zIgSnDrC03Q8lTqik0= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id us-mta-65-6Za7J0wSMy-bySpYAbrSFw-1; Tue, 07 Feb 2023 15:14:59 -0500 X-MC-Unique: 6Za7J0wSMy-bySpYAbrSFw-1 Received: from smtp.corp.redhat.com (int-mx10.intmail.prod.int.rdu2.redhat.com [10.11.54.10]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 33705857D07; Tue, 7 Feb 2023 20:14:58 +0000 (UTC) Received: from thuth.com (unknown [10.39.192.12]) by smtp.corp.redhat.com (Postfix) with ESMTP id 07E88492B21; Tue, 7 Feb 2023 20:14:50 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, =?utf-8?q?Alex_Benn=C3=A9e?= , Peter Maydell Cc: =?utf-8?q?Philippe_Mathieu-Daud=C3=A9?= , Stefan Hajnoczi , Richard Henderson , Fabiano Rosas , =?utf-8?q?Daniel_P_=2E_Berrang=C3=A9?= Subject: [PATCH v2 1/5] build: deprecate --enable-gprof builds and remove from CI Date: Tue, 7 Feb 2023 21:14:43 +0100 Message-Id: <20230207201447.566661-2-thuth@redhat.com> In-Reply-To: <20230207201447.566661-1-thuth@redhat.com> References: <20230207201447.566661-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.1 on 10.11.54.10 Received-SPF: pass client-ip=170.10.129.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.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, DKIMWL_WL_HIGH=-0.001, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_NONE=-0.0001, RCVD_IN_MSPIKE_H2=-0.001, 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: 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: Alex Bennée As gprof relies on instrumentation you rarely get useful data compared to a real optimised build. Lets deprecate the build option and simplify the CI configuration as a result. Buglink: https://gitlab.com/qemu-project/qemu/-/issues/1338 Signed-off-by: Alex Bennée Message-Id: <20230131094224.861621-1-alex.bennee@linaro.org> Reviewed-by: Thomas Huth Reviewed-by: Philippe Mathieu-Daudé Signed-off-by: Thomas Huth Reviewed-by: David Woodhouse --- docs/about/deprecated.rst | 14 ++++++++++++++ meson.build | 7 ++++++- .gitlab-ci.d/buildtest.yml | 19 ++++--------------- meson_options.txt | 3 ++- 4 files changed, 26 insertions(+), 17 deletions(-) diff --git a/docs/about/deprecated.rst b/docs/about/deprecated.rst index da2e6fe63d..9317046177 100644 --- a/docs/about/deprecated.rst +++ b/docs/about/deprecated.rst @@ -20,6 +20,20 @@ they were first deprecated in the 2.10.0 release. What follows is a list of all features currently marked as deprecated. +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 -------------------------------------- diff --git a/meson.build b/meson.build index 4ba3bf3431..bc60bf3c4c 100644 --- a/meson.build +++ b/meson.build @@ -3784,7 +3784,12 @@ summary_info += {'mutex debugging': get_option('debug_mutex')} summary_info += {'memory allocator': get_option('malloc')} summary_info += {'avx2 optimization': config_host_data.get('CONFIG_AVX2_OPT')} summary_info += {'avx512f optimization': config_host_data.get('CONFIG_AVX512F_OPT')} -summary_info += {'gprof enabled': get_option('gprof')} +if get_option('gprof') + gprof_info = 'YES (deprecated)' +else + gprof_info = get_option('gprof') +endif +summary_info += {'gprof': gprof_info} summary_info += {'gcov': get_option('b_coverage')} summary_info += {'thread sanitizer': config_host.has_key('CONFIG_TSAN')} summary_info += {'CFI support': get_option('cfi')} diff --git a/.gitlab-ci.d/buildtest.yml b/.gitlab-ci.d/buildtest.yml index 0aa149a352..8f332fc36f 100644 --- a/.gitlab-ci.d/buildtest.yml +++ b/.gitlab-ci.d/buildtest.yml @@ -467,27 +467,16 @@ tsan-build: TARGETS: x86_64-softmmu ppc64-softmmu riscv64-softmmu x86_64-linux-user MAKE_CHECK_ARGS: bench V=1 -# gprof/gcov are GCC features -build-gprof-gcov: +# gcov is a GCC features +gcov: extends: .native_build_job_template needs: job: amd64-ubuntu2004-container + timeout: 80m variables: IMAGE: ubuntu2004 - CONFIGURE_ARGS: --enable-gprof --enable-gcov + CONFIGURE_ARGS: --enable-gcov TARGETS: aarch64-softmmu ppc64-softmmu s390x-softmmu x86_64-softmmu - artifacts: - expire_in: 1 days - paths: - - build - -check-gprof-gcov: - extends: .native_test_job_template - needs: - - job: build-gprof-gcov - artifacts: true - variables: - IMAGE: ubuntu2004 MAKE_CHECK_ARGS: check after_script: - cd build diff --git a/meson_options.txt b/meson_options.txt index 559a571b6b..53459c15fc 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -316,7 +316,8 @@ option('debug_stack_usage', type: 'boolean', value: false, option('qom_cast_debug', type: 'boolean', value: false, description: 'cast debugging support') option('gprof', type: 'boolean', value: false, - description: 'QEMU profiling with gprof') + description: 'QEMU profiling with gprof', + deprecated: true) option('profiler', type: 'boolean', value: false, description: 'profiler support') option('slirp_smbd', type : 'feature', value : 'auto',