From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-16.0 required=3.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,HEADER_FROM_DIFFERENT_DOMAINS, INCLUDES_CR_TRAILER,INCLUDES_PATCH,MAILING_LIST_MULTI,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 810ADC433E0 for ; Fri, 12 Mar 2021 18:11:28 +0000 (UTC) Received: from lists.gnu.org (lists.gnu.org [209.51.188.17]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id 0A35A64F45 for ; Fri, 12 Mar 2021 18:11:28 +0000 (UTC) DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 0A35A64F45 Authentication-Results: mail.kernel.org; dmarc=fail (p=none dis=none) header.from=redhat.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Received: from localhost ([::1]:53750 helo=lists1p.gnu.org) by lists.gnu.org with esmtp (Exim 4.90_1) (envelope-from ) id 1lKmFy-0006Ow-VK for qemu-devel@archiver.kernel.org; Fri, 12 Mar 2021 13:11:26 -0500 Received: from eggs.gnu.org ([2001:470:142:3::10]:58180) by lists.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lKlWE-0007KE-4M for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:10 -0500 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32194) by eggs.gnu.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.90_1) (envelope-from ) id 1lKlWB-0000d4-1q for qemu-devel@nongnu.org; Fri, 12 Mar 2021 12:24:09 -0500 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1615569846; 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=UV6qEH9d29KpsCmMRutlaGT1AZj0e8gXQLM2MDRePww=; b=GxY1pX1GDYZtklzq+lpgcw8RXa8tHuXQ/7fj+E4jEB1lC8T4wPUuBhxtjHwTZcpuXVdxJY FNqi0Xsx5gCvZotAGH9hiHH2ucpsxyAR0q2Rvk5cFsQoEKZEaypkWO6jedK1NKJkfebQLH QGihYpChAclSS0Nx+m8bNTzF8MkF14w= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-33-eFoE6moRNQ2EILoInsyyig-1; Fri, 12 Mar 2021 12:24:04 -0500 X-MC-Unique: eFoE6moRNQ2EILoInsyyig-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.phx2.redhat.com [10.5.11.23]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id DBA71800D55; Fri, 12 Mar 2021 17:24:02 +0000 (UTC) Received: from thuth.com (ovpn-112-83.ams2.redhat.com [10.36.112.83]) by smtp.corp.redhat.com (Postfix) with ESMTP id E179B19744; Fri, 12 Mar 2021 17:24:01 +0000 (UTC) From: Thomas Huth To: qemu-devel@nongnu.org, Peter Maydell Subject: [PULL 2/9] tests: Move benchmarks into a separate folder Date: Fri, 12 Mar 2021 18:23:49 +0100 Message-Id: <20210312172356.968219-3-thuth@redhat.com> In-Reply-To: <20210312172356.968219-1-thuth@redhat.com> References: <20210312172356.968219-1-thuth@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 2.84 on 10.5.11.23 Authentication-Results: relay.mimecast.com; auth=pass smtp.auth=CUSA124A263 smtp.mailfrom=thuth@redhat.com X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Received-SPF: pass client-ip=216.205.24.124; envelope-from=thuth@redhat.com; helo=us-smtp-delivery-124.mimecast.com X-Spam_score_int: -29 X-Spam_score: -3.0 X-Spam_bar: --- X-Spam_report: (-3.0 / 5.0 requ) BAYES_00=-1.9, DKIMWL_WL_HIGH=-0.25, DKIM_SIGNED=0.1, DKIM_VALID=-0.1, DKIM_VALID_AU=-0.1, DKIM_VALID_EF=-0.1, RCVD_IN_DNSWL_LOW=-0.7, RCVD_IN_MSPIKE_H3=0.001, RCVD_IN_MSPIKE_WL=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.23 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: =?UTF-8?q?Alex=20Benn=C3=A9e?= Errors-To: qemu-devel-bounces+qemu-devel=archiver.kernel.org@nongnu.org Sender: "Qemu-devel" Make it clear that these files are related to benchmarks by moving them into a new folder called "bench". Message-Id: <20210312092238.79509-1-thuth@redhat.com> Acked-by: Paolo Bonzini Signed-off-by: Thomas Huth --- MAINTAINERS | 2 +- tests/{ => bench}/atomic64-bench.c | 0 tests/{ => bench}/atomic_add-bench.c | 0 tests/{ => bench}/benchmark-crypto-cipher.c | 0 tests/{ => bench}/benchmark-crypto-hash.c | 0 tests/{ => bench}/benchmark-crypto-hmac.c | 0 tests/bench/meson.build | 34 +++++++++++++++++++++ tests/{ => bench}/qht-bench.c | 0 tests/meson.build | 34 +-------------------- 9 files changed, 36 insertions(+), 34 deletions(-) rename tests/{ => bench}/atomic64-bench.c (100%) rename tests/{ => bench}/atomic_add-bench.c (100%) rename tests/{ => bench}/benchmark-crypto-cipher.c (100%) rename tests/{ => bench}/benchmark-crypto-hash.c (100%) rename tests/{ => bench}/benchmark-crypto-hmac.c (100%) create mode 100644 tests/bench/meson.build rename tests/{ => bench}/qht-bench.c (100%) diff --git a/MAINTAINERS b/MAINTAINERS index e6c43c6833..9a68f09b25 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -2722,7 +2722,7 @@ F: crypto/ F: include/crypto/ F: qapi/crypto.json F: tests/unit/test-crypto-* -F: tests/benchmark-crypto-* +F: tests/bench/benchmark-crypto-* F: tests/unit/crypto-tls-* F: tests/unit/pkix_asn1_tab.c F: qemu.sasl diff --git a/tests/atomic64-bench.c b/tests/bench/atomic64-bench.c similarity index 100% rename from tests/atomic64-bench.c rename to tests/bench/atomic64-bench.c diff --git a/tests/atomic_add-bench.c b/tests/bench/atomic_add-bench.c similarity index 100% rename from tests/atomic_add-bench.c rename to tests/bench/atomic_add-bench.c diff --git a/tests/benchmark-crypto-cipher.c b/tests/bench/benchmark-crypto-cipher.c similarity index 100% rename from tests/benchmark-crypto-cipher.c rename to tests/bench/benchmark-crypto-cipher.c diff --git a/tests/benchmark-crypto-hash.c b/tests/bench/benchmark-crypto-hash.c similarity index 100% rename from tests/benchmark-crypto-hash.c rename to tests/bench/benchmark-crypto-hash.c diff --git a/tests/benchmark-crypto-hmac.c b/tests/bench/benchmark-crypto-hmac.c similarity index 100% rename from tests/benchmark-crypto-hmac.c rename to tests/bench/benchmark-crypto-hmac.c diff --git a/tests/bench/meson.build b/tests/bench/meson.build new file mode 100644 index 0000000000..00b3c209dc --- /dev/null +++ b/tests/bench/meson.build @@ -0,0 +1,34 @@ + +qht_bench = executable('qht-bench', + sources: 'qht-bench.c', + dependencies: [qemuutil]) + +executable('atomic_add-bench', + sources: files('atomic_add-bench.c'), + dependencies: [qemuutil], + build_by_default: false) + +executable('atomic64-bench', + sources: files('atomic64-bench.c'), + dependencies: [qemuutil], + build_by_default: false) + +benchs = {} + +if have_block + benchs += { + 'benchmark-crypto-hash': [crypto], + 'benchmark-crypto-hmac': [crypto], + 'benchmark-crypto-cipher': [crypto], + } +endif + +foreach bench_name, deps: benchs + exe = executable(bench_name, bench_name + '.c', + dependencies: [qemuutil] + deps) + benchmark(bench_name, exe, + args: ['--tap', '-k'], + protocol: 'tap', + timeout: 0, + suite: ['speed']) +endforeach diff --git a/tests/qht-bench.c b/tests/bench/qht-bench.c similarity index 100% rename from tests/qht-bench.c rename to tests/bench/qht-bench.c diff --git a/tests/meson.build b/tests/meson.build index af43fd1eaf..55a7b08275 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -1,18 +1,6 @@ py3 = import('python').find_installation() -qht_bench = executable('qht-bench', - sources: 'qht-bench.c', - dependencies: [qemuutil]) - -executable('atomic_add-bench', - sources: files('atomic_add-bench.c'), - dependencies: [qemuutil], - build_by_default: false) - -executable('atomic64-bench', - sources: files('atomic64-bench.c'), - dependencies: [qemuutil], - build_by_default: false) +subdir('bench') test_qapi_outputs = [ 'qapi-builtin-types.c', @@ -73,26 +61,6 @@ test_deps = { 'test-qht-par': qht_bench, } -benchs = {} - -if have_block - benchs += { - 'benchmark-crypto-hash': [crypto], - 'benchmark-crypto-hmac': [crypto], - 'benchmark-crypto-cipher': [crypto], - } -endif - -foreach bench_name, deps: benchs - exe = executable(bench_name, bench_name + '.c', - dependencies: [qemuutil] + deps) - benchmark(bench_name, exe, - args: ['--tap', '-k'], - protocol: 'tap', - timeout: 0, - suite: ['speed']) -endforeach - if have_tools and 'CONFIG_VHOST_USER' in config_host and 'CONFIG_LINUX' in config_host executable('vhost-user-bridge', sources: files('vhost-user-bridge.c'), -- 2.27.0