From patchwork Mon Nov 22 17:53:22 2021
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: "Singh, Aman Deep" <aman.deep.singh@intel.com>
X-Patchwork-Id: 104581
Return-Path: <dev-bounces@dpdk.org>
X-Original-To: patchwork@inbox.dpdk.org
Delivered-To: patchwork@inbox.dpdk.org
Received: from mails.dpdk.org (mails.dpdk.org [217.70.189.124])
	by inbox.dpdk.org (Postfix) with ESMTP id 5FE0DA0C4B;
	Mon, 22 Nov 2021 18:59:51 +0100 (CET)
Received: from [217.70.189.124] (localhost [127.0.0.1])
	by mails.dpdk.org (Postfix) with ESMTP id 260744014E;
	Mon, 22 Nov 2021 18:59:51 +0100 (CET)
Received: from mga14.intel.com (mga14.intel.com [192.55.52.115])
 by mails.dpdk.org (Postfix) with ESMTP id 6417C4003C
 for <dev@dpdk.org>; Mon, 22 Nov 2021 18:59:49 +0100 (CET)
X-IronPort-AV: E=McAfee;i="6200,9189,10176"; a="235074320"
X-IronPort-AV: E=Sophos;i="5.87,255,1631602800";
 d="scan'208,217";a="235074320"
Received: from fmsmga005.fm.intel.com ([10.253.24.32])
 by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384;
 22 Nov 2021 09:59:48 -0800
X-ExtLoop1: 1
X-IronPort-AV: E=Sophos;i="5.87,255,1631602800";
 d="scan'208,217";a="739335796"
Received: from npg-npf-wlpr-srv02.iind.intel.com ([10.190.213.104])
 by fmsmga005.fm.intel.com with ESMTP; 22 Nov 2021 09:59:47 -0800
From: Aman Singh <aman.deep.singh@intel.com>
To: dev@dpdk.org
Cc: ferruh.yigit@intel.com
Subject: [PATCH v2] devtools/cocci: added script for ethdev namespace
Date: Mon, 22 Nov 2021 23:23:22 +0530
Message-Id: <20211122175322.88911-1-aman.deep.singh@intel.com>
X-Mailer: git-send-email 2.17.1
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

The cocci script is to help add prefix 'RTE_ETH' namespace to enum
& macro of ethdev library. It helps in automating these changes for
applications. The script won't make changes in the code comment part.
Usage: spatch <script path> <app path>

Signed-off-by: Aman Singh <aman.deep.singh@intel.com>
---
v2:
* Added support for struct changes
* Removed backward compatibility code gen part

 devtools/cocci/namespace_ethdev.cocci | 34 ++++++++++++---------------
 1 file changed, 15 insertions(+), 19 deletions(-)

diff --git a/devtools/cocci/namespace_ethdev.cocci b/devtools/cocci/namespace_ethdev.cocci
index 383db454f0..8bb189da5b 100644
--- a/devtools/cocci/namespace_ethdev.cocci
+++ b/devtools/cocci/namespace_ethdev.cocci
@@ -1,7 +1,7 @@
 @rule1@
-identifier I =~  "^(RTE_FC_|ETH_MQ_|ETH_RSS_|DEV_RX_|DEV_TX_|ETH_LINK_|RTE_RETA|
-ETH_SPEED|RTE_TUNNEL|ETH_VLAN|ETH_4|ETH_8|ETH_16|ETH_32|ETH_64|RTE_FDIR|RTE_L2|
-ETH_DCB|ETH_MIRROR|ETH_VMDQ|ETH_NUM|ETH_QINQ|rte_fdir)";
+identifier I =~  "^(RTE_FC_|ETH_MQ_|ETH_RSS|DEV_RX_|DEV_TX_|ETH_LINK|RTE_RETA|
+|ETH_DCB|RTE_TUNNEL|ETH_VLAN|ETH_4|ETH_8|ETH_16|ETH_32|ETH_64|RTE_FDIR|RTE_L2|
+|ETH_SPEED|ETH_MIRROR|ETH_VMDQ|ETH_NUM|ETH_QINQ|ETH_MAX_)";
 @@
 I
 
@@ -10,11 +10,10 @@ I << rule1.I;
 J;
 @@
 coccinelle .J="RTE_ETH_" + I[4:];
-if I.isupper() == False:
-	coccinelle .J="rte_eth_" + I[4:];
 
-exception_matches = ["ETH_RSS_MODE","ETH_VLAN_FILTER_ANY","ETH_VLAN_FILTER_SPEC",
-"ETH_VLAN_FILTER_CLASSIFY","ETH_RSS_UPDATE","RTE_FDIR_MODE"]
+exception_matches = ["ETH_VLAN_FILTER_CLASSIFY","ETH_VLAN_FILTER_ANY",
+"ETH_VLAN_FILTER_SPEC","ETH_RSS_MODE","ETH_RSS_UPDATE","RTE_FDIR_MODE",
+"RTE_FDIR_NO","RTE_FDIR_REPORT"]
 
 if any(x in I for x in exception_matches):
         coccinelle .J= I;
@@ -26,25 +25,22 @@ identifier p.J;
 - I
 + J
 
+
+// Below rule for structures only
 @rule2@
-identifier A  =~  "^(RTE_FC_|ETH_MQ_|ETH_RSS_|DEV_RX_|DEV_TX_|ETH_LINK_|RTE_RETA|
-ETH_SPEED|RTE_TUNNEL|ETH_VLAN|ETH_4|ETH_8|ETH_16|ETH_32|ETH_64|RTE_FDIR|RTE_L2|
-ETH_DCB|ETH_MIRROR|ETH_VMDQ|ETH_NUM|ETH_QINQ)";
-expression B ;
+identifier A  =~  "rte_fdir_conf|rte_intr_conf";
 @@
-#define A B
+struct A
 
 @ script : python p2@
 A << rule2.A;
-K;
+B;
 @@
-coccinelle .K="RTE_ETH_" + A[4:];
+coccinelle .B="rte_eth_" + A[4:];
 
 @ identifier2@
 identifier rule2.A;
-expression rule2.B;
-identifier p2.K;
+identifier p2.B;
 @@
-- #define A B
-+ #define K B
-+ #define A K
+- struct A
++ struct B