From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <dev-bounces@dpdk.org>
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
by inbox.dpdk.org (Postfix) with ESMTP id 5CE8841D3D;
Fri, 10 Mar 2023 09:22:46 +0100 (CET)
Received: from mails.dpdk.org (localhost [127.0.0.1])
by mails.dpdk.org (Postfix) with ESMTP id BF1FD42D5A;
Fri, 10 Mar 2023 09:20:53 +0100 (CET)
Received: from mx0b-0016f401.pphosted.com (mx0b-0016f401.pphosted.com
[67.231.156.173])
by mails.dpdk.org (Postfix) with ESMTP id 7053342BB1
for <dev@dpdk.org>; Fri, 10 Mar 2023 09:20:30 +0100 (CET)
Received: from pps.filterd (m0045851.ppops.net [127.0.0.1])
by mx0b-0016f401.pphosted.com (8.17.1.19/8.17.1.19) with ESMTP id
32A7uIdB021875 for <dev@dpdk.org>; Fri, 10 Mar 2023 00:20:29 -0800
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=marvell.com;
h=from : to : cc :
subject : date : message-id : in-reply-to : references : mime-version :
content-type; s=pfpt0220; bh=jfFFtagwoLhGzlImTyPjiK2mcsfv/BsxhY/LDUD7hqI=;
b=N2ceXZryShyg8bQwY85Yx7zE33uDRJlmYLT/s1fuLvmpuI5izgB2p6VkVnS6vYzcf8U+
5yhuq+0oN1XZF0j5BuFTO1Ei5yOuLULSl37HFWnxaF+4Wobe9JeElqAUHNsVssoO8HLy
D7THFrdMa4WtloaDucFf5XQWJrdeKVOTljDyyPgu5uu1R4N6uGxpGTbfmBMsGV90wz47
eIH0YkPh7y2o10UiC4elMqc6BXDciItaPfwI6HZmWY088UUYoO42h/JllfNmZ4fGrGd5
EW3H7SMwJj27vaKJTFyNTl42sByA/pPGJ8I6QAUP3b9rbXzTeWJ1Gi64KiXgneuRdN3f Sw==
Received: from dc5-exch01.marvell.com ([199.233.59.181])
by mx0b-0016f401.pphosted.com (PPS) with ESMTPS id 3p80k782tf-10
(version=TLSv1.2 cipher=ECDHE-RSA-AES256-SHA384 bits=256 verify=NOT)
for <dev@dpdk.org>; Fri, 10 Mar 2023 00:20:29 -0800
Received: from DC5-EXCH01.marvell.com (10.69.176.38) by DC5-EXCH01.marvell.com
(10.69.176.38) with Microsoft SMTP Server (TLS) id 15.0.1497.42;
Fri, 10 Mar 2023 00:20:23 -0800
Received: from maili.marvell.com (10.69.176.80) by DC5-EXCH01.marvell.com
(10.69.176.38) with Microsoft SMTP Server id 15.0.1497.42 via Frontend
Transport; Fri, 10 Mar 2023 00:20:23 -0800
Received: from ml-host-33.caveonetworks.com (unknown [10.110.143.233])
by maili.marvell.com (Postfix) with ESMTP id 9D5245B6939;
Fri, 10 Mar 2023 00:20:21 -0800 (PST)
From: Srikanth Yalavarthi <syalavarthi@marvell.com>
To: Srikanth Yalavarthi <syalavarthi@marvell.com>
CC: <dev@dpdk.org>, <sshankarnara@marvell.com>, <jerinj@marvell.com>,
<aprabhu@marvell.com>, <ptakkar@marvell.com>, <pshukla@marvell.com>
Subject: [PATCH v6 20/39] ml/cnxk: enable support to get model information
Date: Fri, 10 Mar 2023 00:19:56 -0800
Message-ID: <20230310082015.20200-21-syalavarthi@marvell.com>
X-Mailer: git-send-email 2.17.1
In-Reply-To: <20230310082015.20200-1-syalavarthi@marvell.com>
References: <20221208200220.20267-1-syalavarthi@marvell.com>
<20230310082015.20200-1-syalavarthi@marvell.com>
MIME-Version: 1.0
Content-Type: text/plain
X-Proofpoint-GUID: a05kWtbs0tVseurt0NrBDk9LIIK2PUmA
X-Proofpoint-ORIG-GUID: a05kWtbs0tVseurt0NrBDk9LIIK2PUmA
X-Proofpoint-Virus-Version: vendor=baseguard
engine=ICAP:2.0.254,Aquarius:18.0.942,Hydra:6.0.573,FMLib:17.11.170.22
definitions=2023-03-10_02,2023-03-09_01,2023-02-09_01
X-BeenThere: dev@dpdk.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: DPDK patches and discussions <dev.dpdk.org>
List-Unsubscribe: <https://mails.dpdk.org/options/dev>,
<mailto:dev-request@dpdk.org?subject=unsubscribe>
List-Archive: <http://mails.dpdk.org/archives/dev/>
List-Post: <mailto:dev@dpdk.org>
List-Help: <mailto:dev-request@dpdk.org?subject=help>
List-Subscribe: <https://mails.dpdk.org/listinfo/dev>,
<mailto:dev-request@dpdk.org?subject=subscribe>
Errors-To: dev-bounces@dpdk.org
Added driver functions to get model information. Added
internal functions to set and get model info.
Signed-off-by: Srikanth Yalavarthi <syalavarthi@marvell.com>
---
drivers/ml/cnxk/cn10k_ml_model.c | 55 ++++++++++++++++++++++++++++++++
drivers/ml/cnxk/cn10k_ml_model.h | 9 ++++++
drivers/ml/cnxk/cn10k_ml_ops.c | 37 ++++++++++++++++++---
3 files changed, 97 insertions(+), 4 deletions(-)
diff --git a/drivers/ml/cnxk/cn10k_ml_model.c b/drivers/ml/cnxk/cn10k_ml_model.c
index 69d6306104..0ded355d81 100644
--- a/drivers/ml/cnxk/cn10k_ml_model.c
+++ b/drivers/ml/cnxk/cn10k_ml_model.c
@@ -356,3 +356,58 @@ cn10k_ml_model_ocm_pages_count(struct cn10k_ml_dev *mldev, uint16_t model_id, ui
return 0;
}
+
+void
+cn10k_ml_model_info_set(struct rte_ml_dev *dev, struct cn10k_ml_model *model)
+{
+ struct rte_ml_model_info *info;
+ struct rte_ml_io_info *output;
+ struct rte_ml_io_info *input;
+ uint8_t i;
+
+ info = PLT_PTR_CAST(model->info);
+ input = PLT_PTR_ADD(info, sizeof(struct rte_ml_model_info));
+ output =
+ PLT_PTR_ADD(input, model->metadata.model.num_input * sizeof(struct rte_ml_io_info));
+
+ /* Set model info */
+ memset(info, 0, sizeof(struct rte_ml_model_info));
+ rte_memcpy(info->name, model->metadata.model.name, MRVL_ML_MODEL_NAME_LEN);
+ snprintf(info->version, RTE_ML_STR_MAX, "%u.%u.%u.%u", model->metadata.model.version[0],
+ model->metadata.model.version[1], model->metadata.model.version[2],
+ model->metadata.model.version[3]);
+ info->model_id = model->model_id;
+ info->device_id = dev->data->dev_id;
+ info->batch_size = model->batch_size;
+ info->nb_inputs = model->metadata.model.num_input;
+ info->input_info = input;
+ info->nb_outputs = model->metadata.model.num_output;
+ info->output_info = output;
+ info->wb_size = model->metadata.weights_bias.file_size;
+
+ /* Set input info */
+ for (i = 0; i < info->nb_inputs; i++) {
+ rte_memcpy(input[i].name, model->metadata.input[i].input_name,
+ MRVL_ML_INPUT_NAME_LEN);
+ input[i].dtype = model->metadata.input[i].input_type;
+ input[i].qtype = model->metadata.input[i].model_input_type;
+ input[i].shape.format = model->metadata.input[i].shape.format;
+ input[i].shape.w = model->metadata.input[i].shape.w;
+ input[i].shape.x = model->metadata.input[i].shape.x;
+ input[i].shape.y = model->metadata.input[i].shape.y;
+ input[i].shape.z = model->metadata.input[i].shape.z;
+ }
+
+ /* Set output info */
+ for (i = 0; i < info->nb_outputs; i++) {
+ rte_memcpy(output[i].name, model->metadata.output[i].output_name,
+ MRVL_ML_OUTPUT_NAME_LEN);
+ output[i].dtype = model->metadata.output[i].output_type;
+ output[i].qtype = model->metadata.output[i].model_output_type;
+ output[i].shape.format = RTE_ML_IO_FORMAT_1D;
+ output[i].shape.w = model->metadata.output[i].size;
+ output[i].shape.x = 1;
+ output[i].shape.y = 1;
+ output[i].shape.z = 1;
+ }
+}
diff --git a/drivers/ml/cnxk/cn10k_ml_model.h b/drivers/ml/cnxk/cn10k_ml_model.h
index 355915deeb..75990fe1e4 100644
--- a/drivers/ml/cnxk/cn10k_ml_model.h
+++ b/drivers/ml/cnxk/cn10k_ml_model.h
@@ -422,6 +422,14 @@ struct cn10k_ml_model {
/* Tile and memory information object */
struct cn10k_ml_ocm_model_map model_mem_map;
+ /* Internal model information structure
+ * Size of the buffer = sizeof(struct rte_ml_model_info)
+ * + num_inputs * sizeof(struct rte_ml_io_info)
+ * + num_outputs * sizeof(struct rte_ml_io_info).
+ * Structures would be arranged in the same order in the buffer.
+ */
+ uint8_t *info;
+
/* Spinlock, used to update model state */
plt_spinlock_t lock;
@@ -438,5 +446,6 @@ void cn10k_ml_model_addr_update(struct cn10k_ml_model *model, uint8_t *buffer,
uint8_t *base_dma_addr);
int cn10k_ml_model_ocm_pages_count(struct cn10k_ml_dev *mldev, uint16_t model_id, uint8_t *buffer,
uint16_t *wb_pages, uint16_t *scratch_pages);
+void cn10k_ml_model_info_set(struct rte_ml_dev *dev, struct cn10k_ml_model *model);
#endif /* _CN10K_ML_MODEL_H_ */
diff --git a/drivers/ml/cnxk/cn10k_ml_ops.c b/drivers/ml/cnxk/cn10k_ml_ops.c
index 77d3728d8d..ad9b3dfd21 100644
--- a/drivers/ml/cnxk/cn10k_ml_ops.c
+++ b/drivers/ml/cnxk/cn10k_ml_ops.c
@@ -506,6 +506,7 @@ cn10k_ml_model_load(struct rte_ml_dev *dev, struct rte_ml_model_params *params,
char str[RTE_MEMZONE_NAMESIZE];
const struct plt_memzone *mz;
size_t model_data_size;
+ size_t model_info_size;
uint8_t *base_dma_addr;
uint16_t scratch_pages;
uint16_t wb_pages;
@@ -544,8 +545,13 @@ cn10k_ml_model_load(struct rte_ml_dev *dev, struct rte_ml_model_params *params,
model_data_size = metadata->init_model.file_size + metadata->main_model.file_size +
metadata->finish_model.file_size + metadata->weights_bias.file_size;
model_data_size = PLT_ALIGN_CEIL(model_data_size, ML_CN10K_ALIGN_SIZE);
+ model_info_size = sizeof(struct rte_ml_model_info) +
+ metadata->model.num_input * sizeof(struct rte_ml_io_info) +
+ metadata->model.num_output * sizeof(struct rte_ml_io_info);
+ model_info_size = PLT_ALIGN_CEIL(model_info_size, ML_CN10K_ALIGN_SIZE);
+
mz_size = PLT_ALIGN_CEIL(sizeof(struct cn10k_ml_model), ML_CN10K_ALIGN_SIZE) +
- 2 * model_data_size +
+ 2 * model_data_size + model_info_size +
PLT_ALIGN_CEIL(sizeof(struct cn10k_ml_req), ML_CN10K_ALIGN_SIZE);
/* Allocate memzone for model object and model data */
@@ -585,10 +591,12 @@ cn10k_ml_model_load(struct rte_ml_dev *dev, struct rte_ml_model_params *params,
model->model_mem_map.wb_pages = wb_pages;
model->model_mem_map.scratch_pages = scratch_pages;
+ /* Set model info */
+ model->info = PLT_PTR_ADD(base_dma_addr, 2 * model_data_size);
+ cn10k_ml_model_info_set(dev, model);
+
/* Set slow-path request address and state */
- model->req = PLT_PTR_ADD(
- mz->addr, PLT_ALIGN_CEIL(sizeof(struct cn10k_ml_model), ML_CN10K_ALIGN_SIZE) +
- 2 * model_data_size);
+ model->req = PLT_PTR_ADD(model->info, model_info_size);
plt_spinlock_init(&model->lock);
model->state = ML_CN10K_MODEL_STATE_LOADED;
@@ -877,6 +885,26 @@ cn10k_ml_model_stop(struct rte_ml_dev *dev, uint16_t model_id)
return ret;
}
+static int
+cn10k_ml_model_info_get(struct rte_ml_dev *dev, uint16_t model_id,
+ struct rte_ml_model_info *model_info)
+{
+ struct cn10k_ml_model *model;
+
+ model = dev->data->models[model_id];
+
+ if (model == NULL) {
+ plt_err("Invalid model_id = %u", model_id);
+ return -EINVAL;
+ }
+
+ rte_memcpy(model_info, model->info, sizeof(struct rte_ml_model_info));
+ model_info->input_info = ((struct rte_ml_model_info *)model->info)->input_info;
+ model_info->output_info = ((struct rte_ml_model_info *)model->info)->output_info;
+
+ return 0;
+}
+
struct rte_ml_dev_ops cn10k_ml_ops = {
/* Device control ops */
.dev_info_get = cn10k_ml_dev_info_get,
@@ -894,4 +922,5 @@ struct rte_ml_dev_ops cn10k_ml_ops = {
.model_unload = cn10k_ml_model_unload,
.model_start = cn10k_ml_model_start,
.model_stop = cn10k_ml_model_stop,
+ .model_info_get = cn10k_ml_model_info_get,
};
--
2.17.1