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 9EEC241DB8; Thu, 2 Mar 2023 21:23:57 +0100 (CET) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AF8A442D8A; Thu, 2 Mar 2023 21:22:18 +0100 (CET) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by mails.dpdk.org (Postfix) with ESMTP id D4D3942BAC for ; Thu, 2 Mar 2023 21:22:07 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1677788528; x=1709324528; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=1LpKoYYoDit9UG3bAOK6cQ05CWTyOZiT657la4lkus4=; b=bzk1607LHp8QfeE8VKRUrgKvGuyipaef7cfqOWNz5KcRJtdwyRw4MpXE oxkTKp67EGjIDlp9yokCakg73GyInHnCxCXaa8638TiaK0T4uzSaKe7OI jR2XBfOk30r6x1Ws2T2mTgthfjpacKqk0IT+JiWR7d+elCTWu21alFlRe 5mLBzLwOHwkaE8UxmijB+DxOfc57rGqX52GgTSnnN16EvQrWCNzwA+lnd T/ExKo4LpQ85vLcJ27qaHkBrtfSY9/uY6Us0ZDxv2RgvXPG0StHZl5DuB sKmU3BHMbUJNO2giWpf3oZJaTNrqdhU8NnQhQwpoRHDxCvkQWsdXvdC+q g==; X-IronPort-AV: E=McAfee;i="6500,9779,10637"; a="334871235" X-IronPort-AV: E=Sophos;i="5.98,228,1673942400"; d="scan'208";a="334871235" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 02 Mar 2023 12:22:07 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10637"; a="705398139" X-IronPort-AV: E=Sophos;i="5.98,228,1673942400"; d="scan'208";a="705398139" Received: from unknown (HELO csl-npg-qt0.la.intel.com) ([10.233.181.103]) by orsmga008.jf.intel.com with ESMTP; 02 Mar 2023 12:22:06 -0800 From: Hernan Vargas To: dev@dpdk.org, gakhil@marvell.com, trix@redhat.com, maxime.coquelin@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com, Hernan Vargas Subject: [PATCH v3 16/17] test/bbdev: remove max iteration from vectors Date: Thu, 2 Mar 2023 12:22:10 -0800 Message-Id: <20230302202211.170017-17-hernan.vargas@intel.com> X-Mailer: git-send-email 2.37.1 In-Reply-To: <20230302202211.170017-1-hernan.vargas@intel.com> References: <20230302202211.170017-1-hernan.vargas@intel.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: DPDK patches and discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Remove iter_max from test vectors as this value is passed as an argument to the test. No functional impact. Signed-off-by: Hernan Vargas Reviewed-by: Maxime Coquelin --- app/test-bbdev/test_bbdev_perf.c | 4 ++++ app/test-bbdev/test_bbdev_vector.c | 14 -------------- app/test-bbdev/test_bbdev_vector.h | 1 - app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_0.data | 3 --- app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_1.data | 3 --- app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_2.data | 3 --- app/test-bbdev/test_vectors/ldpc_dec_v11835.data | 3 --- .../test_vectors/ldpc_dec_v2342_drop.data | 3 --- app/test-bbdev/test_vectors/ldpc_dec_v7813.data | 3 --- app/test-bbdev/test_vectors/ldpc_dec_v8480.data | 3 --- app/test-bbdev/test_vectors/ldpc_dec_v8568.data | 3 --- app/test-bbdev/test_vectors/ldpc_dec_v9503.data | 3 --- .../turbo_dec_c1_k40_r0_e17280_sbd_negllr.data | 3 --- ...k6144_r0_e10376_crc24b_sbd_negllr_high_snr.data | 3 --- ..._k6144_r0_e10376_crc24b_sbd_negllr_low_snr.data | 3 --- .../turbo_dec_c1_k6144_r0_e34560_posllr.data | 3 --- .../turbo_dec_c1_k6144_r0_e34560_sbd_negllr.data | 3 --- .../turbo_dec_c1_k6144_r0_e34560_sbd_posllr.data | 3 --- ...bo_dec_c2_k3136_r0_e4920_sbd_negllr_crc24b.data | 3 --- 19 files changed, 4 insertions(+), 63 deletions(-) diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c index b92254519fdf..fcf0145fb2bf 100644 --- a/app/test-bbdev/test_bbdev_perf.c +++ b/app/test-bbdev/test_bbdev_perf.c @@ -3173,6 +3173,8 @@ throughput_intr_lcore_ldpc_dec(void *arg) num_to_process); TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops", num_to_process); + ref_op->ldpc_dec.iter_max = get_iter_max(); + if (test_vector.op_type != RTE_BBDEV_OP_NONE) copy_reference_ldpc_dec_op(ops, num_to_process, 0, bufs->inputs, bufs->hard_outputs, bufs->soft_outputs, @@ -5348,6 +5350,7 @@ offload_latency_test_dec(struct rte_mempool *mempool, struct test_buffers *bufs, ret = rte_bbdev_dec_op_alloc_bulk(mempool, ops_enq, burst_sz); TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops", burst_sz); + ref_op->turbo_dec.iter_max = get_iter_max(); if (test_vector.op_type != RTE_BBDEV_OP_NONE) copy_reference_dec_op(ops_enq, burst_sz, dequeued, bufs->inputs, @@ -5434,6 +5437,7 @@ offload_latency_test_ldpc_dec(struct rte_mempool *mempool, ret = rte_bbdev_dec_op_alloc_bulk(mempool, ops_enq, burst_sz); TEST_ASSERT_SUCCESS(ret, "Allocation failed for %d ops", burst_sz); + ref_op->ldpc_dec.iter_max = get_iter_max(); if (test_vector.op_type != RTE_BBDEV_OP_NONE) copy_reference_ldpc_dec_op(ops_enq, burst_sz, dequeued, bufs->inputs, diff --git a/app/test-bbdev/test_bbdev_vector.c b/app/test-bbdev/test_bbdev_vector.c index 1125395dbff2..c26727cd35c4 100644 --- a/app/test-bbdev/test_bbdev_vector.c +++ b/app/test-bbdev/test_bbdev_vector.c @@ -532,10 +532,6 @@ parse_decoder_params(const char *key_token, char *token, vector->mask |= TEST_BBDEV_VF_RV_INDEX; turbo_dec->rv_index = (uint8_t) strtoul(token, &err, 0); ret = ((err == NULL) || (*err != '\0')) ? -1 : 0; - } else if (!strcmp(key_token, "iter_max")) { - vector->mask |= TEST_BBDEV_VF_ITER_MAX; - turbo_dec->iter_max = (uint8_t) strtoul(token, &err, 0); - ret = ((err == NULL) || (*err != '\0')) ? -1 : 0; } else if (!strcmp(key_token, "iter_min")) { vector->mask |= TEST_BBDEV_VF_ITER_MIN; turbo_dec->iter_min = (uint8_t) strtoul(token, &err, 0); @@ -862,10 +858,6 @@ parse_ldpc_decoder_params(const char *key_token, char *token, vector->mask |= TEST_BBDEV_VF_EXPECTED_ITER_COUNT; ldpc_dec->iter_count = (uint8_t) strtoul(token, &err, 0); ret = ((err == NULL) || (*err != '\0')) ? -1 : 0; - } else if (!strcmp(key_token, "iter_max")) { - vector->mask |= TEST_BBDEV_VF_ITER_MAX; - ldpc_dec->iter_max = (uint8_t) strtoul(token, &err, 0); - ret = ((err == NULL) || (*err != '\0')) ? -1 : 0; } else if (!strcmp(key_token, "code_block_mode")) { vector->mask |= TEST_BBDEV_VF_CODE_BLOCK_MODE; ldpc_dec->code_block_mode = (uint8_t) strtoul(token, &err, 0); @@ -1260,9 +1252,6 @@ check_decoder(struct test_bbdev_vector *vector) if (!(mask & TEST_BBDEV_VF_ITER_MIN)) printf( "WARNING: iter_min was not specified in vector file and will be set to 0\n"); - if (!(mask & TEST_BBDEV_VF_ITER_MAX)) - printf( - "WARNING: iter_max was not specified in vector file and will be set to 0\n"); if (!(mask & TEST_BBDEV_VF_EXPECTED_ITER_COUNT)) printf( "WARNING: expected_iter_count was not specified in vector file and iter_count will not be validated\n"); @@ -1335,9 +1324,6 @@ check_ldpc_decoder(struct test_bbdev_vector *vector) if (!(mask & TEST_BBDEV_VF_RV_INDEX)) printf( "INFO: rv_index was not specified in vector file and will be set to 0\n"); - if (!(mask & TEST_BBDEV_VF_ITER_MAX)) - printf( - "WARNING: iter_max was not specified in vector file and will be set to 0\n"); if (!(mask & TEST_BBDEV_VF_EXPECTED_ITER_COUNT)) printf( "WARNING: expected_iter_count was not specified in vector file and iter_count will not be validated\n"); diff --git a/app/test-bbdev/test_bbdev_vector.h b/app/test-bbdev/test_bbdev_vector.h index 4c53e8f137df..2ea271ffb78b 100644 --- a/app/test-bbdev/test_bbdev_vector.h +++ b/app/test-bbdev/test_bbdev_vector.h @@ -19,7 +19,6 @@ enum { TEST_BBDEV_VF_C = (1ULL << 7), TEST_BBDEV_VF_CAB = (1ULL << 8), TEST_BBDEV_VF_RV_INDEX = (1ULL << 9), - TEST_BBDEV_VF_ITER_MAX = (1ULL << 10), TEST_BBDEV_VF_ITER_MIN = (1ULL << 11), TEST_BBDEV_VF_EXPECTED_ITER_COUNT = (1ULL << 12), TEST_BBDEV_VF_EXT_SCALE = (1ULL << 13), diff --git a/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_0.data b/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_0.data index 5d4d27d6073d..215c30a610d4 100644 --- a/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_0.data +++ b/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_0.data @@ -340,9 +340,6 @@ rv_index= code_block_mode= 1 -iter_max= -20 - expected_iter_count= 20 diff --git a/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_1.data b/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_1.data index 63c2d3b618fe..09ffd7b40a1e 100644 --- a/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_1.data +++ b/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_1.data @@ -671,9 +671,6 @@ rv_index= code_block_mode= 1 -iter_max= -20 - expected_iter_count= 4 diff --git a/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_2.data b/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_2.data index 2463df6178db..c1cd088498d9 100644 --- a/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_2.data +++ b/app/test-bbdev/test_vectors/ldpc_dec_HARQ_1_2.data @@ -889,9 +889,6 @@ rv_index= code_block_mode= 1 -iter_max= -20 - expected_iter_count= 3 diff --git a/app/test-bbdev/test_vectors/ldpc_dec_v11835.data b/app/test-bbdev/test_vectors/ldpc_dec_v11835.data index 84a04e11cc65..e899b95e74f9 100644 --- a/app/test-bbdev/test_vectors/ldpc_dec_v11835.data +++ b/app/test-bbdev/test_vectors/ldpc_dec_v11835.data @@ -36,9 +36,6 @@ rv_index= code_block_mode= 1 -iter_max= -20 - expected_iter_count= 4 diff --git a/app/test-bbdev/test_vectors/ldpc_dec_v2342_drop.data b/app/test-bbdev/test_vectors/ldpc_dec_v2342_drop.data index f30726e46a76..31fef581b2c7 100644 --- a/app/test-bbdev/test_vectors/ldpc_dec_v2342_drop.data +++ b/app/test-bbdev/test_vectors/ldpc_dec_v2342_drop.data @@ -732,9 +732,6 @@ rv_index = code_block_mode = 1 -iter_max = -20 - expected_iter_count = 3 diff --git a/app/test-bbdev/test_vectors/ldpc_dec_v7813.data b/app/test-bbdev/test_vectors/ldpc_dec_v7813.data index c656fd3e4ac5..de8fbbc08cbd 100644 --- a/app/test-bbdev/test_vectors/ldpc_dec_v7813.data +++ b/app/test-bbdev/test_vectors/ldpc_dec_v7813.data @@ -35,9 +35,6 @@ rv_index = code_block_mode = 1 -iter_max = -8 - expected_iter_count = 6 diff --git a/app/test-bbdev/test_vectors/ldpc_dec_v8480.data b/app/test-bbdev/test_vectors/ldpc_dec_v8480.data index ddebf7bee10b..197ed837cb40 100644 --- a/app/test-bbdev/test_vectors/ldpc_dec_v8480.data +++ b/app/test-bbdev/test_vectors/ldpc_dec_v8480.data @@ -61,9 +61,6 @@ rv_index = code_block_mode = 1 -iter_max = -8 - expected_iter_count = 3 diff --git a/app/test-bbdev/test_vectors/ldpc_dec_v8568.data b/app/test-bbdev/test_vectors/ldpc_dec_v8568.data index 0b95e4e0fa8b..b84361f247b1 100644 --- a/app/test-bbdev/test_vectors/ldpc_dec_v8568.data +++ b/app/test-bbdev/test_vectors/ldpc_dec_v8568.data @@ -242,9 +242,6 @@ rv_index = code_block_mode = 1 -iter_max = -20 - expected_iter_count = 6 diff --git a/app/test-bbdev/test_vectors/ldpc_dec_v9503.data b/app/test-bbdev/test_vectors/ldpc_dec_v9503.data index 7699ae3157e7..4471f8bf5e04 100644 --- a/app/test-bbdev/test_vectors/ldpc_dec_v9503.data +++ b/app/test-bbdev/test_vectors/ldpc_dec_v9503.data @@ -1202,9 +1202,6 @@ rv_index = code_block_mode = 1 -iter_max = -20 - expected_iter_count = 3 diff --git a/app/test-bbdev/test_vectors/turbo_dec_c1_k40_r0_e17280_sbd_negllr.data b/app/test-bbdev/test_vectors/turbo_dec_c1_k40_r0_e17280_sbd_negllr.data index d98210ff6fc2..f147c8af533f 100644 --- a/app/test-bbdev/test_vectors/turbo_dec_c1_k40_r0_e17280_sbd_negllr.data +++ b/app/test-bbdev/test_vectors/turbo_dec_c1_k40_r0_e17280_sbd_negllr.data @@ -31,9 +31,6 @@ k = rv_index = 1 -iter_max = -8 - iter_min = 4 diff --git a/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e10376_crc24b_sbd_negllr_high_snr.data b/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e10376_crc24b_sbd_negllr_high_snr.data index 3472c992fd90..635078ab27e3 100644 --- a/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e10376_crc24b_sbd_negllr_high_snr.data +++ b/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e10376_crc24b_sbd_negllr_high_snr.data @@ -617,9 +617,6 @@ k = e = 10376 -iter_max = -8 - iter_min = 4 diff --git a/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e10376_crc24b_sbd_negllr_low_snr.data b/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e10376_crc24b_sbd_negllr_low_snr.data index 8ff71aac427b..de6136bd1be2 100644 --- a/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e10376_crc24b_sbd_negllr_low_snr.data +++ b/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e10376_crc24b_sbd_negllr_low_snr.data @@ -617,9 +617,6 @@ k = e = 10376 -iter_max = -8 - iter_min = 4 diff --git a/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_posllr.data b/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_posllr.data index fe4f5eefd25f..cb28ee1e976f 100644 --- a/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_posllr.data +++ b/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_posllr.data @@ -620,9 +620,6 @@ k = rv_index = 0 -iter_max = -8 - iter_min = 4 diff --git a/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_sbd_negllr.data b/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_sbd_negllr.data index b5ef624616ca..8ec4911d3c5d 100644 --- a/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_sbd_negllr.data +++ b/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_sbd_negllr.data @@ -1198,9 +1198,6 @@ k = rv_index = 0 -iter_max = -8 - iter_min = 4 diff --git a/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_sbd_posllr.data b/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_sbd_posllr.data index 13ad0908cec5..b6a73c6c07e4 100644 --- a/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_sbd_posllr.data +++ b/app/test-bbdev/test_vectors/turbo_dec_c1_k6144_r0_e34560_sbd_posllr.data @@ -1199,9 +1199,6 @@ k = rv_index = 0 -iter_max = -8 - iter_min = 4 diff --git a/app/test-bbdev/test_vectors/turbo_dec_c2_k3136_r0_e4920_sbd_negllr_crc24b.data b/app/test-bbdev/test_vectors/turbo_dec_c2_k3136_r0_e4920_sbd_negllr_crc24b.data index cfff56ad9a34..9d17b86c43b7 100644 --- a/app/test-bbdev/test_vectors/turbo_dec_c2_k3136_r0_e4920_sbd_negllr_crc24b.data +++ b/app/test-bbdev/test_vectors/turbo_dec_c2_k3136_r0_e4920_sbd_negllr_crc24b.data @@ -651,9 +651,6 @@ k_pos = rv_index = 0 -iter_max = -8 - iter_min = 4 -- 2.37.1