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 AA24B43190; Tue, 17 Oct 2023 22:07:05 +0200 (CEST) Received: from mails.dpdk.org (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 2B60E402DE; Tue, 17 Oct 2023 22:07:05 +0200 (CEST) Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by mails.dpdk.org (Postfix) with ESMTP id 9C1EC402DD for ; Tue, 17 Oct 2023 22:07:03 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1697573223; 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:autocrypt:autocrypt; bh=qiPMx69syZjGDPj42o/lblV6t2MIWRd2Rlbi/TWEpOM=; b=K4sYafn8Z8MzEXV0TlmYu7g3ZWUNYNeeJ+JrMZYkUGAb3azvJXuNipvFqtLIcXRBrimw3+ SoVSf6NuEILt7lJy2UPOGH4xT2Y4KFv+SL1Vwf2Wi/2Mt9xgMpnbTZmUkn2bk1FG+QHF7E IoTKB3PwUPKP7QvG2YdR4fkqLlRH4wY= 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-113-LndXfzAlOzuR-klo_D9Yrg-1; Tue, 17 Oct 2023 16:07:01 -0400 X-MC-Unique: LndXfzAlOzuR-klo_D9Yrg-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id 84AFB185A7B5; Tue, 17 Oct 2023 20:07:00 +0000 (UTC) Received: from [10.39.208.21] (unknown [10.39.208.21]) by smtp.corp.redhat.com (Postfix) with ESMTPS id 1A642492BF0; Tue, 17 Oct 2023 20:06:58 +0000 (UTC) Message-ID: <7ea0fdcc-a8b0-447a-9066-e90d91f375b4@redhat.com> Date: Tue, 17 Oct 2023 22:06:57 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH v1 10/11] test/bbdev: support new FFT capabilities To: Hernan Vargas , dev@dpdk.org, gakhil@marvell.com, trix@redhat.com Cc: nicolas.chautru@intel.com, qi.z.zhang@intel.com References: <20230929181328.104311-1-hernan.vargas@intel.com> <20230929181328.104311-11-hernan.vargas@intel.com> From: Maxime Coquelin Autocrypt: addr=maxime.coquelin@redhat.com; keydata= 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 Mwqu3GQ= In-Reply-To: <20230929181328.104311-11-hernan.vargas@intel.com> X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit 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 On 9/29/23 20:13, Hernan Vargas wrote: > Adding support to test new FFT capabilities. > Optional frequency domain dewindowing, frequency resampling, > timing error correction and time offset per CS. > > Signed-off-by: Hernan Vargas > --- > app/test-bbdev/test_bbdev_perf.c | 26 ++++++++++--- > app/test-bbdev/test_bbdev_vector.c | 61 ++++++++++++++++++++++++++++-- > 2 files changed, 78 insertions(+), 9 deletions(-) > > diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test-bbdev/test_bbdev_perf.c > index 8a349fdb03d5..82deb9b1b4b9 100644 > --- a/app/test-bbdev/test_bbdev_perf.c > +++ b/app/test-bbdev/test_bbdev_perf.c > @@ -864,6 +864,7 @@ add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info, > conf.q_fft.num_qgroups = VRB_QMGR_NUM_QGS; > conf.q_fft.first_qgroup_index = VRB_QMGR_INVALID_IDX; > conf.q_fft.num_aqs_per_groups = VRB_QMGR_NUM_AQS; > + conf.q_fft.aq_depth_log2 = VRB_QMGR_AQ_DEPTH; > conf.q_mld.num_qgroups = VRB_QMGR_NUM_QGS; > conf.q_mld.first_qgroup_index = VRB_QMGR_INVALID_IDX; > conf.q_mld.num_aqs_per_groups = VRB_QMGR_NUM_AQS; > @@ -1970,7 +1971,7 @@ static void > copy_reference_fft_op(struct rte_bbdev_fft_op **ops, unsigned int n, > unsigned int start_idx, struct rte_bbdev_op_data *inputs, > struct rte_bbdev_op_data *outputs, struct rte_bbdev_op_data *pwrouts, > - struct rte_bbdev_fft_op *ref_op) > + struct rte_bbdev_op_data *win_inputs, struct rte_bbdev_fft_op *ref_op) > { > unsigned int i, j; > struct rte_bbdev_op_fft *fft = &ref_op->fft; > @@ -1982,6 +1983,11 @@ copy_reference_fft_op(struct rte_bbdev_fft_op **ops, unsigned int n, > fft->output_leading_depadding; > for (j = 0; j < RTE_BBDEV_MAX_CS_2; j++) > ops[i]->fft.window_index[j] = fft->window_index[j]; > + for (j = 0; j < RTE_BBDEV_MAX_CS; j++) { > + ops[i]->fft.cs_theta_0[j] = fft->cs_theta_0[j]; > + ops[i]->fft.cs_theta_d[j] = fft->cs_theta_d[j]; > + ops[i]->fft.time_offset[j] = fft->time_offset[j]; > + } > ops[i]->fft.cs_bitmap = fft->cs_bitmap; > ops[i]->fft.num_antennas_log2 = fft->num_antennas_log2; > ops[i]->fft.idft_log2 = fft->idft_log2; > @@ -1992,8 +1998,12 @@ copy_reference_fft_op(struct rte_bbdev_fft_op **ops, unsigned int n, > ops[i]->fft.ncs_reciprocal = fft->ncs_reciprocal; > ops[i]->fft.power_shift = fft->power_shift; > ops[i]->fft.fp16_exp_adjust = fft->fp16_exp_adjust; > + ops[i]->fft.output_depadded_size = fft->output_depadded_size; > + ops[i]->fft.freq_resample_mode = fft->freq_resample_mode; > ops[i]->fft.base_output = outputs[start_idx + i]; > ops[i]->fft.base_input = inputs[start_idx + i]; > + if (win_inputs != NULL) > + ops[i]->fft.dewindowing_input = win_inputs[start_idx + i]; > if (pwrouts != NULL) > ops[i]->fft.power_meas_output = pwrouts[start_idx + i]; > ops[i]->fft.op_flags = fft->op_flags; > @@ -2575,7 +2585,7 @@ validate_op_fft_chain(struct rte_bbdev_op_data *op, struct op_data_entries *orig > { > struct rte_mbuf *m = op->data; > uint8_t i, nb_dst_segments = orig_op->nb_segments; > - int16_t delt, abs_delt, thres_hold = 3; > + int16_t delt, abs_delt, thres_hold = 4; > uint32_t j, data_len_iq, error_num; > int16_t *ref_out, *op_out; > > @@ -2754,6 +2764,9 @@ create_reference_fft_op(struct rte_bbdev_fft_op *op) > entry = &test_vector.entries[DATA_INPUT]; > for (i = 0; i < entry->nb_segments; ++i) > op->fft.base_input.length += entry->segments[i].length; > + entry = &test_vector.entries[DATA_HARQ_INPUT]; > + for (i = 0; i < entry->nb_segments; ++i) > + op->fft.dewindowing_input.length += entry->segments[i].length; > } > > static void > @@ -3722,7 +3735,8 @@ throughput_intr_lcore_fft(void *arg) > num_to_process); > if (test_vector.op_type != RTE_BBDEV_OP_NONE) > copy_reference_fft_op(ops, num_to_process, 0, bufs->inputs, > - bufs->hard_outputs, bufs->soft_outputs, tp->op_params->ref_fft_op); > + bufs->hard_outputs, bufs->soft_outputs, bufs->harq_inputs, > + tp->op_params->ref_fft_op); > > /* Set counter to validate the ordering */ > for (j = 0; j < num_to_process; ++j) > @@ -4596,7 +4610,7 @@ throughput_pmd_lcore_fft(void *arg) > > if (test_vector.op_type != RTE_BBDEV_OP_NONE) > copy_reference_fft_op(ops_enq, num_ops, 0, bufs->inputs, > - bufs->hard_outputs, bufs->soft_outputs, ref_op); > + bufs->hard_outputs, bufs->soft_outputs, bufs->harq_inputs, ref_op); > > /* Set counter to validate the ordering */ > for (j = 0; j < num_ops; ++j) > @@ -5452,7 +5466,7 @@ latency_test_fft(struct rte_mempool *mempool, > if (test_vector.op_type != RTE_BBDEV_OP_NONE) > copy_reference_fft_op(ops_enq, burst_sz, dequeued, > bufs->inputs, > - bufs->hard_outputs, bufs->soft_outputs, > + bufs->hard_outputs, bufs->soft_outputs, bufs->harq_inputs, > ref_op); > > /* Set counter to validate the ordering */ > @@ -5714,7 +5728,7 @@ offload_latency_test_fft(struct rte_mempool *mempool, struct test_buffers *bufs, > if (test_vector.op_type != RTE_BBDEV_OP_NONE) > copy_reference_fft_op(ops_enq, burst_sz, dequeued, > bufs->inputs, > - bufs->hard_outputs, bufs->soft_outputs, > + bufs->hard_outputs, bufs->soft_outputs, bufs->harq_inputs, > ref_op); > > /* Start time meas for enqueue function offload latency */ > diff --git a/app/test-bbdev/test_bbdev_vector.c b/app/test-bbdev/test_bbdev_vector.c > index 8f464db83882..56b882533cda 100644 > --- a/app/test-bbdev/test_bbdev_vector.c > +++ b/app/test-bbdev/test_bbdev_vector.c > @@ -215,7 +215,6 @@ op_ldpc_decoder_flag_strtoul(char *token, uint32_t *op_flag_value) > return 0; > } > > - > /* Convert FFT flag from string to unsigned long int. */ > static int > op_fft_flag_strtoul(char *token, uint32_t *op_flag_value) > @@ -236,6 +235,14 @@ op_fft_flag_strtoul(char *token, uint32_t *op_flag_value) > *op_flag_value = RTE_BBDEV_FFT_FP16_INPUT; > else if (!strcmp(token, "RTE_BBDEV_FFT_FP16_OUTPUT")) > *op_flag_value = RTE_BBDEV_FFT_FP16_OUTPUT; > + else if (!strcmp(token, "RTE_BBDEV_FFT_TIMING_OFFSET_PER_CS")) > + *op_flag_value = RTE_BBDEV_FFT_TIMING_OFFSET_PER_CS; > + else if (!strcmp(token, "RTE_BBDEV_FFT_TIMING_ERROR")) > + *op_flag_value = RTE_BBDEV_FFT_TIMING_ERROR; > + else if (!strcmp(token, "RTE_BBDEV_FFT_DEWINDOWING")) > + *op_flag_value = RTE_BBDEV_FFT_DEWINDOWING; > + else if (!strcmp(token, "RTE_BBDEV_FFT_FREQ_RESAMPLING")) > + *op_flag_value = RTE_BBDEV_FFT_FREQ_RESAMPLING; > else { > printf("The given value is not a FFT flag\n"); > return -1; > @@ -907,8 +914,7 @@ parse_ldpc_decoder_params(const char *key_token, char *token, > return 0; > } > > - > -/* Parse FFT parameters and assigns to global variable. */ > +/* Parses FFT parameters and assigns to global variable. */ > static int > parse_fft_params(const char *key_token, char *token, > struct test_bbdev_vector *vector) > @@ -923,6 +929,10 @@ parse_fft_params(const char *key_token, char *token, > ret = parse_data_entry(key_token, token, vector, > DATA_INPUT, > op_data_prefixes[DATA_INPUT]); > + } else if (starts_with(key_token, "dewin_input")) { > + ret = parse_data_entry(key_token, token, vector, > + DATA_HARQ_INPUT, > + "dewin_input"); > } else if (starts_with(key_token, "output")) { > ret = parse_data_entry(key_token, token, vector, > DATA_HARD_OUTPUT, > @@ -989,6 +999,51 @@ parse_fft_params(const char *key_token, char *token, > fft->fp16_exp_adjust = (uint32_t) strtoul(token, &err, 0); > printf("%d\n", fft->fp16_exp_adjust); > ret = ((err == NULL) || (*err != '\0')) ? -1 : 0; > + } else if (!strcmp(key_token, "freq_resample_mode")) { > + fft->freq_resample_mode = (uint32_t) strtoul(token, &err, 0); > + ret = ((err == NULL) || (*err != '\0')) ? -1 : 0; > + } else if (!strcmp(key_token, "out_depadded_size")) { > + fft->output_depadded_size = (uint32_t) strtoul(token, &err, 0); > + ret = ((err == NULL) || (*err != '\0')) ? -1 : 0; > + } else if (!strcmp(key_token, "cs_theta_0")) { > + tok = strtok(token, VALUE_DELIMITER); > + if (tok == NULL) > + return -1; > + for (i = 0; i < FFT_WIN_SIZE; i++) { > + fft->cs_theta_0[i] = (uint32_t) strtoul(tok, &err, 0); > + if (i < (FFT_WIN_SIZE - 1)) { > + tok = strtok(NULL, VALUE_DELIMITER); > + if (tok == NULL) > + return -1; > + } > + } > + ret = ((err == NULL) || (*err != '\0')) ? -1 : 0; > + } else if (!strcmp(key_token, "cs_theta_d")) { > + tok = strtok(token, VALUE_DELIMITER); > + if (tok == NULL) > + return -1; > + for (i = 0; i < FFT_WIN_SIZE; i++) { > + fft->cs_theta_d[i] = (uint32_t) strtoul(tok, &err, 0); > + if (i < (FFT_WIN_SIZE - 1)) { > + tok = strtok(NULL, VALUE_DELIMITER); > + if (tok == NULL) > + return -1; > + } > + } > + ret = ((err == NULL) || (*err != '\0')) ? -1 : 0; > + } else if (!strcmp(key_token, "time_offset")) { > + tok = strtok(token, VALUE_DELIMITER); > + if (tok == NULL) > + return -1; > + for (i = 0; i < FFT_WIN_SIZE; i++) { > + fft->time_offset[i] = (uint32_t) strtoul(tok, &err, 0); > + if (i < (FFT_WIN_SIZE - 1)) { > + tok = strtok(NULL, VALUE_DELIMITER); > + if (tok == NULL) > + return -1; > + } > + } > + ret = ((err == NULL) || (*err != '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "op_flags")) { > vector->mask |= TEST_BBDEV_VF_OP_FLAGS; > ret = parse_turbo_flags(token, &op_flags, vector->op_type); Reviewed-by: Maxime Coquelin Thanks, Maxime