diff mbox series

[v4,30/34] ml/cnxk: implement I/O alloc and free callbacks

Message ID	20231017165951.27299-31-syalavarthi@marvell.com (mailing list archive)
State	Superseded, archived
Delegated to:	Jerin Jacob
Headers	From: Srikanth Yalavarthi <syalavarthi@marvell.com> To: Srikanth Yalavarthi <syalavarthi@marvell.com> CC: <dev@dpdk.org>, <sshankarnara@marvell.com>, <aprabhu@marvell.com>, <ptakkar@marvell.com> Subject: [PATCH v4 30/34] ml/cnxk: implement I/O alloc and free callbacks Date: Tue, 17 Oct 2023 09:59:43 -0700 Message-ID: <20231017165951.27299-31-syalavarthi@marvell.com> In-Reply-To: <20231017165951.27299-1-syalavarthi@marvell.com> References: <20230830155927.3566-1-syalavarthi@marvell.com> <20231017165951.27299-1-syalavarthi@marvell.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit Content-Type: text/plain Precedence: list Errors-To: dev-bounces@dpdk.org
Series	Implementation of revised ml/cnxk driver \| [v4,00/34] Implementation of revised ml/cnxk driver [v4,01/34] ml/cnxk: drop support for register polling [v4,02/34] ml/cnxk: add generic cnxk device structure [v4,03/34] ml/cnxk: add generic model and layer structures [v4,04/34] ml/cnxk: add generic cnxk request structure [v4,05/34] ml/cnxk: add generic cnxk xstats structures [v4,06/34] ml/cnxk: rename cnxk ops function pointers struct [v4,07/34] ml/cnxk: update device handling functions [v4,08/34] ml/cnxk: update queue-pair handling functions [v4,09/34] ml/cnxk: update model load and unload functions [v4,10/34] ml/cnxk: enable OCM check for multilayer TVM model [v4,11/34] ml/cnxk: update model start and stop functions [v4,12/34] ml/cnxk: update model utility functions [v4,13/34] ml/cnxk: update data quantization functions [v4,14/34] ml/cnxk: update device debug functions [v4,15/34] ml/cnxk: update device stats functions [v4,16/34] ml/cnxk: update device and model xstats functions [v4,17/34] ml/cnxk: update fast path functions [v4,18/34] ml/cnxk: move error handling to cnxk layer [v4,19/34] ml/cnxk: support config and close of tvmdp library [v4,20/34] ml/cnxk: add structures to support TVM model type [v4,21/34] ml/cnxk: add support for identify model type [v4,22/34] ml/cnxk: add support to parse TVM model objects [v4,23/34] ml/cnxk: fetch layer info and load TVM model [v4,24/34] ml/cnxk: update internal info for TVM model [v4,25/34] ml/cnxk: enable model unload in tvmdp library [v4,26/34] ml/cnxk: support start and stop for TVM models [v4,27/34] ml/cnxk: update internal TVM model info structure [v4,28/34] ml/cnxk: support device dump for TVM models [v4,29/34] ml/cnxk: enable reporting model runtime as xstats [v4,30/34] ml/cnxk: implement I/O alloc and free callbacks [v4,31/34] ml/cnxk: add generic ML malloc and free callback [v4,32/34] ml/cnxk: support quantize and dequantize callback [v4,33/34] ml/cnxk: enable fast-path ops for TVM models [v4,34/34] ml/cnxk: enable creation of mvtvm virtual device

Checks

Context	Check	Description
ci/checkpatch	success	coding style OK

Commit Message

Srikanth Yalavarthi Oct. 17, 2023, 4:59 p.m. UTC

  Implemented callback functions for IO allocation and free
for Glow layers.

Signed-off-by: Srikanth Yalavarthi <syalavarthi@marvell.com>
---
 drivers/ml/cnxk/cn10k_ml_ops.c | 87 ++++++++++++++++++++++++++++++++++
 drivers/ml/cnxk/cn10k_ml_ops.h |  3 ++
 drivers/ml/cnxk/mvtvm_ml_ops.c |  2 +
 3 files changed, 92 insertions(+)

diff mbox series

Patch

diff --git a/drivers/ml/cnxk/cn10k_ml_ops.c b/drivers/ml/cnxk/cn10k_ml_ops.c
index 0c67ce7b40..7802425c87 100644
--- a/drivers/ml/cnxk/cn10k_ml_ops.c
+++ b/drivers/ml/cnxk/cn10k_ml_ops.c
@@ -1410,3 +1410,90 @@  cn10k_ml_inference_sync(void *device, uint16_t index, void *input, void *output,
 error_enqueue:
 	return ret;
 }
