From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by inbox.dpdk.org (Postfix) with ESMTP id 42D4941D8D for ; Mon, 27 Feb 2023 08:16:56 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 3A41D41151; Mon, 27 Feb 2023 08:16:56 +0100 (CET) Received: from NAM12-BN8-obe.outbound.protection.outlook.com (mail-bn8nam12on2058.outbound.protection.outlook.com [40.107.237.58]) by mails.dpdk.org (Postfix) with ESMTP id 7B243410D3 for ; Mon, 27 Feb 2023 08:16:54 +0100 (CET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=DlReInN9dvXmdoMixzxQASzPeGWLU63KqQRCHGWkSkIDZQ0+C/8R0Y8RXwuLNvzq22jiJEPLQzVft+/AhK13sJx9/jaySkDz8bXj0qppEhJWQ0YxR8eW0o2jLdMNR0/xZ+BfMz8sCgwsead5SXx08X6pdPzYxWVk9B/V+8Z6AfxKzlns6lqzmf91LzZaOfhzcReZjDkiHVxuWbK4RPxjKhpBehZDPbyHqQBIjkHJL6DOg5rpY2khrkowtv6FYj+uqsVz1A76tnIgpwejQAU14eiPKIIj0RfbZZh1bfueljoi/VRKBdrieMTM5kaeO3F+h7QXWB5a6AvtyZDAE5zXuQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=ssscYn7U7XoE5Atm+y46DU3L3Ydu/5SCqrcbeZEUmmU=; b=GSNCKmPUq6ApHadO9BF/S+Xg5FOxg3F1v2hEJPsQWVZZQzoptLSsfFvgfmivufr0qjU33phhGLQMAh0UWVgXDalso5ZI+Auern808hOL2w/nUy8oV2ObHVKML/LD4QMFRIlC0bP/uPpe1SKutSNYN9nHqOzBVly9tvaUO3fLCdm6yTWfRI3GhboZhFktKYi510QtMD39oJ9Zc99LbdSzyYxinudQEfaTMqmwFiJmnOL5rrF/hHp+qfH7qAOOuL2iunn7emMpCTd8oZcru2ZyDJ4tTqwq54YpGjUKgGdi4CLoxKAdVhHwSLRDD3Ex1ZuZJEPJ8vzfQ0SLeX80XUKjrA== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass (sender ip is 216.228.117.161) smtp.rcpttodomain=dpdk.org smtp.mailfrom=nvidia.com; dmarc=pass (p=reject sp=reject pct=100) action=none header.from=nvidia.com; dkim=none (message not signed); arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=Nvidia.com; s=selector2; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=ssscYn7U7XoE5Atm+y46DU3L3Ydu/5SCqrcbeZEUmmU=; b=le16rlf5wJISIf4+yuJ8axl5TTFrTgBJNBomlGXUNqlY5MU1D9yf+ZnYGh+i3xN8sEFH/WM31kOy3v3Zc/uoNAVWvAtt71vn1Wn0ExD13G9sjxz7XkKtBZGVHtEfrSw+d3qu6l2HXmcS6/zgyoznvnE0WYaw87479Ifx4mI2857CSukIoQoE/cIot2rWuvb7Q1qhQUwOoe6kOwNPN98LXPIbEygf+JgNeK3pu04BWcyRWuX8pdm0bvrsdHSQv5qax6Ey/cxQFkC7d+NWO/+FSWm/rvJSdaF6CXCyVCBP6ClHasQiN5rN8BMWeJWWUVUlokDscrrhC+XYYKThY8yOzw== Received: from BL1PR13CA0142.namprd13.prod.outlook.com (2603:10b6:208:2bb::27) by CH0PR12MB5347.namprd12.prod.outlook.com (2603:10b6:610:d6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6134.29; Mon, 27 Feb 2023 07:16:49 +0000 Received: from BL02EPF00010208.namprd05.prod.outlook.com (2603:10b6:208:2bb:cafe::e6) by BL1PR13CA0142.outlook.office365.com (2603:10b6:208:2bb::27) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.16 via Frontend Transport; Mon, 27 Feb 2023 07:16:49 +0000 X-MS-Exchange-Authentication-Results: spf=pass (sender IP is 216.228.117.161) smtp.mailfrom=nvidia.com; dkim=none (message not signed) header.d=none;dmarc=pass action=none header.from=nvidia.com; Received-SPF: Pass (protection.outlook.com: domain of nvidia.com designates 216.228.117.161 as permitted sender) receiver=protection.outlook.com; client-ip=216.228.117.161; helo=mail.nvidia.com; pr=C Received: from mail.nvidia.com (216.228.117.161) by BL02EPF00010208.mail.protection.outlook.com (10.167.241.199) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.6156.12 via Frontend Transport; Mon, 27 Feb 2023 07:16:49 +0000 Received: from rnnvmail201.nvidia.com (10.129.68.8) by mail.nvidia.com (10.129.200.67) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.36; Sun, 26 Feb 2023 23:16:32 -0800 Received: from nvidia.com (10.126.231.37) by rnnvmail201.nvidia.com (10.129.68.8) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.2.986.37; Sun, 26 Feb 2023 23:16:30 -0800 From: Xueming Li To: Michael Baum CC: Matan Azrad , dpdk stable Subject: patch 'app/compress-perf: fix testing single operation' has been queued to stable release 22.11.2 Date: Mon, 27 Feb 2023 15:00:51 +0800 Message-ID: <20230227070107.15664-143-xuemingl@nvidia.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20230227070107.15664-1-xuemingl@nvidia.com> References: <20230227062349.13764-1-xuemingl@nvidia.com> <20230227070107.15664-1-xuemingl@nvidia.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain X-Originating-IP: [10.126.231.37] X-ClientProxiedBy: rnnvmail202.nvidia.com (10.129.68.7) To rnnvmail201.nvidia.com (10.129.68.8) X-EOPAttributedMessage: 0 X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: BL02EPF00010208:EE_|CH0PR12MB5347:EE_ X-MS-Office365-Filtering-Correlation-Id: 4a6e1566-ab89-40d3-5586-08db189297af X-MS-Exchange-SenderADCheck: 1 X-MS-Exchange-AntiSpam-Relay: 0 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 0o601JmHvGesopgbj5sD7/XAcV1TvrDL/lSQwW1wUIsxJ2iBgrvNSGDbdGI5zxLjm5v39vxf7dSInhGZGkgkKBA0cp5PIl0XJkSW4AYsQjmKDn51Zc2vdVvq48m26djSN7IU1AHxphbU1szJpnVZWJjefso9q5Qf5XJztj6EKNKFZ9now/tZfwYZlEx6xLJDs6m6v6gcuYWNwRcn3zomzEfT+WxpQ/b+ath1l+u2RsiEsiH23cD3jldjW04VWeiD/bdRRjnHqQ8oct3zEhf+UyGAAR+BtRilm/4zCyx/K/JJPnnkwxu0dSZ5PACOU4fDk+mTo9ajMcvSZWx6fUIVj+b7uHXGYL4P8AZABlE3O3lcpyPTdz3+7Ni/MjofZcavjmihGF8ol+1kt7axf2IUnugeq20xC2MEt9dVBS0m2gXJNEoufdwYFQF9fotwrCs3IaiwOW0XijYMxlL5zdCipyOjC7+WUm8o0t+H904PwQD664Y2E6T4cfuA3Zd2pNtQ+TgKIbL5NqHjBgiDnv9R+auEGj1YzXGsWhjtq8xlyocCHpTwFtzxZ66m9hnKLP1GB8jpCXGaqwmLT/fC8/aP3kxuzH9wB4ZIe4YoXqHg+Zs1jFgeK8fGi84MQKpE1b9XWeEzFOWtgIeh2Z+xbft5tkKM9ggepQb5OzyVdEf61XyPWN1kiosOoolPQcW78bJjhCfhRsVl9xXwkOVm3YCRKkklhJeUp5keAKgeDazFx1+bUH3q7rOFVGw73c/L21Lkv0JqjlqtFys1cMOpoetipfvPnPHsSImNJL8GwTRuo+Y= X-Forefront-Antispam-Report: CIP:216.228.117.161; CTRY:US; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:mail.nvidia.com; PTR:dc6edge2.nvidia.com; CAT:NONE; SFS:(13230025)(4636009)(396003)(376002)(136003)(346002)(39860400002)(451199018)(46966006)(36840700001)(40470700004)(356005)(82740400003)(70586007)(4326008)(8676002)(70206006)(36860700001)(478600001)(8936002)(40480700001)(30864003)(41300700001)(6862004)(5660300002)(86362001)(7636003)(53546011)(1076003)(6666004)(6286002)(83380400001)(186003)(26005)(16526019)(47076005)(336012)(426003)(2616005)(55016003)(7696005)(966005)(82310400005)(37006003)(6636002)(36756003)(54906003)(316002)(40460700003)(2906002); DIR:OUT; SFP:1101; X-OriginatorOrg: Nvidia.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 27 Feb 2023 07:16:49.0324 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 4a6e1566-ab89-40d3-5586-08db189297af X-MS-Exchange-CrossTenant-Id: 43083d15-7273-40c1-b7db-39efd9ccc17a X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=43083d15-7273-40c1-b7db-39efd9ccc17a; Ip=[216.228.117.161]; Helo=[mail.nvidia.com] X-MS-Exchange-CrossTenant-AuthSource: BL02EPF00010208.namprd05.prod.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: CH0PR12MB5347 X-BeenThere: stable@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: patches for DPDK stable branches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: stable-bounces@dpdk.org Hi, FYI, your patch has been queued to stable release 22.11.2 Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet. It will be pushed if I get no objections before 03/01/23. So please shout if anyone has objections. Also note that after the patch there's a diff of the upstream commit vs the patch applied to the branch. This will indicate if there was any rebasing needed to apply to the stable branch. If there were code changes for rebasing (ie: not only metadata diffs), please double check that the rebase was correctly done. Queued patches are on a temporary branch at: https://git.dpdk.org/dpdk-stable/log/?h=22.11-staging This queued commit can be viewed at: https://git.dpdk.org/dpdk-stable/commit/?h=22.11-staging&id=ad62d3f41062dd1cd4354c75ad89fae6fc289b12 Thanks. Xueming Li --- >From ad62d3f41062dd1cd4354c75ad89fae6fc289b12 Mon Sep 17 00:00:00 2001 From: Michael Baum Date: Tue, 14 Feb 2023 19:40:28 +0200 Subject: [PATCH] app/compress-perf: fix testing single operation Cc: Xueming Li [ upstream commit 83cc3b90ad7a63868a43a67d6aa13b55068fbe0c ] Part of the application options is to test only compress and only decompress but actually the application ignores this user option and tries to test always both compress and decompress. Allow testing only compress and only decompress. Fixes: e0b6287c035d ("app/compress-perf: add parser") Signed-off-by: Matan Azrad Signed-off-by: Michael Baum --- app/test-compress-perf/comp_perf_options.h | 6 +- .../comp_perf_options_parse.c | 4 +- .../comp_perf_test_common.c | 126 +++++++++++++----- .../comp_perf_test_cyclecount.c | 69 ++++++---- .../comp_perf_test_throughput.c | 64 +++++---- .../comp_perf_test_verify.c | 60 ++++++--- app/test-compress-perf/main.c | 8 ++ 7 files changed, 223 insertions(+), 114 deletions(-) diff --git a/app/test-compress-perf/comp_perf_options.h b/app/test-compress-perf/comp_perf_options.h index 57dd146330..d00b299247 100644 --- a/app/test-compress-perf/comp_perf_options.h +++ b/app/test-compress-perf/comp_perf_options.h @@ -32,9 +32,9 @@ enum cperf_test_type { }; enum comp_operation { - COMPRESS_ONLY, - DECOMPRESS_ONLY, - COMPRESS_DECOMPRESS + COMPRESS = (1 << 0), + DECOMPRESS = (1 << 1), + COMPRESS_DECOMPRESS = (COMPRESS | DECOMPRESS), }; struct range_list { diff --git a/app/test-compress-perf/comp_perf_options_parse.c b/app/test-compress-perf/comp_perf_options_parse.c index 9b9d4e6554..303e714cda 100644 --- a/app/test-compress-perf/comp_perf_options_parse.c +++ b/app/test-compress-perf/comp_perf_options_parse.c @@ -446,11 +446,11 @@ parse_op_type(struct comp_test_data *test_data, const char *arg) struct name_id_map optype_namemap[] = { { "comp", - COMPRESS_ONLY + COMPRESS }, { "decomp", - DECOMPRESS_ONLY + DECOMPRESS }, { "comp_and_decomp", diff --git a/app/test-compress-perf/comp_perf_test_common.c b/app/test-compress-perf/comp_perf_test_common.c index b402a0d839..cd60958944 100644 --- a/app/test-compress-perf/comp_perf_test_common.c +++ b/app/test-compress-perf/comp_perf_test_common.c @@ -227,23 +227,43 @@ comp_perf_allocate_memory(struct comp_test_data *test_data, { uint16_t comp_mbuf_size; uint16_t decomp_mbuf_size; + size_t comp_data_size; + size_t decomp_data_size; + size_t output_data_sz; test_data->out_seg_sz = find_buf_size(test_data->seg_sz); - /* Number of segments for input and output - * (compression and decompression) - */ - test_data->total_segs = DIV_CEIL(test_data->input_data_sz, - test_data->seg_sz); + if (test_data->test_op & COMPRESS) { + /* + * Number of segments for input and output + * (compression and decompression) + */ + test_data->total_segs = DIV_CEIL(test_data->input_data_sz, + test_data->seg_sz); + } else { + /* + * When application does decompression only, input data is + * compressed and smaller than the output. The expected size of + * uncompressed data given by the user in segment size argument. + */ + test_data->total_segs = test_data->max_sgl_segs; + } + + output_data_sz = (size_t) test_data->out_seg_sz * test_data->total_segs; + output_data_sz = + RTE_MAX(output_data_sz, (size_t) MIN_COMPRESSED_BUF_SIZE); if (test_data->use_external_mbufs != 0) { if (comp_perf_allocate_external_mbufs(test_data, mem) < 0) return -1; comp_mbuf_size = 0; decomp_mbuf_size = 0; - } else { + } else if (test_data->test_op & COMPRESS) { comp_mbuf_size = test_data->out_seg_sz + RTE_PKTMBUF_HEADROOM; decomp_mbuf_size = test_data->seg_sz + RTE_PKTMBUF_HEADROOM; + } else { + comp_mbuf_size = test_data->seg_sz + RTE_PKTMBUF_HEADROOM; + decomp_mbuf_size = test_data->out_seg_sz + RTE_PKTMBUF_HEADROOM; } char pool_name[32] = ""; @@ -287,26 +307,28 @@ comp_perf_allocate_memory(struct comp_test_data *test_data, return -1; } - /* - * Compressed data might be a bit larger than input data, - * if data cannot be compressed - */ - mem->compressed_data = rte_zmalloc_socket(NULL, - RTE_MAX( - (size_t) test_data->out_seg_sz * - test_data->total_segs, - (size_t) MIN_COMPRESSED_BUF_SIZE), - 0, - rte_socket_id()); + if (test_data->test_op & COMPRESS) { + /* + * Compressed data might be a bit larger than input data, + * if data cannot be compressed + */ + comp_data_size = output_data_sz; + decomp_data_size = test_data->input_data_sz; + } else { + comp_data_size = test_data->input_data_sz; + decomp_data_size = output_data_sz; + } + + mem->compressed_data = rte_zmalloc_socket(NULL, comp_data_size, 0, + rte_socket_id()); if (mem->compressed_data == NULL) { RTE_LOG(ERR, USER1, "Memory to hold the data from the input " "file could not be allocated\n"); return -1; } - mem->decompressed_data = rte_zmalloc_socket(NULL, - test_data->input_data_sz, 0, - rte_socket_id()); + mem->decompressed_data = rte_zmalloc_socket(NULL, decomp_data_size, 0, + rte_socket_id()); if (mem->decompressed_data == NULL) { RTE_LOG(ERR, USER1, "Memory to hold the data from the input " "file could not be allocated\n"); @@ -351,6 +373,7 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) uint16_t segs_per_mbuf = 0; uint32_t cmz = 0; uint32_t dmz = 0; + bool decompress_only = !!(test_data->test_op == DECOMPRESS); for (i = 0; i < mem->total_bufs; i++) { /* Allocate data in input mbuf and copy data from input file */ @@ -361,8 +384,6 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) return -1; } - data_sz = RTE_MIN(remaining_data, test_data->seg_sz); - if (test_data->use_external_mbufs != 0) { rte_pktmbuf_attach_extbuf(mem->decomp_bufs[i], mem->decomp_memzones[dmz]->addr, @@ -372,16 +393,23 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) dmz++; } + if (!decompress_only) + data_sz = RTE_MIN(remaining_data, test_data->seg_sz); + else + data_sz = test_data->out_seg_sz; + data_addr = (uint8_t *) rte_pktmbuf_append( mem->decomp_bufs[i], data_sz); if (data_addr == NULL) { RTE_LOG(ERR, USER1, "Could not append data\n"); return -1; } - rte_memcpy(data_addr, input_data_ptr, data_sz); - input_data_ptr += data_sz; - remaining_data -= data_sz; + if (!decompress_only) { + rte_memcpy(data_addr, input_data_ptr, data_sz); + input_data_ptr += data_sz; + remaining_data -= data_sz; + } /* Already one segment in the mbuf */ segs_per_mbuf = 1; @@ -398,8 +426,6 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) return -1; } - data_sz = RTE_MIN(remaining_data, test_data->seg_sz); - if (test_data->use_external_mbufs != 0) { rte_pktmbuf_attach_extbuf( next_seg, @@ -410,6 +436,12 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) dmz++; } + if (!decompress_only) + data_sz = RTE_MIN(remaining_data, + test_data->seg_sz); + else + data_sz = test_data->out_seg_sz; + data_addr = (uint8_t *)rte_pktmbuf_append(next_seg, data_sz); @@ -418,9 +450,11 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) return -1; } - rte_memcpy(data_addr, input_data_ptr, data_sz); - input_data_ptr += data_sz; - remaining_data -= data_sz; + if (!decompress_only) { + rte_memcpy(data_addr, input_data_ptr, data_sz); + input_data_ptr += data_sz; + remaining_data -= data_sz; + } if (rte_pktmbuf_chain(mem->decomp_bufs[i], next_seg) < 0) { @@ -447,16 +481,26 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) cmz++; } - data_addr = (uint8_t *) rte_pktmbuf_append( - mem->comp_bufs[i], - test_data->out_seg_sz); + if (decompress_only) + data_sz = RTE_MIN(remaining_data, test_data->seg_sz); + else + data_sz = test_data->out_seg_sz; + + data_addr = (uint8_t *) rte_pktmbuf_append(mem->comp_bufs[i], + data_sz); if (data_addr == NULL) { RTE_LOG(ERR, USER1, "Could not append data\n"); return -1; } + if (decompress_only) { + rte_memcpy(data_addr, input_data_ptr, data_sz); + input_data_ptr += data_sz; + remaining_data -= data_sz; + } + /* Chain mbufs if needed for output mbufs */ - for (j = 1; j < segs_per_mbuf; j++) { + for (j = 1; j < segs_per_mbuf && remaining_data > 0; j++) { struct rte_mbuf *next_seg = rte_pktmbuf_alloc(mem->comp_buf_pool); @@ -476,13 +520,25 @@ prepare_bufs(struct comp_test_data *test_data, struct cperf_mem_resources *mem) cmz++; } + if (decompress_only) + data_sz = RTE_MIN(remaining_data, + test_data->seg_sz); + else + data_sz = test_data->out_seg_sz; + data_addr = (uint8_t *)rte_pktmbuf_append(next_seg, - test_data->out_seg_sz); + data_sz); if (data_addr == NULL) { RTE_LOG(ERR, USER1, "Could not append data\n"); return -1; } + if (decompress_only) { + rte_memcpy(data_addr, input_data_ptr, data_sz); + input_data_ptr += data_sz; + remaining_data -= data_sz; + } + if (rte_pktmbuf_chain(mem->comp_bufs[i], next_seg) < 0) { RTE_LOG(ERR, USER1, "Could not chain mbufs\n"); diff --git a/app/test-compress-perf/comp_perf_test_cyclecount.c b/app/test-compress-perf/comp_perf_test_cyclecount.c index ce457fefbb..ce6c4d7605 100644 --- a/app/test-compress-perf/comp_perf_test_cyclecount.c +++ b/app/test-compress-perf/comp_perf_test_cyclecount.c @@ -514,38 +514,55 @@ cperf_cyclecount_test_runner(void *test_ctx) if (cperf_verify_test_runner(&ctx->ver)) return EXIT_FAILURE; - /* - * Run the tests twice, discarding the first performance - * results, before the cache is warmed up - */ - - /* C O M P R E S S */ - for (i = 0; i < 2; i++) { - if (main_loop(ctx, RTE_COMP_COMPRESS) < 0) - return EXIT_FAILURE; - } + if (test_data->test_op & COMPRESS) { + /* + * Run the test twice, discarding the first performance + * results, before the cache is warmed up + */ + for (i = 0; i < 2; i++) { + if (main_loop(ctx, RTE_COMP_COMPRESS) < 0) + return EXIT_FAILURE; + } - ops_enq_retries_comp = ctx->ops_enq_retries; - ops_deq_retries_comp = ctx->ops_deq_retries; + ops_enq_retries_comp = ctx->ops_enq_retries; + ops_deq_retries_comp = ctx->ops_deq_retries; - duration_enq_per_op_comp = ctx->duration_enq / - (ctx->ver.mem.total_bufs * test_data->num_iter); - duration_deq_per_op_comp = ctx->duration_deq / - (ctx->ver.mem.total_bufs * test_data->num_iter); + duration_enq_per_op_comp = ctx->duration_enq / + (ctx->ver.mem.total_bufs * test_data->num_iter); + duration_deq_per_op_comp = ctx->duration_deq / + (ctx->ver.mem.total_bufs * test_data->num_iter); + } else { + ops_enq_retries_comp = 0; + ops_deq_retries_comp = 0; - /* D E C O M P R E S S */ - for (i = 0; i < 2; i++) { - if (main_loop(ctx, RTE_COMP_DECOMPRESS) < 0) - return EXIT_FAILURE; + duration_enq_per_op_comp = 0; + duration_deq_per_op_comp = 0; } - ops_enq_retries_decomp = ctx->ops_enq_retries; - ops_deq_retries_decomp = ctx->ops_deq_retries; + if (test_data->test_op & DECOMPRESS) { + /* + * Run the test twice, discarding the first performance + * results, before the cache is warmed up + */ + for (i = 0; i < 2; i++) { + if (main_loop(ctx, RTE_COMP_DECOMPRESS) < 0) + return EXIT_FAILURE; + } - duration_enq_per_op_decomp = ctx->duration_enq / - (ctx->ver.mem.total_bufs * test_data->num_iter); - duration_deq_per_op_decomp = ctx->duration_deq / - (ctx->ver.mem.total_bufs * test_data->num_iter); + ops_enq_retries_decomp = ctx->ops_enq_retries; + ops_deq_retries_decomp = ctx->ops_deq_retries; + + duration_enq_per_op_decomp = ctx->duration_enq / + (ctx->ver.mem.total_bufs * test_data->num_iter); + duration_deq_per_op_decomp = ctx->duration_deq / + (ctx->ver.mem.total_bufs * test_data->num_iter); + } else { + ops_enq_retries_decomp = 0; + ops_deq_retries_decomp = 0; + + duration_enq_per_op_decomp = 0; + duration_deq_per_op_decomp = 0; + } duration_setup_per_op = ctx->duration_op / (ctx->ver.mem.total_bufs * test_data->num_iter); diff --git a/app/test-compress-perf/comp_perf_test_throughput.c b/app/test-compress-perf/comp_perf_test_throughput.c index 79cd2b2bf2..c9f8237626 100644 --- a/app/test-compress-perf/comp_perf_test_throughput.c +++ b/app/test-compress-perf/comp_perf_test_throughput.c @@ -359,41 +359,53 @@ cperf_throughput_test_runner(void *test_ctx) * First the verification part is needed */ if (cperf_verify_test_runner(&ctx->ver)) { - ret = EXIT_FAILURE; + ret = EXIT_FAILURE; goto end; } - /* - * Run the tests twice, discarding the first performance - * results, before the cache is warmed up - */ - for (i = 0; i < 2; i++) { - if (main_loop(ctx, RTE_COMP_COMPRESS) < 0) { - ret = EXIT_FAILURE; - goto end; + if (test_data->test_op & COMPRESS) { + /* + * Run the test twice, discarding the first performance + * results, before the cache is warmed up + */ + for (i = 0; i < 2; i++) { + if (main_loop(ctx, RTE_COMP_COMPRESS) < 0) { + ret = EXIT_FAILURE; + goto end; + } } - } - for (i = 0; i < 2; i++) { - if (main_loop(ctx, RTE_COMP_DECOMPRESS) < 0) { - ret = EXIT_FAILURE; - goto end; - } + ctx->comp_tsc_byte = + (double)(ctx->comp_tsc_duration[test_data->level]) / + test_data->input_data_sz; + ctx->comp_gbps = rte_get_tsc_hz() / ctx->comp_tsc_byte * 8 / + 1000000000; + } else { + ctx->comp_tsc_byte = 0; + ctx->comp_gbps = 0; } - ctx->comp_tsc_byte = - (double)(ctx->comp_tsc_duration[test_data->level]) / - test_data->input_data_sz; + if (test_data->test_op & DECOMPRESS) { + /* + * Run the test twice, discarding the first performance + * results, before the cache is warmed up + */ + for (i = 0; i < 2; i++) { + if (main_loop(ctx, RTE_COMP_DECOMPRESS) < 0) { + ret = EXIT_FAILURE; + goto end; + } + } - ctx->decomp_tsc_byte = + ctx->decomp_tsc_byte = (double)(ctx->decomp_tsc_duration[test_data->level]) / - test_data->input_data_sz; - - ctx->comp_gbps = rte_get_tsc_hz() / ctx->comp_tsc_byte * 8 / - 1000000000; - - ctx->decomp_gbps = rte_get_tsc_hz() / ctx->decomp_tsc_byte * 8 / - 1000000000; + test_data->input_data_sz; + ctx->decomp_gbps = rte_get_tsc_hz() / ctx->decomp_tsc_byte * 8 / + 1000000000; + } else { + ctx->decomp_tsc_byte = 0; + ctx->decomp_gbps = 0; + } exp = 0; if (__atomic_compare_exchange_n(&display_once, &exp, 1, 0, diff --git a/app/test-compress-perf/comp_perf_test_verify.c b/app/test-compress-perf/comp_perf_test_verify.c index 6b61a9194f..7d6b6abecd 100644 --- a/app/test-compress-perf/comp_perf_test_verify.c +++ b/app/test-compress-perf/comp_perf_test_verify.c @@ -114,7 +114,8 @@ main_loop(struct cperf_verify_ctx *ctx, enum rte_comp_xform_type type) output_data_sz = &ctx->decomp_data_sz; input_bufs = mem->comp_bufs; output_bufs = mem->decomp_bufs; - out_seg_sz = test_data->seg_sz; + out_seg_sz = (test_data->test_op & COMPRESS) ? + test_data->seg_sz : test_data->out_seg_sz; } /* Create private xform */ @@ -392,44 +393,59 @@ cperf_verify_test_runner(void *test_ctx) int ret = EXIT_SUCCESS; static uint16_t display_once; uint32_t lcore = rte_lcore_id(); + uint16_t exp = 0; ctx->mem.lcore_id = lcore; test_data->ratio = 0; - if (main_loop(ctx, RTE_COMP_COMPRESS) < 0) { - ret = EXIT_FAILURE; - goto end; + if (test_data->test_op & COMPRESS) { + if (main_loop(ctx, RTE_COMP_COMPRESS) < 0) { + ret = EXIT_FAILURE; + goto end; + } } - if (main_loop(ctx, RTE_COMP_DECOMPRESS) < 0) { - ret = EXIT_FAILURE; - goto end; - } + if (test_data->test_op & DECOMPRESS) { + if (main_loop(ctx, RTE_COMP_DECOMPRESS) < 0) { + ret = EXIT_FAILURE; + goto end; + } - if (ctx->decomp_data_sz != test_data->input_data_sz) { - RTE_LOG(ERR, USER1, - "Decompressed data length not equal to input data length\n"); - RTE_LOG(ERR, USER1, - "Decompressed size = %zu, expected = %zu\n", - ctx->decomp_data_sz, test_data->input_data_sz); - ret = EXIT_FAILURE; - goto end; - } else { - if (memcmp(ctx->mem.decompressed_data, - test_data->input_data, - test_data->input_data_sz) != 0) { + if (!(test_data->test_op & COMPRESS)) { + /* + * For DECOMPRESS_ONLY mode there is no more + * verifications, reset the 'ratio' and 'comp_data_sz' + * fields for other tests report. + */ + ctx->comp_data_sz = 0; + ctx->ratio = 0; + goto end; + } + + if (ctx->decomp_data_sz != test_data->input_data_sz) { + RTE_LOG(ERR, USER1, + "Decompressed data length not equal to input data length\n"); RTE_LOG(ERR, USER1, - "Decompressed data is not the same as file data\n"); + "Decompressed size = %zu, expected = %zu\n", + ctx->decomp_data_sz, test_data->input_data_sz); ret = EXIT_FAILURE; goto end; + } else { + if (memcmp(ctx->mem.decompressed_data, + test_data->input_data, + test_data->input_data_sz) != 0) { + RTE_LOG(ERR, USER1, + "Decompressed data is not the same as file data\n"); + ret = EXIT_FAILURE; + goto end; + } } } ctx->ratio = (double) ctx->comp_data_sz / test_data->input_data_sz * 100; - uint16_t exp = 0; if (!ctx->silent) { if (__atomic_compare_exchange_n(&display_once, &exp, 1, 0, __ATOMIC_RELAXED, __ATOMIC_RELAXED)) { diff --git a/app/test-compress-perf/main.c b/app/test-compress-perf/main.c index 41b8edc2bd..bbb4c7917b 100644 --- a/app/test-compress-perf/main.c +++ b/app/test-compress-perf/main.c @@ -254,6 +254,14 @@ comp_perf_dump_input_data(struct comp_test_data *test_data) goto end; } + if (!(test_data->test_op & COMPRESS) && + test_data->input_data_sz > + (size_t) test_data->seg_sz * (size_t) test_data->max_sgl_segs) { + RTE_LOG(ERR, USER1, + "Size of input must be less than total segments\n"); + goto end; + } + test_data->input_data = rte_zmalloc_socket(NULL, test_data->input_data_sz, 0, rte_socket_id()); -- 2.25.1 --- Diff of the applied patch vs upstream commit (please double-check if non-empty: --- --- - 2023-02-27 14:08:45.467026900 +0800 +++ 0144-app-compress-perf-fix-testing-single-operation.patch 2023-02-27 14:08:40.939237000 +0800 @@ -1 +1 @@ -From 83cc3b90ad7a63868a43a67d6aa13b55068fbe0c Mon Sep 17 00:00:00 2001 +From ad62d3f41062dd1cd4354c75ad89fae6fc289b12 Mon Sep 17 00:00:00 2001 @@ -4,0 +5,3 @@ +Cc: Xueming Li + +[ upstream commit 83cc3b90ad7a63868a43a67d6aa13b55068fbe0c ] @@ -13 +15,0 @@ -Cc: stable@dpdk.org