From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124]) by smtp.lore.kernel.org (Postfix) with ESMTP id 2D010C433EF for ; Mon, 18 Jul 2022 13:07:49 +0000 (UTC) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id AB18142B87; Mon, 18 Jul 2022 15:07:24 +0200 (CEST) Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by mails.dpdk.org (Postfix) with ESMTP id C653F40041 for ; Mon, 18 Jul 2022 15:07:20 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1658149641; x=1689685641; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=2xtKH5YwBNH0YtSD96L/IjrRVQtxD+BIloqcSzc/ybk=; b=lNY8Vi1tMKrKjmiLU0ga1Alh9n/9KDk2ktvI9R5fOoobeyrfgSwU12lf dQpS6iR8WMjLw9848Ggv84rSJ+B1+HkzY8C8NI1O6K/7q8wVl8Xl+tpWv 1UkX0/lx8qVegXX3pOW/oPzBLc8XsUqHUy41hKIH3zvIX75Df22C2Vwl/ 2qNxftYF2kicdVU0y14jNaaDpTCMBZ1LCuirNf4KW7sqtMWIEgzrW6Jgt fBXAWW0J8gYsdY+ge0NkpPaixnaEAovnojNHicen8yJdK7bSUg9rHw0u7 5FgK3AHagTEDOPdAuGlgIDuUoDA5BG6PXUso3fMFnC1B40s9cbuhyXGqD A==; X-IronPort-AV: E=McAfee;i="6400,9594,10411"; a="265996424" X-IronPort-AV: E=Sophos;i="5.92,281,1650956400"; d="scan'208";a="265996424" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 18 Jul 2022 06:07:19 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.92,281,1650956400"; d="scan'208";a="739459744" Received: from silpixa00400573.ir.intel.com (HELO silpixa00400573.ger.corp.intel.com.) ([10.237.223.157]) by fmsmga001.fm.intel.com with ESMTP; 18 Jul 2022 06:07:18 -0700 From: Cristian Dumitrescu To: dev@dpdk.org Cc: "Kamalakannan R ." Subject: [PATCH 5/9] pipeline: add API for pipeline code generation Date: Mon, 18 Jul 2022 13:07:09 +0000 Message-Id: <20220718130713.339003-5-cristian.dumitrescu@intel.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220718130713.339003-1-cristian.dumitrescu@intel.com> References: <20220718130713.339003-1-cristian.dumitrescu@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 Previously, the C code generation for the pipeline was hidden under the hood; now, we make this an explicit API operation. Besides the functions for the pipeline actions and the pipeline instructions, the generated C source code now includes the pipeline specification structure required for the pipeline configuration operations. Signed-off-by: Cristian Dumitrescu Signed-off-by: Kamalakannan R. --- lib/pipeline/rte_swx_pipeline.c | 94 +++++++++++++++++++++++++++++++++ lib/pipeline/rte_swx_pipeline.h | 25 +++++++++ lib/pipeline/version.map | 3 ++ 3 files changed, 122 insertions(+) diff --git a/lib/pipeline/rte_swx_pipeline.c b/lib/pipeline/rte_swx_pipeline.c index 3e1c6e9edb..52760111fd 100644 --- a/lib/pipeline/rte_swx_pipeline.c +++ b/lib/pipeline/rte_swx_pipeline.c @@ -18,6 +18,7 @@ #include #include "rte_swx_pipeline_internal.h" +#include "rte_swx_pipeline_spec.h" #define CHECK(condition, err_code) \ do { \ @@ -13476,3 +13477,96 @@ pipeline_compile(struct rte_swx_pipeline *p) return status; } + +int +rte_swx_pipeline_codegen(FILE *spec_file, + FILE *code_file, + uint32_t *err_line, + const char **err_msg) + +{ + struct rte_swx_pipeline *p = NULL; + struct pipeline_spec *s = NULL; + struct instruction_group_list *igl = NULL; + struct action *a; + int status = 0; + + /* Check input arguments. */ + if (!spec_file || !code_file) { + if (err_line) + *err_line = 0; + if (err_msg) + *err_msg = "Invalid input argument."; + status = -EINVAL; + goto free; + } + + /* Pipeline configuration. */ + s = pipeline_spec_parse(spec_file, err_line, err_msg); + if (!s) { + status = -EINVAL; + goto free; + } + + status = rte_swx_pipeline_config(&p, 0); + if (status) { + if (err_line) + *err_line = 0; + if (err_msg) + *err_msg = "Pipeline configuration error."; + goto free; + } + + status = pipeline_spec_configure(p, s, err_msg); + if (status) { + if (err_line) + *err_line = 0; + goto free; + } + + /* + * Pipeline code generation. + */ + + /* Instruction Group List (IGL) computation: the pipeline configuration must be done first, + * but there is no need for the pipeline build to be done as well. + */ + igl = instruction_group_list_create(p); + if (!igl) { + if (err_line) + *err_line = 0; + if (err_msg) + *err_msg = "Memory allocation failed."; + status = -ENOMEM; + goto free; + } + + /* Header file inclusion. */ + fprintf(code_file, "#include \"rte_swx_pipeline_internal.h\"\n"); + fprintf(code_file, "#include \"rte_swx_pipeline_spec.h\"\n\n"); + + /* Code generation for the pipeline specification. */ + pipeline_spec_codegen(code_file, s); + fprintf(code_file, "\n"); + + /* Code generation for the action instructions. */ + TAILQ_FOREACH(a, &p->actions, node) { + fprintf(code_file, "/**\n * Action %s\n */\n\n", a->name); + + action_data_codegen(a, code_file); + fprintf(code_file, "\n"); + + action_instr_codegen(a, code_file); + fprintf(code_file, "\n"); + } + + /* Code generation for the pipeline instructions. */ + instruction_group_list_codegen(igl, p, code_file); + +free: + instruction_group_list_free(igl); + rte_swx_pipeline_free(p); + pipeline_spec_free(s); + + return status; +} diff --git a/lib/pipeline/rte_swx_pipeline.h b/lib/pipeline/rte_swx_pipeline.h index c41ca5cb15..2bd019b05f 100644 --- a/lib/pipeline/rte_swx_pipeline.h +++ b/lib/pipeline/rte_swx_pipeline.h @@ -941,6 +941,31 @@ __rte_experimental int rte_swx_pipeline_build(struct rte_swx_pipeline *p); +/** + * Pipeline C code generate based on input specification file + * + * @param[in] spec_file + * Pipeline specification file (.spec) provided as input. + * @param[in] code_file + * Pipeline C language file (.c) to be generated. + * @param[out] err_line + * In case of error and non-NULL, the line number within the *spec* file where + * the error occurred. The first line number in the file is 1. + * @param[out] err_msg + * In case of error and non-NULL, the error message. + * @return + * 0 on success or the following error codes otherwise: + * -EINVAL: Invalid argument; + * -ENOMEM: Not enough space/cannot allocate memory; + * -EEXIST: Resource with the same name already exists. + */ +__rte_experimental +int +rte_swx_pipeline_codegen(FILE *spec_file, + FILE *code_file, + uint32_t *err_line, + const char **err_msg); + /** * Pipeline build from specification file * diff --git a/lib/pipeline/version.map b/lib/pipeline/version.map index 8312307a7a..51165d48cf 100644 --- a/lib/pipeline/version.map +++ b/lib/pipeline/version.map @@ -145,4 +145,7 @@ EXPERIMENTAL { rte_swx_ctl_pipeline_learner_timeout_get; rte_swx_ctl_pipeline_learner_timeout_set; rte_swx_pipeline_hash_func_register; + + #added in 22.11 + rte_swx_pipeline_codegen; }; -- 2.34.1