+
+int
+cn10k_ml_io_alloc(void *device, uint16_t model_id, const char *layer_name, uint64_t **input_qbuffer,
+		  uint64_t **output_qbuffer)
+{
+	struct cnxk_ml_dev *cnxk_mldev;
+	struct cnxk_ml_model *model;
+	struct cnxk_ml_layer *layer;
+
+	char str[RTE_MEMZONE_NAMESIZE];
+	const struct plt_memzone *mz;
+	uint64_t output_size;
+	uint64_t input_size;
+	uint16_t layer_id;
+	int ret;
+
+	cnxk_mldev = (struct cnxk_ml_dev *)device;
+	if (cnxk_mldev == NULL) {
+		plt_err("Invalid device = %p", device);
+		return -EINVAL;
+	}
+
+	model = cnxk_mldev->mldev->data->models[model_id];
+	if (model == NULL) {
+		plt_err("Invalid model_id = %u", model_id);
+		return -EINVAL;
+	}
+
+	ret = cn10k_ml_model_get_layer_id(model, layer_name, &layer_id);
+	if (ret != 0)
+		return ret;
+
+	layer = &model->layer[layer_id];
+	input_size = PLT_ALIGN_CEIL(layer->info.total_input_sz_q, ML_CN10K_ALIGN_SIZE);
+	output_size = PLT_ALIGN_CEIL(layer->info.total_output_sz_q, ML_CN10K_ALIGN_SIZE);
+
+	sprintf(str, "cn10k_ml_io_mz_%u_%u", model_id, layer_id);
+	mz = plt_memzone_reserve_aligned(str, input_size + output_size, 0, ML_CN10K_ALIGN_SIZE);
+	if (mz == NULL) {
+		plt_err("io_alloc failed: Unable to allocate memory: model_id = %u, layer_name = %s",
+			model_id, layer_name);
+		return -ENOMEM;
+	}
+
+	*input_qbuffer = mz->addr;
+	*output_qbuffer = PLT_PTR_ADD(mz->addr, input_size);
+
+	return 0;
+}
+
+int
+cn10k_ml_io_free(void *device, uint16_t model_id, const char *layer_name)
+{
+	struct cnxk_ml_dev *cnxk_mldev;
+	struct cnxk_ml_model *model;
+
+	char str[RTE_MEMZONE_NAMESIZE];
+	const struct plt_memzone *mz;
+	uint16_t layer_id;
+	int ret;
+
+	cnxk_mldev = (struct cnxk_ml_dev *)device;
+	if (cnxk_mldev == NULL) {
+		plt_err("Invalid device = %p", device);
+		return -EINVAL;
+	}
+
+	model = cnxk_mldev->mldev->data->models[model_id];
+	if (model == NULL) {
+		plt_err("Invalid model_id = %u", model_id);
+		return -EINVAL;
+	}
+
+	ret = cn10k_ml_model_get_layer_id(model, layer_name, &layer_id);
+	if (ret != 0)
+		return ret;
+
+	sprintf(str, "cn10k_ml_io_mz_%u_%u", model_id, layer_id);
+	mz = plt_memzone_lookup(str);
+	if (mz == NULL) {
+		plt_err("io_free failed: Memzone not found: model_id = %u, layer_name = %s",
+			model_id, layer_name);
+		return -EINVAL;
+	}
+
+	return plt_memzone_free(mz);
+}
diff --git a/drivers/ml/cnxk/cn10k_ml_ops.h b/drivers/ml/cnxk/cn10k_ml_ops.h
index 045e2e6cd2..9c41c1c0b0 100644
--- a/drivers/ml/cnxk/cn10k_ml_ops.h
+++ b/drivers/ml/cnxk/cn10k_ml_ops.h
@@ -329,6 +329,9 @@  int cn10k_ml_layer_load(void *device, uint16_t model_id, const char *layer_name,
 int cn10k_ml_layer_unload(void *device, uint16_t model_id, const char *layer_name);
 int cn10k_ml_layer_start(void *device, uint16_t model_id, const char *layer_name);
 int cn10k_ml_layer_stop(void *device, uint16_t model_id, const char *layer_name);
+int cn10k_ml_io_alloc(void *device, uint16_t model_id, const char *layer_name,
+		      uint64_t **input_qbuffer, uint64_t **output_qbuffer);
+int cn10k_ml_io_free(void *device, uint16_t model_id, const char *layer_name);
 
 /* xstats ops */
 void cn10k_ml_xstat_model_name_set(struct cnxk_ml_dev *cnxk_mldev, struct cnxk_ml_model *model,
diff --git a/drivers/ml/cnxk/mvtvm_ml_ops.c b/drivers/ml/cnxk/mvtvm_ml_ops.c
index 832837034b..77c2b5bcdc 100644
--- a/drivers/ml/cnxk/mvtvm_ml_ops.c
+++ b/drivers/ml/cnxk/mvtvm_ml_ops.c
@@ -232,6 +232,8 @@  mvtvm_ml_model_load(struct cnxk_ml_dev *cnxk_mldev, struct rte_ml_model_params *
 		callback = &model->mvtvm.cb;
 		callback->tvmrt_glow_layer_load = cn10k_ml_layer_load;
 		callback->tvmrt_glow_layer_unload = cn10k_ml_layer_unload;
+		callback->tvmrt_io_alloc = cn10k_ml_io_alloc;
+		callback->tvmrt_io_free = cn10k_ml_io_free;
 	} else {
 		callback = NULL;
 	}