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 23D7DA0C4B; Thu, 14 Oct 2021 20:25:17 +0200 (CEST) Received: from [217.70.189.124] (localhost [127.0.0.1]) by mails.dpdk.org (Postfix) with ESMTP id 0BAB840041; Thu, 14 Oct 2021 20:25:17 +0200 (CEST) Received: from mga06.intel.com (mga06.intel.com [134.134.136.31]) by mails.dpdk.org (Postfix) with ESMTP id D72974003C for ; Thu, 14 Oct 2021 20:25:14 +0200 (CEST) X-IronPort-AV: E=McAfee;i="6200,9189,10137"; a="288630037" X-IronPort-AV: E=Sophos;i="5.85,373,1624345200"; d="scan'208";a="288630037" Received: from fmsmga005.fm.intel.com ([10.253.24.32]) by orsmga104.jf.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 14 Oct 2021 11:25:13 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.85,373,1624345200"; d="scan'208";a="717816842" Received: from orsmsx603.amr.corp.intel.com ([10.22.229.16]) by fmsmga005.fm.intel.com with ESMTP; 14 Oct 2021 11:25:13 -0700 Received: from orsmsx610.amr.corp.intel.com (10.22.229.23) by ORSMSX603.amr.corp.intel.com (10.22.229.16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12; Thu, 14 Oct 2021 11:25:12 -0700 Received: from ORSEDG601.ED.cps.intel.com (10.7.248.6) by orsmsx610.amr.corp.intel.com (10.22.229.23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256) id 15.1.2242.12 via Frontend Transport; Thu, 14 Oct 2021 11:25:12 -0700 Received: from NAM12-DM6-obe.outbound.protection.outlook.com (104.47.59.171) by edgegateway.intel.com (134.134.137.102) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.1.2242.12; Thu, 14 Oct 2021 11:25:12 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=maGXm4cs7Dd7IQF8sEWK+idwOnk2+19NlkX2FKc1JwHDaGU9ingos/0yTQMX2BieZXPbBtOoglsn6DQPwYt8N8wM5Xf2DZ6p1fQciEHyJDB3S84dRQ4p3Dr16jsjdtSjTZxfsYDniyCcZN+S9i3bLYTz2CwJPaOemwXgPNscKNiAMMI5xrgFdOoXJzaHzkRiAOShxpOKccW/CUCGx2hF0g/iJ0qj0zpAPyaTLTY/bKu197jguqkid6cDzhy/lNaqVKYX1caXpgwllJuhrdwqJcefFUcsOc9y9UhbI9MJFMBQ8H0K1qgI8bJrZsW9IMEu6iZr0jbCBl056vitNOkvOg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=t8/5mLIeJZWWci4gkoDtIccyo+LZCio6bDyn1ZlFWa0=; b=WpRmN8lbUW8rKFcBP4hWwT5TcyZJGI9sbhOvNWjGbn/zFWByXO7dnJcXHmwbWxiLmOhRDgZ+i65y2DHh3ZdkgXVPb52Xef1E3uY/WpLXK9NlZ9yXIoJuVMapb4AIcbmc79MuPVl9MW3xJyJQd+2Xp+zUbFJFoYn3Ll2wX6N3b/baeOxptumaDA9ChdRS+CNZs2ktddQl/7jEwCyVEEUo1nvOHKFDQFRkSg2kZtkByyOS9Dg6GZa5yHmgfi0FM3YAGG65RbYdXXSMKDTP9hEbOCh1ropQxTuMlLK6N8GGYTHoAVwPCjp9oaqhCXqOWvaHe966Yh5SuoxTD0kOCQn2Sw== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=t8/5mLIeJZWWci4gkoDtIccyo+LZCio6bDyn1ZlFWa0=; b=WJ4g+iSVM+KctFEiFMSrHT4COkW07qgX5wCMRCcz+pFQ0CMXx0qSnyR/lDQn5oxiq0U9i/8FuHjMQu/TiL6IXX4DsKbl5u9qAW4oLsyfYoz+c9l4NpVTSCFly/s/c1pymrLT5HAjID+RFyejGFzN12ZNnKsKxaYvCEpYVa8t9AE= Received: from BY5PR11MB4451.namprd11.prod.outlook.com (2603:10b6:a03:1cb::30) by BYAPR11MB3704.namprd11.prod.outlook.com (2603:10b6:a03:f9::29) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.4587.25; Thu, 14 Oct 2021 18:25:09 +0000 Received: from BY5PR11MB4451.namprd11.prod.outlook.com ([fe80::d2d:4882:88be:85bd]) by BY5PR11MB4451.namprd11.prod.outlook.com ([fe80::d2d:4882:88be:85bd%7]) with mapi id 15.20.4587.026; Thu, 14 Oct 2021 18:25:09 +0000 From: "Chautru, Nicolas" To: Piotr Kubaj , "Doherty, Declan" , "Power, Ciara" , "Xing, Beilei" , "Wang, Haiyue" , "jiawenwu@trustnetic.com" , "jianwang@trustnetic.com" , "drc@linux.vnet.ibm.com" CC: "dev@dpdk.org" Thread-Topic: [PATCH] ppc64le: fix build with Clang Thread-Index: AQHXwSRqkv6mb+fseEaq/bTRazrLf6vSzmDA Date: Thu, 14 Oct 2021 18:25:09 +0000 Message-ID: References: <20211014173537.81806-1-pkubaj@FreeBSD.org> In-Reply-To: <20211014173537.81806-1-pkubaj@FreeBSD.org> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.6.200.16 authentication-results: FreeBSD.org; dkim=none (message not signed) header.d=none;FreeBSD.org; dmarc=none action=none header.from=intel.com; x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7bd010e1-597e-4106-3ad9-08d98f3ff468 x-ms-traffictypediagnostic: BYAPR11MB3704: x-ms-exchange-transport-forked: True x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:323; x-ms-exchange-senderadcheck: 1 x-ms-exchange-antispam-relay: 0 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: xjHz27H6qu24NRFulMN4q/816kX1vasH10+JqhyRZ0m1h389LRrOk1o5yY6FG9hdWk70+9awlobDdNSF0S7Zi9atfKcrbFujD9x4R+ROsXxGkYYxWmb5ihe3Kyzd8JrGCgPDE/BaARGCQI7s17eRmisST6VWUGz2/ODOXlx1vPDEKhxKP42jW67+UStmwjpS03O++e07qmTYYSviRJmuo6JBCbp4a2PZjLz8aaMdle9Qi6+R9xHMmoWlkQ1S/Pm9qfHIt1Zh5fqTvzbvKCIV8kmlBCV7Vl9ZqFiB/ne+2pR6QyiL3lO4q1hP8lQxW49omiXL0ZiLYLtjg/ql48PpuGZus2hHCT6p/CWPmW+7KNxGtLCguk/MALEQePD8+AsBlHG7Drv+7LOmloh3BHdpVd81M24+Buh0DPi1yUOPmOLlhIO51AzlF4gdzeHRJ523Ug4LOFkrErGe6RcRVbvwllh5oMlUzSz/vwvDqcrCBCPVYRYS18T65TYxf+vk1CS/0QN6VEzf2CQSLsp8E8KP8opAuJfpRB0AQ7pWUrwyxo8dk9nldXIE18Fq6lsAPtHgP+54Q0AQB0+fThY1WVIaUrwyqY5ocnjIxEHgd4g1lOKSvoQ2w+q8mgTANnI+OGpk/Env9/mwbfoAgXg6KOoYBzJdaXtPA85tQWOwa13CCuRScFIAPgARbmpZ8PSskNyApQYvGx0L0F5dvITDfbPeZghSf25Gyrjaf5W5mu41xmkiLnJCoOhIF2vSEqy795qUeBVPYEwW6ppintOuRJaAhGbE2Y3e/nKQMzSdrd1/jeWIK9LFBuLnR1dsvaHP8LIU x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BY5PR11MB4451.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFS:(366004)(30864003)(122000001)(5660300002)(52536014)(9686003)(53546011)(316002)(921005)(71200400001)(2906002)(6506007)(38070700005)(110136005)(38100700002)(66446008)(7696005)(86362001)(66946007)(64756008)(66476007)(55016002)(8936002)(508600001)(4326008)(66556008)(33656002)(186003)(82960400001)(83380400001)(8676002)(966005)(26005)(76116006)(559001)(579004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata-chunkcount: 1 x-ms-exchange-antispam-messagedata-0: =?us-ascii?Q?88hmyveep2ct5QI/HveL1EHOC+OsW3HL7pkdmGY0JQWx705BeiZ5mRIOahaI?= =?us-ascii?Q?GwEWMZlzzyiQKXuSPYXg+40E8h7Vd1f0BNHaU/kPAzxzfr0H48Xc412D8HOk?= =?us-ascii?Q?O/eulqiHYXHVUP24E+D/wrfYSVaWIZujH6Rj1g7a56cMkm+QDFAHH1KxAseD?= =?us-ascii?Q?lPURbTiSw5pm2YMQKoUanBfn9ieeBIra24/gnwX8FsQyQhbjNo8opbhFAAfK?= =?us-ascii?Q?i+AnHGob46bDfCUEB8zvAlobXOi5bseIfVg+9LnItS96+dnyohz+2ozFnZC5?= =?us-ascii?Q?fN2Tl/CyW0aGIKdJ0nESEZqca35j2eVlP2QeVt/1Xp9MVX1ZQshnk7Znsp7u?= =?us-ascii?Q?FGkyM2E4QfHnJGXxkbKMXckoU9UWN/ZR5tMw1fEh2SY9nz+L2r+Wz2eFdlGg?= =?us-ascii?Q?uhGq3lfluiDlzAsOQ+NHYaddoHhEcKtiwWy2fOwDPiMnVksyE3Yrn/0eDIa+?= =?us-ascii?Q?yauXQAw4NGfk0mJr4acs+KGcrE877RcmDd5B8PHFHMy+AqmRRF7kD9tcA56l?= =?us-ascii?Q?aEYcll5L654pjGqqoyJWEldtGVIGOgCbH9Do7S4h0wmFzMu0slYkVtAvRop6?= =?us-ascii?Q?hxZ52WtRQva6CSfTpnPmVBq5UP+j974R6BBtNt1FAKizcJSW7S3bkWDy8B7L?= =?us-ascii?Q?n2zKl1yQ7fcJc+bGDTIvTYy2iVYheps6kJFt499UdLrAvX48erNNPNdvEQfX?= =?us-ascii?Q?YulLAc2Uhy9LLsDx8CMcotQTi6CA9r7SfBJxjEdP63pCvNunBXlpiBtzi7eH?= =?us-ascii?Q?e9b2TTtdTE28ZM5O9qNnoH1yDNaCPe9QCJ484B/vxETyHusQbNBoqqlgMRs7?= =?us-ascii?Q?BjeHL4RslHAh57vzEGcgU66EUm1XeJtKGx4M63AgXdZxom+tX4uByds/CQxW?= =?us-ascii?Q?CVlZBbViOJx9hESfuMP8xhSZVXW5lXXQGQAkliex/Bwt2eMNKXbYgKnLFQXA?= =?us-ascii?Q?pMJ4prmFFAwyhtAqtDqi0HPjnnd/G4kl2tkXlMHG9H6N/9aNcDoOWEp9AnRp?= =?us-ascii?Q?A/6DMcKRNupMlJTJcOsxWCEz5eepnXytWHxYq09zKZhqQkS9TaP0KnwXdPbk?= =?us-ascii?Q?2rdR1g9wv0pEcvMiXKMHZbwRaBSO4/I+LRwS2FEuCtKCtamXCAdpJlsfE25k?= =?us-ascii?Q?j9/rt3i4v0AHWmwWNfmYKlVaasf+a707T60HURG5JF4338yKEIRoLwwiLwT2?= =?us-ascii?Q?qJ5rKNa/989s0rqJEgAW2VufwnJFAlLJYI0bLhRMITnD78Ta0HaVN1fCMuAh?= =?us-ascii?Q?cm9mRKa8FC9zBvJ9GT43+GF3Z7iluQICVxYE18z+zQQF8sXiHbP5JUdx+FQ/?= =?us-ascii?Q?RlYHz/lDIM2ioPHRsHy/tdg2?= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-AuthSource: BY5PR11MB4451.namprd11.prod.outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 7bd010e1-597e-4106-3ad9-08d98f3ff468 X-MS-Exchange-CrossTenant-originalarrivaltime: 14 Oct 2021 18:25:09.2910 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 1hJFn4N0ckccN8dk1e79dI+pFtBbKr1koA0jq73q1LhwQSeSGtmqKfF4sV6d1jB9sZJKw2+WRdclLoOLzVimeO0ymln3cIP0iwU6sp/YEBM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3704 X-OriginatorOrg: intel.com Subject: Re: [dpdk-dev] [PATCH] ppc64le: fix build with Clang 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 Sender: "dev" Hi Piotr,=20 See below, personally not okay with such a change.=20 > -----Original Message----- > From: Piotr Kubaj > Sent: Thursday, October 14, 2021 10:36 AM > To: Chautru, Nicolas ; Doherty, Declan > ; Power, Ciara ; Xing, > Beilei ; Wang, Haiyue ; > jiawenwu@trustnetic.com; jianwang@trustnetic.com; > drc@linux.vnet.ibm.com > Cc: dev@dpdk.org; Piotr Kubaj > Subject: [PATCH] ppc64le: fix build with Clang >=20 > Couple of quite common issues: > 1. In rte_cycles.h, sys/platform/ppc.h and __ppc_get_timebase() are only = for > glibc. > 2. In include/rte_atomic.h, the same issue already was encountered on > arm64: > https://mails.dpdk.org/archives/dev/2019-January/123331.html > 3. In rte_altivec.h, defining vector to __vector is necessary. > 4. In i40e_rxtx_vec_altivec.c, some type changes from vector unsigned lon= g > to > vector unsigned int is necessary since clang doesn't support vector unsig= ned > long very well and deprecated it. >=20 > Signed-off-by: Piotr Kubaj > --- > app/test-bbdev/test_bbdev_perf.c | 8 +- > app/test-bbdev/test_bbdev_vector.c | 336 +++++++++--------- > app/test-bbdev/test_bbdev_vector.h | 2 +- > .../cperf_test_vector_parsing.c | 114 +++--- > .../cperf_test_vector_parsing.h | 2 +- > app/test-crypto-perf/cperf_test_verify.c | 8 +- > drivers/net/i40e/i40e_rxtx_vec_altivec.c | 36 +- > drivers/net/ixgbe/ixgbe_ethdev.c | 24 +- > drivers/net/ixgbe/ixgbe_rxtx.c | 10 +- > drivers/net/txgbe/txgbe_ethdev.c | 24 +- > lib/eal/ppc/include/rte_altivec.h | 3 + > lib/eal/ppc/include/rte_atomic.h | 6 +- > lib/eal/ppc/include/rte_cycles.h | 8 + > 13 files changed, 296 insertions(+), 285 deletions(-) >=20 > diff --git a/app/test-bbdev/test_bbdev_perf.c b/app/test- > bbdev/test_bbdev_perf.c > index 469597b8b3..a7d2a7c820 100644 > --- a/app/test-bbdev/test_bbdev_perf.c > +++ b/app/test-bbdev/test_bbdev_perf.c > @@ -566,14 +566,14 @@ create_mempools(struct active_device *ad, int > socket_id, >=20 > static int > add_bbdev_dev(uint8_t dev_id, struct rte_bbdev_info *info, > - struct test_bbdev_vector *vector) > + struct test_bbdev_vector *dpdk_vector) > { > int ret; > unsigned int queue_id; > struct rte_bbdev_queue_conf qconf; > struct active_device *ad =3D &active_devs[nb_active_devs]; > unsigned int nb_queues; > - enum rte_bbdev_op_type op_type =3D vector->op_type; > + enum rte_bbdev_op_type op_type =3D dpdk_vector->op_type; >=20 Why would we to rename this? Here you are not change the struct/type, only = variable name which should be orthogonal to compiler. We should not change this please anywhere in app/test-bbdev > /* Configure fpga lte fec with PF & VF values > * if '-i' flag is set and using fpga device > @@ -782,14 +782,14 @@ add_bbdev_dev(uint8_t dev_id, struct > rte_bbdev_info *info, >=20 > static int > add_active_device(uint8_t dev_id, struct rte_bbdev_info *info, > - struct test_bbdev_vector *vector) > + struct test_bbdev_vector *dpdk_vector) > { > int ret; >=20 > active_devs[nb_active_devs].driver_name =3D info->drv.driver_name; > active_devs[nb_active_devs].dev_id =3D dev_id; >=20 > - ret =3D add_bbdev_dev(dev_id, info, vector); > + ret =3D add_bbdev_dev(dev_id, info, dpdk_vector); > if (ret =3D=3D TEST_SUCCESS) > ++nb_active_devs; > return ret; > diff --git a/app/test-bbdev/test_bbdev_vector.c b/app/test- > bbdev/test_bbdev_vector.c > index f020836f88..267b4a4704 100644 > --- a/app/test-bbdev/test_bbdev_vector.c > +++ b/app/test-bbdev/test_bbdev_vector.c > @@ -382,7 +382,7 @@ parse_expected_status(char *tokens, int *status, > enum rte_bbdev_op_type op_type) > */ > static int > parse_data_entry(const char *key_token, char *token, > - struct test_bbdev_vector *vector, enum op_data_type type, > + struct test_bbdev_vector *dpdk_vector, enum op_data_type > type, > const char *prefix) > { > int ret; > @@ -397,8 +397,8 @@ parse_data_entry(const char *key_token, char > *token, > return -1; > } >=20 > - op_data =3D vector->entries[type].segments; > - nb_ops =3D &vector->entries[type].nb_segments; > + op_data =3D dpdk_vector->entries[type].segments; > + nb_ops =3D &dpdk_vector->entries[type].nb_segments; >=20 > if (*nb_ops >=3D RTE_BBDEV_TURBO_MAX_CODE_BLOCKS) { > printf("Too many segments (code blocks defined): %u, max > %d!\n", > @@ -433,106 +433,106 @@ parse_data_entry(const char *key_token, char > *token, > /* parses turbo decoder parameters and assigns to global variable */ > static int > parse_decoder_params(const char *key_token, char *token, > - struct test_bbdev_vector *vector) > + struct test_bbdev_vector *dpdk_vector) > { > int ret =3D 0, status =3D 0; > uint32_t op_flags =3D 0; > char *err =3D NULL; >=20 > - struct rte_bbdev_op_turbo_dec *turbo_dec =3D &vector->turbo_dec; > + struct rte_bbdev_op_turbo_dec *turbo_dec =3D &dpdk_vector- > >turbo_dec; >=20 > /* compare keys */ > if (starts_with(key_token, op_data_prefixes[DATA_INPUT])) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_INPUT, > op_data_prefixes[DATA_INPUT]); >=20 > else if (starts_with(key_token, > op_data_prefixes[DATA_SOFT_OUTPUT])) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_SOFT_OUTPUT, > op_data_prefixes[DATA_SOFT_OUTPUT]); >=20 > else if (starts_with(key_token, > op_data_prefixes[DATA_HARD_OUTPUT])) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_HARD_OUTPUT, > op_data_prefixes[DATA_HARD_OUTPUT]); > else if (!strcmp(key_token, "e")) { > - vector->mask |=3D TEST_BBDEV_VF_E; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_E; > turbo_dec->cb_params.e =3D (uint32_t) strtoul(token, &err, 0); > } else if (!strcmp(key_token, "ea")) { > - vector->mask |=3D TEST_BBDEV_VF_EA; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EA; > turbo_dec->tb_params.ea =3D (uint32_t) strtoul(token, &err, > 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "eb")) { > - vector->mask |=3D TEST_BBDEV_VF_EB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EB; > turbo_dec->tb_params.eb =3D (uint32_t) strtoul(token, &err, > 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "k")) { > - vector->mask |=3D TEST_BBDEV_VF_K; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_K; > turbo_dec->cb_params.k =3D (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "k_pos")) { > - vector->mask |=3D TEST_BBDEV_VF_K_POS; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_K_POS; > turbo_dec->tb_params.k_pos =3D (uint16_t) strtoul(token, > &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "k_neg")) { > - vector->mask |=3D TEST_BBDEV_VF_K_NEG; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_K_NEG; > turbo_dec->tb_params.k_neg =3D (uint16_t) strtoul(token, > &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "c")) { > - vector->mask |=3D TEST_BBDEV_VF_C; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_C; > turbo_dec->tb_params.c =3D (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "c_neg")) { > - vector->mask |=3D TEST_BBDEV_VF_C_NEG; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_C_NEG; > turbo_dec->tb_params.c_neg =3D (uint16_t) strtoul(token, > &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "cab")) { > - vector->mask |=3D TEST_BBDEV_VF_CAB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_CAB; > turbo_dec->tb_params.cab =3D (uint8_t) strtoul(token, &err, > 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "rv_index")) { > - vector->mask |=3D TEST_BBDEV_VF_RV_INDEX; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_RV_INDEX; > turbo_dec->rv_index =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "iter_max")) { > - vector->mask |=3D TEST_BBDEV_VF_ITER_MAX; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_ITER_MAX; > turbo_dec->iter_max =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "iter_min")) { > - vector->mask |=3D TEST_BBDEV_VF_ITER_MIN; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_ITER_MIN; > turbo_dec->iter_min =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "expected_iter_count")) { > - vector->mask |=3D TEST_BBDEV_VF_EXPECTED_ITER_COUNT; > + dpdk_vector->mask |=3D > TEST_BBDEV_VF_EXPECTED_ITER_COUNT; > turbo_dec->iter_count =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "ext_scale")) { > - vector->mask |=3D TEST_BBDEV_VF_EXT_SCALE; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EXT_SCALE; > turbo_dec->ext_scale =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "num_maps")) { > - vector->mask |=3D TEST_BBDEV_VF_NUM_MAPS; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_NUM_MAPS; > turbo_dec->num_maps =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "r")) { > - vector->mask |=3D TEST_BBDEV_VF_R; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_R; > turbo_dec->tb_params.r =3D (uint8_t)strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "code_block_mode")) { > - vector->mask |=3D TEST_BBDEV_VF_CODE_BLOCK_MODE; > + dpdk_vector->mask |=3D > TEST_BBDEV_VF_CODE_BLOCK_MODE; > turbo_dec->code_block_mode =3D (uint8_t) strtoul(token, > &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "op_flags")) { > - vector->mask |=3D TEST_BBDEV_VF_OP_FLAGS; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_OP_FLAGS; > ret =3D parse_turbo_flags(token, &op_flags, > - vector->op_type); > + dpdk_vector->op_type); > if (!ret) > turbo_dec->op_flags =3D op_flags; > } else if (!strcmp(key_token, "expected_status")) { > - vector->mask |=3D TEST_BBDEV_VF_EXPECTED_STATUS; > - ret =3D parse_expected_status(token, &status, vector- > >op_type); > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EXPECTED_STATUS; > + ret =3D parse_expected_status(token, &status, dpdk_vector- > >op_type); > if (!ret) > - vector->expected_status =3D status; > + dpdk_vector->expected_status =3D status; > } else { > printf("Not valid dec key: '%s'\n", key_token); > return -1; > @@ -549,94 +549,94 @@ parse_decoder_params(const char *key_token, > char *token, > /* parses turbo encoder parameters and assigns to global variable */ > static int > parse_encoder_params(const char *key_token, char *token, > - struct test_bbdev_vector *vector) > + struct test_bbdev_vector *dpdk_vector) > { > int ret =3D 0, status =3D 0; > uint32_t op_flags =3D 0; > char *err =3D NULL; >=20 >=20 > - struct rte_bbdev_op_turbo_enc *turbo_enc =3D &vector->turbo_enc; > + struct rte_bbdev_op_turbo_enc *turbo_enc =3D &dpdk_vector- > >turbo_enc; >=20 > if (starts_with(key_token, op_data_prefixes[DATA_INPUT])) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_INPUT, > op_data_prefixes[DATA_INPUT]); > else if (starts_with(key_token, "output")) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_HARD_OUTPUT, "output"); > else if (!strcmp(key_token, "e")) { > - vector->mask |=3D TEST_BBDEV_VF_E; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_E; > turbo_enc->cb_params.e =3D (uint32_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "ea")) { > - vector->mask |=3D TEST_BBDEV_VF_EA; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EA; > turbo_enc->tb_params.ea =3D (uint32_t) strtoul(token, &err, > 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "eb")) { > - vector->mask |=3D TEST_BBDEV_VF_EB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EB; > turbo_enc->tb_params.eb =3D (uint32_t) strtoul(token, &err, > 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "k")) { > - vector->mask |=3D TEST_BBDEV_VF_K; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_K; > turbo_enc->cb_params.k =3D (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "k_neg")) { > - vector->mask |=3D TEST_BBDEV_VF_K_NEG; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_K_NEG; > turbo_enc->tb_params.k_neg =3D (uint16_t) strtoul(token, > &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "k_pos")) { > - vector->mask |=3D TEST_BBDEV_VF_K_POS; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_K_POS; > turbo_enc->tb_params.k_pos =3D (uint16_t) strtoul(token, > &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "c_neg")) { > - vector->mask |=3D TEST_BBDEV_VF_C_NEG; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_C_NEG; > turbo_enc->tb_params.c_neg =3D (uint8_t) strtoul(token, &err, > 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "c")) { > - vector->mask |=3D TEST_BBDEV_VF_C; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_C; > turbo_enc->tb_params.c =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "cab")) { > - vector->mask |=3D TEST_BBDEV_VF_CAB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_CAB; > turbo_enc->tb_params.cab =3D (uint8_t) strtoul(token, &err, > 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "rv_index")) { > - vector->mask |=3D TEST_BBDEV_VF_RV_INDEX; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_RV_INDEX; > turbo_enc->rv_index =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "ncb")) { > - vector->mask |=3D TEST_BBDEV_VF_NCB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_NCB; > turbo_enc->cb_params.ncb =3D (uint16_t) strtoul(token, &err, > 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "ncb_neg")) { > - vector->mask |=3D TEST_BBDEV_VF_NCB_NEG; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_NCB_NEG; > turbo_enc->tb_params.ncb_neg =3D > (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "ncb_pos")) { > - vector->mask |=3D TEST_BBDEV_VF_NCB_POS; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_NCB_POS; > turbo_enc->tb_params.ncb_pos =3D > (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "r")) { > - vector->mask |=3D TEST_BBDEV_VF_R; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_R; > turbo_enc->tb_params.r =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "code_block_mode")) { > - vector->mask |=3D TEST_BBDEV_VF_CODE_BLOCK_MODE; > + dpdk_vector->mask |=3D > TEST_BBDEV_VF_CODE_BLOCK_MODE; > turbo_enc->code_block_mode =3D (uint8_t) strtoul(token, > &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "op_flags")) { > - vector->mask |=3D TEST_BBDEV_VF_OP_FLAGS; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_OP_FLAGS; > ret =3D parse_turbo_flags(token, &op_flags, > - vector->op_type); > + dpdk_vector->op_type); > if (!ret) > turbo_enc->op_flags =3D op_flags; > } else if (!strcmp(key_token, "expected_status")) { > - vector->mask |=3D TEST_BBDEV_VF_EXPECTED_STATUS; > - ret =3D parse_expected_status(token, &status, vector- > >op_type); > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EXPECTED_STATUS; > + ret =3D parse_expected_status(token, &status, dpdk_vector- > >op_type); > if (!ret) > - vector->expected_status =3D status; > + dpdk_vector->expected_status =3D status; > } else { > printf("Not valid enc key: '%s'\n", key_token); > return -1; > @@ -654,84 +654,84 @@ parse_encoder_params(const char *key_token, > char *token, > /* parses LDPC encoder parameters and assigns to global variable */ > static int > parse_ldpc_encoder_params(const char *key_token, char *token, > - struct test_bbdev_vector *vector) > + struct test_bbdev_vector *dpdk_vector) > { > int ret =3D 0, status =3D 0; > uint32_t op_flags =3D 0; > char *err =3D NULL; >=20 > - struct rte_bbdev_op_ldpc_enc *ldpc_enc =3D &vector->ldpc_enc; > + struct rte_bbdev_op_ldpc_enc *ldpc_enc =3D &dpdk_vector- > >ldpc_enc; >=20 > if (starts_with(key_token, op_data_prefixes[DATA_INPUT])) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_INPUT, > op_data_prefixes[DATA_INPUT]); > else if (starts_with(key_token, "output")) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_HARD_OUTPUT, > "output"); > else if (!strcmp(key_token, "e")) { > - vector->mask |=3D TEST_BBDEV_VF_E; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_E; > ldpc_enc->cb_params.e =3D (uint32_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "ea")) { > - vector->mask |=3D TEST_BBDEV_VF_EA; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EA; > ldpc_enc->tb_params.ea =3D (uint32_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "eb")) { > - vector->mask |=3D TEST_BBDEV_VF_EB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EB; > ldpc_enc->tb_params.eb =3D (uint32_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "c")) { > - vector->mask |=3D TEST_BBDEV_VF_C; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_C; > ldpc_enc->tb_params.c =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "cab")) { > - vector->mask |=3D TEST_BBDEV_VF_CAB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_CAB; > ldpc_enc->tb_params.cab =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "rv_index")) { > - vector->mask |=3D TEST_BBDEV_VF_RV_INDEX; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_RV_INDEX; > ldpc_enc->rv_index =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "n_cb")) { > - vector->mask |=3D TEST_BBDEV_VF_NCB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_NCB; > ldpc_enc->n_cb =3D (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "r")) { > - vector->mask |=3D TEST_BBDEV_VF_R; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_R; > ldpc_enc->tb_params.r =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "q_m")) { > - vector->mask |=3D TEST_BBDEV_VF_QM; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_QM; > ldpc_enc->q_m =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "basegraph")) { > - vector->mask |=3D TEST_BBDEV_VF_BG; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_BG; > ldpc_enc->basegraph =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "z_c")) { > - vector->mask |=3D TEST_BBDEV_VF_ZC; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_ZC; > ldpc_enc->z_c =3D (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "n_filler")) { > - vector->mask |=3D TEST_BBDEV_VF_F; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_F; > ldpc_enc->n_filler =3D (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "code_block_mode")) { > - vector->mask |=3D TEST_BBDEV_VF_CODE_BLOCK_MODE; > + dpdk_vector->mask |=3D > TEST_BBDEV_VF_CODE_BLOCK_MODE; > ldpc_enc->code_block_mode =3D (uint8_t) strtoul(token, &err, > 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "op_flags")) { > - vector->mask |=3D TEST_BBDEV_VF_OP_FLAGS; > - ret =3D parse_turbo_flags(token, &op_flags, vector->op_type); > + dpdk_vector->mask |=3D TEST_BBDEV_VF_OP_FLAGS; > + ret =3D parse_turbo_flags(token, &op_flags, dpdk_vector- > >op_type); > if (!ret) > ldpc_enc->op_flags =3D op_flags; > } else if (!strcmp(key_token, "expected_status")) { > - vector->mask |=3D TEST_BBDEV_VF_EXPECTED_STATUS; > - ret =3D parse_expected_status(token, &status, vector- > >op_type); > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EXPECTED_STATUS; > + ret =3D parse_expected_status(token, &status, dpdk_vector- > >op_type); > if (!ret) > - vector->expected_status =3D status; > + dpdk_vector->expected_status =3D status; > } else { > printf("Not valid ldpc enc key: '%s'\n", key_token); > return -1; > @@ -748,100 +748,100 @@ parse_ldpc_encoder_params(const char > *key_token, char *token, > /* parses LDPC decoder parameters and assigns to global variable */ > static int > parse_ldpc_decoder_params(const char *key_token, char *token, > - struct test_bbdev_vector *vector) > + struct test_bbdev_vector *dpdk_vector) > { > int ret =3D 0, status =3D 0; > uint32_t op_flags =3D 0; > char *err =3D NULL; >=20 > - struct rte_bbdev_op_ldpc_dec *ldpc_dec =3D &vector->ldpc_dec; > + struct rte_bbdev_op_ldpc_dec *ldpc_dec =3D &dpdk_vector- > >ldpc_dec; >=20 > if (starts_with(key_token, op_data_prefixes[DATA_INPUT])) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_INPUT, > op_data_prefixes[DATA_INPUT]); > else if (starts_with(key_token, "output")) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_HARD_OUTPUT, > "output"); > else if (starts_with(key_token, > op_data_prefixes[DATA_HARQ_INPUT])) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_HARQ_INPUT, > op_data_prefixes[DATA_HARQ_INPUT]); > else if (starts_with(key_token, > op_data_prefixes[DATA_HARQ_OUTPUT])) > - ret =3D parse_data_entry(key_token, token, vector, > + ret =3D parse_data_entry(key_token, token, dpdk_vector, > DATA_HARQ_OUTPUT, > op_data_prefixes[DATA_HARQ_OUTPUT]); > else if (!strcmp(key_token, "e")) { > - vector->mask |=3D TEST_BBDEV_VF_E; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_E; > ldpc_dec->cb_params.e =3D (uint32_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "ea")) { > - vector->mask |=3D TEST_BBDEV_VF_EA; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EA; > ldpc_dec->tb_params.ea =3D (uint32_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "eb")) { > - vector->mask |=3D TEST_BBDEV_VF_EB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EB; > ldpc_dec->tb_params.eb =3D (uint32_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "c")) { > - vector->mask |=3D TEST_BBDEV_VF_C; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_C; > ldpc_dec->tb_params.c =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "cab")) { > - vector->mask |=3D TEST_BBDEV_VF_CAB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_CAB; > ldpc_dec->tb_params.cab =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "rv_index")) { > - vector->mask |=3D TEST_BBDEV_VF_RV_INDEX; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_RV_INDEX; > ldpc_dec->rv_index =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "n_cb")) { > - vector->mask |=3D TEST_BBDEV_VF_NCB; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_NCB; > ldpc_dec->n_cb =3D (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "r")) { > - vector->mask |=3D TEST_BBDEV_VF_R; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_R; > ldpc_dec->tb_params.r =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "q_m")) { > - vector->mask |=3D TEST_BBDEV_VF_QM; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_QM; > ldpc_dec->q_m =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "basegraph")) { > - vector->mask |=3D TEST_BBDEV_VF_BG; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_BG; > ldpc_dec->basegraph =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "z_c")) { > - vector->mask |=3D TEST_BBDEV_VF_ZC; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_ZC; > ldpc_dec->z_c =3D (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "n_filler")) { > - vector->mask |=3D TEST_BBDEV_VF_F; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_F; > ldpc_dec->n_filler =3D (uint16_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "expected_iter_count")) { > - vector->mask |=3D TEST_BBDEV_VF_EXPECTED_ITER_COUNT; > + dpdk_vector->mask |=3D > TEST_BBDEV_VF_EXPECTED_ITER_COUNT; > ldpc_dec->iter_count =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "iter_max")) { > - vector->mask |=3D TEST_BBDEV_VF_ITER_MAX; > + dpdk_vector->mask |=3D TEST_BBDEV_VF_ITER_MAX; > ldpc_dec->iter_max =3D (uint8_t) strtoul(token, &err, 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "code_block_mode")) { > - vector->mask |=3D TEST_BBDEV_VF_CODE_BLOCK_MODE; > + dpdk_vector->mask |=3D > TEST_BBDEV_VF_CODE_BLOCK_MODE; > ldpc_dec->code_block_mode =3D (uint8_t) strtoul(token, &err, > 0); > ret =3D ((err =3D=3D NULL) || (*err !=3D '\0')) ? -1 : 0; > } else if (!strcmp(key_token, "op_flags")) { > - vector->mask |=3D TEST_BBDEV_VF_OP_FLAGS; > - ret =3D parse_turbo_flags(token, &op_flags, vector->op_type); > + dpdk_vector->mask |=3D TEST_BBDEV_VF_OP_FLAGS; > + ret =3D parse_turbo_flags(token, &op_flags, dpdk_vector- > >op_type); > if (!ret) > ldpc_dec->op_flags =3D op_flags; > } else if (!strcmp(key_token, "expected_status")) { > - vector->mask |=3D TEST_BBDEV_VF_EXPECTED_STATUS; > - ret =3D parse_expected_status(token, &status, vector- > >op_type); > + dpdk_vector->mask |=3D TEST_BBDEV_VF_EXPECTED_STATUS; > + ret =3D parse_expected_status(token, &status, dpdk_vector- > >op_type); > if (!ret) > - vector->expected_status =3D status; > + dpdk_vector->expected_status =3D status; > } else { > printf("Not valid ldpc dec key: '%s'\n", key_token); > return -1; > @@ -857,7 +857,7 @@ parse_ldpc_decoder_params(const char *key_token, > char *token, >=20 > /* checks the type of key and assigns data */ > static int > -parse_entry(char *entry, struct test_bbdev_vector *vector) > +parse_entry(char *entry, struct test_bbdev_vector *dpdk_vector) > { > int ret =3D 0; > char *token, *key_token; > @@ -881,11 +881,11 @@ parse_entry(char *entry, struct test_bbdev_vector > *vector) > trim_space(key_token); >=20 > /* first key_token has to specify type of operation */ > - if (vector->op_type =3D=3D RTE_BBDEV_OP_NONE) { > + if (dpdk_vector->op_type =3D=3D RTE_BBDEV_OP_NONE) { > if (!strcmp(key_token, "op_type")) { > ret =3D op_turbo_type_strtol(token, &op_type); > if (!ret) > - vector->op_type =3D op_type; > + dpdk_vector->op_type =3D op_type; > return (!ret) ? 0 : -1; > } > printf("First key_token (%s) does not specify op_type\n", > @@ -894,17 +894,17 @@ parse_entry(char *entry, struct test_bbdev_vector > *vector) > } >=20 > /* compare keys */ > - if (vector->op_type =3D=3D RTE_BBDEV_OP_TURBO_DEC) { > - if (parse_decoder_params(key_token, token, vector) =3D=3D -1) > + if (dpdk_vector->op_type =3D=3D RTE_BBDEV_OP_TURBO_DEC) { > + if (parse_decoder_params(key_token, token, dpdk_vector) > =3D=3D -1) > return -1; > - } else if (vector->op_type =3D=3D RTE_BBDEV_OP_TURBO_ENC) { > - if (parse_encoder_params(key_token, token, vector) =3D=3D -1) > + } else if (dpdk_vector->op_type =3D=3D RTE_BBDEV_OP_TURBO_ENC) { > + if (parse_encoder_params(key_token, token, dpdk_vector) > =3D=3D -1) > return -1; > - } else if (vector->op_type =3D=3D RTE_BBDEV_OP_LDPC_ENC) { > - if (parse_ldpc_encoder_params(key_token, token, vector) =3D=3D > -1) > + } else if (dpdk_vector->op_type =3D=3D RTE_BBDEV_OP_LDPC_ENC) { > + if (parse_ldpc_encoder_params(key_token, token, > dpdk_vector) =3D=3D -1) > return -1; > - } else if (vector->op_type =3D=3D RTE_BBDEV_OP_LDPC_DEC) { > - if (parse_ldpc_decoder_params(key_token, token, vector) =3D=3D > -1) > + } else if (dpdk_vector->op_type =3D=3D RTE_BBDEV_OP_LDPC_DEC) { > + if (parse_ldpc_decoder_params(key_token, token, > dpdk_vector) =3D=3D -1) > return -1; > } >=20 > @@ -912,75 +912,75 @@ parse_entry(char *entry, struct test_bbdev_vector > *vector) > } >=20 > static int > -check_decoder_segments(struct test_bbdev_vector *vector) > +check_decoder_segments(struct test_bbdev_vector *dpdk_vector) > { > unsigned char i; > - struct rte_bbdev_op_turbo_dec *turbo_dec =3D &vector->turbo_dec; > + struct rte_bbdev_op_turbo_dec *turbo_dec =3D &dpdk_vector- > >turbo_dec; >=20 > - if (vector->entries[DATA_INPUT].nb_segments =3D=3D 0) > + if (dpdk_vector->entries[DATA_INPUT].nb_segments =3D=3D 0) > return -1; >=20 > - for (i =3D 0; i < vector->entries[DATA_INPUT].nb_segments; i++) > - if (vector->entries[DATA_INPUT].segments[i].addr =3D=3D NULL) > + for (i =3D 0; i < dpdk_vector->entries[DATA_INPUT].nb_segments; i++) > + if (dpdk_vector->entries[DATA_INPUT].segments[i].addr =3D=3D > NULL) > return -1; >=20 > - if (vector->entries[DATA_HARD_OUTPUT].nb_segments =3D=3D 0) > + if (dpdk_vector->entries[DATA_HARD_OUTPUT].nb_segments =3D=3D 0) > return -1; >=20 > - for (i =3D 0; i < vector->entries[DATA_HARD_OUTPUT].nb_segments; > + for (i =3D 0; i < dpdk_vector- > >entries[DATA_HARD_OUTPUT].nb_segments; > i++) > - if (vector->entries[DATA_HARD_OUTPUT].segments[i].addr > =3D=3D NULL) > + if (dpdk_vector- > >entries[DATA_HARD_OUTPUT].segments[i].addr =3D=3D NULL) > return -1; >=20 > if ((turbo_dec->op_flags & RTE_BBDEV_TURBO_SOFT_OUTPUT) && > - (vector->entries[DATA_SOFT_OUTPUT].nb_segments > =3D=3D 0)) > + (dpdk_vector- > >entries[DATA_SOFT_OUTPUT].nb_segments =3D=3D 0)) > return -1; >=20 > - for (i =3D 0; i < vector->entries[DATA_SOFT_OUTPUT].nb_segments; > + for (i =3D 0; i < dpdk_vector- > >entries[DATA_SOFT_OUTPUT].nb_segments; > i++) > - if (vector->entries[DATA_SOFT_OUTPUT].segments[i].addr =3D=3D > NULL) > + if (dpdk_vector- > >entries[DATA_SOFT_OUTPUT].segments[i].addr =3D=3D NULL) > return -1; >=20 > return 0; > } >=20 > static int > -check_ldpc_decoder_segments(struct test_bbdev_vector *vector) > +check_ldpc_decoder_segments(struct test_bbdev_vector *dpdk_vector) > { > unsigned char i; > - struct rte_bbdev_op_ldpc_dec *ldpc_dec =3D &vector->ldpc_dec; > + struct rte_bbdev_op_ldpc_dec *ldpc_dec =3D &dpdk_vector- > >ldpc_dec; >=20 > - for (i =3D 0; i < vector->entries[DATA_INPUT].nb_segments; i++) > - if (vector->entries[DATA_INPUT].segments[i].addr =3D=3D NULL) > + for (i =3D 0; i < dpdk_vector->entries[DATA_INPUT].nb_segments; i++) > + if (dpdk_vector->entries[DATA_INPUT].segments[i].addr =3D=3D > NULL) > return -1; >=20 > - for (i =3D 0; i < vector->entries[DATA_HARD_OUTPUT].nb_segments; > i++) > - if (vector->entries[DATA_HARD_OUTPUT].segments[i].addr > =3D=3D NULL) > + for (i =3D 0; i < dpdk_vector- > >entries[DATA_HARD_OUTPUT].nb_segments; i++) > + if (dpdk_vector- > >entries[DATA_HARD_OUTPUT].segments[i].addr =3D=3D NULL) > return -1; >=20 > if ((ldpc_dec->op_flags & RTE_BBDEV_LDPC_SOFT_OUT_ENABLE) && > - (vector->entries[DATA_SOFT_OUTPUT].nb_segments > =3D=3D 0)) > + (dpdk_vector- > >entries[DATA_SOFT_OUTPUT].nb_segments =3D=3D 0)) > return -1; >=20 > - for (i =3D 0; i < vector->entries[DATA_SOFT_OUTPUT].nb_segments; > i++) > - if (vector->entries[DATA_SOFT_OUTPUT].segments[i].addr =3D=3D > NULL) > + for (i =3D 0; i < dpdk_vector- > >entries[DATA_SOFT_OUTPUT].nb_segments; i++) > + if (dpdk_vector- > >entries[DATA_SOFT_OUTPUT].segments[i].addr =3D=3D NULL) > return -1; >=20 > if ((ldpc_dec->op_flags & > RTE_BBDEV_LDPC_HQ_COMBINE_OUT_ENABLE) && > - (vector- > >entries[DATA_HARQ_OUTPUT].nb_segments =3D=3D 0)) > + (dpdk_vector- > >entries[DATA_HARQ_OUTPUT].nb_segments =3D=3D 0)) > return -1; >=20 > - for (i =3D 0; i < vector->entries[DATA_HARQ_OUTPUT].nb_segments; > i++) > - if (vector->entries[DATA_HARQ_OUTPUT].segments[i].addr > =3D=3D NULL) > + for (i =3D 0; i < dpdk_vector- > >entries[DATA_HARQ_OUTPUT].nb_segments; i++) > + if (dpdk_vector- > >entries[DATA_HARQ_OUTPUT].segments[i].addr =3D=3D NULL) > return -1; >=20 > return 0; > } >=20 > static int > -check_decoder_llr_spec(struct test_bbdev_vector *vector) > +check_decoder_llr_spec(struct test_bbdev_vector *dpdk_vector) > { > - struct rte_bbdev_op_turbo_dec *turbo_dec =3D &vector->turbo_dec; > + struct rte_bbdev_op_turbo_dec *turbo_dec =3D &dpdk_vector- > >turbo_dec; >=20 > /* Check input LLR sign formalism specification */ > if ((turbo_dec->op_flags & RTE_BBDEV_TURBO_POS_LLR_1_BIT_IN) > && > @@ -1022,9 +1022,9 @@ check_decoder_llr_spec(struct test_bbdev_vector > *vector) > } >=20 > static int > -check_decoder_op_flags(struct test_bbdev_vector *vector) > +check_decoder_op_flags(struct test_bbdev_vector *dpdk_vector) > { > - struct rte_bbdev_op_turbo_dec *turbo_dec =3D &vector->turbo_dec; > + struct rte_bbdev_op_turbo_dec *turbo_dec =3D &dpdk_vector- > >turbo_dec; >=20 > if ((turbo_dec->op_flags & > RTE_BBDEV_TURBO_DEC_TB_CRC_24B_KEEP) && > !(turbo_dec->op_flags & > RTE_BBDEV_TURBO_CRC_TYPE_24B)) { > @@ -1038,18 +1038,18 @@ check_decoder_op_flags(struct > test_bbdev_vector *vector) >=20 > /* checks decoder parameters */ > static int > -check_decoder(struct test_bbdev_vector *vector) > +check_decoder(struct test_bbdev_vector *dpdk_vector) > { > - struct rte_bbdev_op_turbo_dec *turbo_dec =3D &vector->turbo_dec; > - const int mask =3D vector->mask; > + struct rte_bbdev_op_turbo_dec *turbo_dec =3D &dpdk_vector- > >turbo_dec; > + const int mask =3D dpdk_vector->mask; >=20 > - if (check_decoder_segments(vector) < 0) > + if (check_decoder_segments(dpdk_vector) < 0) > return -1; >=20 > - if (check_decoder_llr_spec(vector) < 0) > + if (check_decoder_llr_spec(dpdk_vector) < 0) > return -1; >=20 > - if (check_decoder_op_flags(vector) < 0) > + if (check_decoder_op_flags(dpdk_vector) < 0) > return -1; >=20 > /* Check which params were set */ > @@ -1126,19 +1126,19 @@ check_decoder(struct test_bbdev_vector > *vector) >=20 > /* checks LDPC decoder parameters */ > static int > -check_ldpc_decoder(struct test_bbdev_vector *vector) > +check_ldpc_decoder(struct test_bbdev_vector *dpdk_vector) > { > - struct rte_bbdev_op_ldpc_dec *ldpc_dec =3D &vector->ldpc_dec; > - const int mask =3D vector->mask; > + struct rte_bbdev_op_ldpc_dec *ldpc_dec =3D &dpdk_vector- > >ldpc_dec; > + const int mask =3D dpdk_vector->mask; >=20 > - if (check_ldpc_decoder_segments(vector) < 0) > + if (check_ldpc_decoder_segments(dpdk_vector) < 0) > return -1; >=20 > /* > - * if (check_ldpc_decoder_llr_spec(vector) < 0) > + * if (check_ldpc_decoder_llr_spec(dpdk_vector) < 0) > * return -1; > * > - * if (check_ldpc_decoder_op_flags(vector) < 0) > + * if (check_ldpc_decoder_op_flags(dpdk_vector) < 0) > * return -1; > */ >=20 > @@ -1237,9 +1237,9 @@ check_encoder(struct test_bbdev_vector *vector) > if (!(mask & TEST_BBDEV_VF_C)) { > printf( > "WARNING: c was not specified in vector file > and will be set to 1\n"); > - vector->turbo_enc.tb_params.c =3D 1; > + dpdk_vector->turbo_enc.tb_params.c =3D 1; > } > - if (!(mask & TEST_BBDEV_VF_CAB) && (vector- > >turbo_enc.op_flags & > + if (!(mask & TEST_BBDEV_VF_CAB) && (dpdk_vector- > >turbo_enc.op_flags & > RTE_BBDEV_TURBO_RATE_MATCH)) > printf( > "WARNING: cab was not specified in vector > file and will be set to 0\n"); > @@ -1253,7 +1253,7 @@ check_encoder(struct test_bbdev_vector *vector) > printf( > "WARNING: r was not specified in vector file > and will be set to 0\n"); > } else { > - if (!(mask & TEST_BBDEV_VF_E) && (vector- > >turbo_enc.op_flags & > + if (!(mask & TEST_BBDEV_VF_E) && (dpdk_vector- > >turbo_enc.op_flags & > RTE_BBDEV_TURBO_RATE_MATCH)) > printf( > "WARNING: e was not specified in vector file > and will be set to 0\n"); > @@ -1334,21 +1334,21 @@ check_ldpc_encoder(struct test_bbdev_vector > *vector) > } >=20 > static int > -bbdev_check_vector(struct test_bbdev_vector *vector) > +bbdev_check_vector(struct test_bbdev_vector *dpdk_vector) > { > - if (vector->op_type =3D=3D RTE_BBDEV_OP_TURBO_DEC) { > - if (check_decoder(vector) =3D=3D -1) > + if (dpdk_vector->op_type =3D=3D RTE_BBDEV_OP_TURBO_DEC) { > + if (check_decoder(dpdk_vector) =3D=3D -1) > return -1; > - } else if (vector->op_type =3D=3D RTE_BBDEV_OP_TURBO_ENC) { > - if (check_encoder(vector) =3D=3D -1) > + } else if (dpdk_vector->op_type =3D=3D RTE_BBDEV_OP_TURBO_ENC) { > + if (check_encoder(dpdk_vector) =3D=3D -1) > return -1; > - } else if (vector->op_type =3D=3D RTE_BBDEV_OP_LDPC_ENC) { > - if (check_ldpc_encoder(vector) =3D=3D -1) > + } else if (dpdk_vector->op_type =3D=3D RTE_BBDEV_OP_LDPC_ENC) { > + if (check_ldpc_encoder(dpdk_vector) =3D=3D -1) > return -1; > - } else if (vector->op_type =3D=3D RTE_BBDEV_OP_LDPC_DEC) { > - if (check_ldpc_decoder(vector) =3D=3D -1) > + } else if (dpdk_vector->op_type =3D=3D RTE_BBDEV_OP_LDPC_DEC) { > + if (check_ldpc_decoder(dpdk_vector) =3D=3D -1) > return -1; > - } else if (vector->op_type !=3D RTE_BBDEV_OP_NONE) { > + } else if (dpdk_vector->op_type !=3D RTE_BBDEV_OP_NONE) { > printf("Vector was not filled\n"); > return -1; > } > @@ -1358,7 +1358,7 @@ bbdev_check_vector(struct test_bbdev_vector > *vector) >=20 > int > test_bbdev_vector_read(const char *filename, > - struct test_bbdev_vector *vector) > + struct test_bbdev_vector *dpdk_vector) > { > int ret =3D 0; > size_t len =3D 0; > @@ -1419,13 +1419,13 @@ test_bbdev_vector_read(const char *filename, > break; > } > } > - ret =3D parse_entry(entry, vector); > + ret =3D parse_entry(entry, dpdk_vector); > if (ret !=3D 0) { > printf("An error occurred while parsing!\n"); > goto exit; > } > } > - ret =3D bbdev_check_vector(vector); > + ret =3D bbdev_check_vector(dpdk_vector); > if (ret !=3D 0) > printf("An error occurred while checking!\n"); >=20 > diff --git a/app/test-bbdev/test_bbdev_vector.h b/app/test- > bbdev/test_bbdev_vector.h > index 4e5dbf5d50..2607826964 100644 > --- a/app/test-bbdev/test_bbdev_vector.h > +++ b/app/test-bbdev/test_bbdev_vector.h > @@ -73,7 +73,7 @@ struct test_bbdev_vector { > /* fills test vector parameters based on test file */ > int > test_bbdev_vector_read(const char *filename, > - struct test_bbdev_vector *vector); > + struct test_bbdev_vector *dpdk_vector); >=20 >=20 > #endif /* TEST_BBDEV_VECTOR_H_ */ > diff --git a/app/test-crypto-perf/cperf_test_vector_parsing.c b/app/test- > crypto-perf/cperf_test_vector_parsing.c > index 1e9dfcfff0..65fabb5d3f 100644 > --- a/app/test-crypto-perf/cperf_test_vector_parsing.c > +++ b/app/test-crypto-perf/cperf_test_vector_parsing.c > @@ -13,24 +13,24 @@ > #include "cperf_test_vector_parsing.h" >=20 > int > -free_test_vector(struct cperf_test_vector *vector, struct cperf_options > *opts) > +free_test_vector(struct cperf_test_vector *dpdk_vector, struct > cperf_options *opts) > { > - if (vector =3D=3D NULL || opts =3D=3D NULL) > + if (dpdk_vector =3D=3D NULL || opts =3D=3D NULL) > return -1; >=20 > - rte_free(vector->cipher_iv.data); > - rte_free(vector->auth_iv.data); > - rte_free(vector->aad.data); > - rte_free(vector->digest.data); > + rte_free(dpdk_vector->cipher_iv.data); > + rte_free(dpdk_vector->auth_iv.data); > + rte_free(dpdk_vector->aad.data); > + rte_free(dpdk_vector->digest.data); >=20 > if (opts->test_file !=3D NULL) { > - rte_free(vector->plaintext.data); > - rte_free(vector->cipher_key.data); > - rte_free(vector->auth_key.data); > - rte_free(vector->ciphertext.data); > + rte_free(dpdk_vector->plaintext.data); > + rte_free(dpdk_vector->cipher_key.data); > + rte_free(dpdk_vector->auth_key.data); > + rte_free(dpdk_vector->ciphertext.data); > } >=20 > - rte_free(vector); > + rte_free(dpdk_vector); >=20 > return 0; > } > @@ -272,7 +272,7 @@ parse_values(char *tokens, uint8_t **data, uint32_t > *data_length) >=20 > /* checks the type of key and assigns data */ > static int > -parse_entry(char *entry, struct cperf_test_vector *vector, > +parse_entry(char *entry, struct cperf_test_vector *dpdk_vector, > struct cperf_options *opts, uint8_t tc_found) > { > int status; > @@ -303,146 +303,146 @@ parse_entry(char *entry, struct > cperf_test_vector *vector, >=20 > /* compare keys */ > if (strstr(key_token, "plaintext")) { > - rte_free(vector->plaintext.data); > - vector->plaintext.data =3D data; > + rte_free(dpdk_vector->plaintext.data); > + dpdk_vector->plaintext.data =3D data; > if (tc_found) > - vector->plaintext.length =3D data_length; > + dpdk_vector->plaintext.length =3D data_length; > else { > if (opts->max_buffer_size > data_length) { > printf("Global plaintext shorter than " > "buffer_sz\n"); > return -1; > } > - vector->plaintext.length =3D opts->max_buffer_size; > + dpdk_vector->plaintext.length =3D opts- > >max_buffer_size; > } >=20 > } else if (strstr(key_token, "cipher_key")) { > - rte_free(vector->cipher_key.data); > - vector->cipher_key.data =3D data; > + rte_free(dpdk_vector->cipher_key.data); > + dpdk_vector->cipher_key.data =3D data; > if (tc_found) > - vector->cipher_key.length =3D data_length; > + dpdk_vector->cipher_key.length =3D data_length; > else { > if (opts->cipher_key_sz > data_length) { > printf("Global cipher_key shorter than " > "cipher_key_sz\n"); > return -1; > } > - vector->cipher_key.length =3D opts->cipher_key_sz; > + dpdk_vector->cipher_key.length =3D opts- > >cipher_key_sz; > } >=20 > } else if (strstr(key_token, "auth_key")) { > - rte_free(vector->auth_key.data); > - vector->auth_key.data =3D data; > + rte_free(dpdk_vector->auth_key.data); > + dpdk_vector->auth_key.data =3D data; > if (tc_found) > - vector->auth_key.length =3D data_length; > + dpdk_vector->auth_key.length =3D data_length; > else { > if (opts->auth_key_sz > data_length) { > printf("Global auth_key shorter than " > "auth_key_sz\n"); > return -1; > } > - vector->auth_key.length =3D opts->auth_key_sz; > + dpdk_vector->auth_key.length =3D opts->auth_key_sz; > } >=20 > } else if (strstr(key_token, "aead_key")) { > - rte_free(vector->aead_key.data); > - vector->aead_key.data =3D data; > + rte_free(dpdk_vector->aead_key.data); > + dpdk_vector->aead_key.data =3D data; > if (tc_found) > - vector->aead_key.length =3D data_length; > + dpdk_vector->aead_key.length =3D data_length; > else { > if (opts->aead_key_sz > data_length) { > printf("Global aead_key shorter than " > "aead_key_sz\n"); > return -1; > } > - vector->aead_key.length =3D opts->aead_key_sz; > + dpdk_vector->aead_key.length =3D opts->aead_key_sz; > } >=20 > } else if (strstr(key_token, "cipher_iv")) { > - rte_free(vector->cipher_iv.data); > - vector->cipher_iv.data =3D data; > + rte_free(dpdk_vector->cipher_iv.data); > + dpdk_vector->cipher_iv.data =3D data; > if (tc_found) > - vector->cipher_iv.length =3D data_length; > + dpdk_vector->cipher_iv.length =3D data_length; > else { > if (opts->cipher_iv_sz > data_length) { > printf("Global cipher iv shorter than " > "cipher_iv_sz\n"); > return -1; > } > - vector->cipher_iv.length =3D opts->cipher_iv_sz; > + dpdk_vector->cipher_iv.length =3D opts->cipher_iv_sz; > } >=20 > } else if (strstr(key_token, "auth_iv")) { > - rte_free(vector->auth_iv.data); > - vector->auth_iv.data =3D data; > + rte_free(dpdk_vector->auth_iv.data); > + dpdk_vector->auth_iv.data =3D data; > if (tc_found) > - vector->auth_iv.length =3D data_length; > + dpdk_vector->auth_iv.length =3D data_length; > else { > if (opts->auth_iv_sz > data_length) { > printf("Global auth iv shorter than " > "auth_iv_sz\n"); > return -1; > } > - vector->auth_iv.length =3D opts->auth_iv_sz; > + dpdk_vector->auth_iv.length =3D opts->auth_iv_sz; > } >=20 > } else if (strstr(key_token, "aead_iv")) { > - rte_free(vector->aead_iv.data); > - vector->aead_iv.data =3D data; > + rte_free(dpdk_vector->aead_iv.data); > + dpdk_vector->aead_iv.data =3D data; > if (tc_found) > - vector->aead_iv.length =3D data_length; > + dpdk_vector->aead_iv.length =3D data_length; > else { > if (opts->aead_iv_sz > data_length) { > printf("Global aead iv shorter than " > "aead_iv_sz\n"); > return -1; > } > - vector->aead_iv.length =3D opts->aead_iv_sz; > + dpdk_vector->aead_iv.length =3D opts->aead_iv_sz; > } >=20 > } else if (strstr(key_token, "ciphertext")) { > - rte_free(vector->ciphertext.data); > - vector->ciphertext.data =3D data; > + rte_free(dpdk_vector->ciphertext.data); > + dpdk_vector->ciphertext.data =3D data; > if (tc_found) > - vector->ciphertext.length =3D data_length; > + dpdk_vector->ciphertext.length =3D data_length; > else { > if (opts->max_buffer_size > data_length) { > printf("Global ciphertext shorter than " > "buffer_sz\n"); > return -1; > } > - vector->ciphertext.length =3D opts->max_buffer_size; > + dpdk_vector->ciphertext.length =3D opts- > >max_buffer_size; > } >=20 > } else if (strstr(key_token, "aad")) { > - rte_free(vector->aad.data); > - vector->aad.data =3D data; > - vector->aad.phys_addr =3D rte_malloc_virt2iova(vector- > >aad.data); > + rte_free(dpdk_vector->aad.data); > + dpdk_vector->aad.data =3D data; > + dpdk_vector->aad.phys_addr =3D > rte_malloc_virt2iova(dpdk_vector->aad.data); > if (tc_found) > - vector->aad.length =3D data_length; > + dpdk_vector->aad.length =3D data_length; > else { > if (opts->aead_aad_sz > data_length) { > printf("Global aad shorter than " > "aead_aad_sz\n"); > return -1; > } > - vector->aad.length =3D opts->aead_aad_sz; > + dpdk_vector->aad.length =3D opts->aead_aad_sz; > } >=20 > } else if (strstr(key_token, "digest")) { > - rte_free(vector->digest.data); > - vector->digest.data =3D data; > - vector->digest.phys_addr =3D rte_malloc_virt2iova( > - vector->digest.data); > + rte_free(dpdk_vector->digest.data); > + dpdk_vector->digest.data =3D data; > + dpdk_vector->digest.phys_addr =3D rte_malloc_virt2iova( > + dpdk_vector->digest.data); > if (tc_found) > - vector->digest.length =3D data_length; > + dpdk_vector->digest.length =3D data_length; > else { > if (opts->digest_sz > data_length) { > printf("Global digest shorter than " > "digest_sz\n"); > return -1; > } > - vector->digest.length =3D opts->digest_sz; > + dpdk_vector->digest.length =3D opts->digest_sz; > } > } else { > printf("Not valid key: '%s'\n", trim_space(key_token)); > @@ -454,7 +454,7 @@ parse_entry(char *entry, struct cperf_test_vector > *vector, >=20 > /* searches in the file for test keys and values */ > static int > -parse_file(struct cperf_test_vector *vector, struct cperf_options *opts) > +parse_file(struct cperf_test_vector *dpdk_vector, struct cperf_options > *opts) > { > uint8_t tc_found =3D 0; > uint8_t tc_data_start =3D 0; > @@ -530,7 +530,7 @@ parse_file(struct cperf_test_vector *vector, struct > cperf_options *opts) > break; > } > } > - status =3D parse_entry(entry, vector, opts, tc_found); > + status =3D parse_entry(entry, dpdk_vector, opts, tc_found); > if (status) { > printf("An error occurred while parsing!\n"); > goto err; > diff --git a/app/test-crypto-perf/cperf_test_vector_parsing.h b/app/test- > crypto-perf/cperf_test_vector_parsing.h > index 247b142216..9c83537c1c 100644 > --- a/app/test-crypto-perf/cperf_test_vector_parsing.h > +++ b/app/test-crypto-perf/cperf_test_vector_parsing.h > @@ -19,7 +19,7 @@ > * 0 on success, (-1) on error. > */ > int > -free_test_vector(struct cperf_test_vector *vector, struct cperf_options > *opts); > +free_test_vector(struct cperf_test_vector *dpdk_vector, struct > cperf_options *opts); >=20 > /** > * Displays data in test vector > diff --git a/app/test-crypto-perf/cperf_test_verify.c b/app/test-crypto- > perf/cperf_test_verify.c > index 2939aeaa93..6f7f248a2e 100644 > --- a/app/test-crypto-perf/cperf_test_verify.c > +++ b/app/test-crypto-perf/cperf_test_verify.c > @@ -94,7 +94,7 @@ cperf_verify_test_constructor(struct rte_mempool > *sess_mp, > static int > cperf_verify_op(struct rte_crypto_op *op, > const struct cperf_options *options, > - const struct cperf_test_vector *vector) > + const struct cperf_test_vector *dpdk_vector) > { > const struct rte_mbuf *m; > uint32_t len; > @@ -176,18 +176,18 @@ cperf_verify_op(struct rte_crypto_op *op, > if (cipher =3D=3D 1) { > if (options->cipher_op =3D=3D > RTE_CRYPTO_CIPHER_OP_ENCRYPT) > res +=3D memcmp(data + cipher_offset, > - vector->ciphertext.data, > + dpdk_vector->ciphertext.data, > options->test_buffer_size); > else > res +=3D memcmp(data + cipher_offset, > - vector->plaintext.data, > + dpdk_vector->plaintext.data, > options->test_buffer_size); > } >=20 > if (auth =3D=3D 1) { > if (options->auth_op =3D=3D RTE_CRYPTO_AUTH_OP_GENERATE) > res +=3D memcmp(data + auth_offset, > - vector->digest.data, > + dpdk_vector->digest.data, > options->digest_sz); > } >=20 > diff --git a/drivers/net/i40e/i40e_rxtx_vec_altivec.c > b/drivers/net/i40e/i40e_rxtx_vec_altivec.c > index b99323992f..e90bd00827 100644 > --- a/drivers/net/i40e/i40e_rxtx_vec_altivec.c > +++ b/drivers/net/i40e/i40e_rxtx_vec_altivec.c > @@ -27,10 +27,10 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq) > struct i40e_rx_entry *rxep =3D &rxq->sw_ring[rxq->rxrearm_start]; > struct rte_mbuf *mb0, *mb1; >=20 > - vector unsigned long hdr_room =3D (vector unsigned long){ > + vector unsigned int hdr_room =3D (vector unsigned int){ > RTE_PKTMBUF_HEADROOM, > RTE_PKTMBUF_HEADROOM}; > - vector unsigned long dma_addr0, dma_addr1; > + vector unsigned int dma_addr0, dma_addr1; >=20 > rxdp =3D rxq->rx_ring + rxq->rxrearm_start; >=20 > @@ -40,11 +40,11 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq) > RTE_I40E_RXQ_REARM_THRESH) < 0) { > if (rxq->rxrearm_nb + RTE_I40E_RXQ_REARM_THRESH >=3D > rxq->nb_rx_desc) { > - dma_addr0 =3D (vector unsigned long){}; > + dma_addr0 =3D (vector unsigned int){}; > for (i =3D 0; i < RTE_I40E_DESCS_PER_LOOP; i++) { > rxep[i].mbuf =3D &rxq->fake_mbuf; > vec_st(dma_addr0, 0, > - (vector unsigned long *)&rxdp[i].read); > + (vector unsigned int *)&rxdp[i].read); > } > } > rte_eth_devices[rxq->port_id].data->rx_mbuf_alloc_failed +=3D > @@ -54,7 +54,7 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq) >=20 > /* Initialize the mbufs in vector, process 2 mbufs in one loop */ > for (i =3D 0; i < RTE_I40E_RXQ_REARM_THRESH; i +=3D 2, rxep +=3D 2) { > - vector unsigned long vaddr0, vaddr1; > + vector unsigned int vaddr0, vaddr1; > uintptr_t p0, p1; >=20 > mb0 =3D rxep[0].mbuf; > @@ -72,8 +72,8 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq) > *(uint64_t *)p1 =3D rxq->mbuf_initializer; >=20 > /* load buf_addr(lo 64bit) and buf_iova(hi 64bit) */ > - vaddr0 =3D vec_ld(0, (vector unsigned long *)&mb0- > >buf_addr); > - vaddr1 =3D vec_ld(0, (vector unsigned long *)&mb1- > >buf_addr); > + vaddr0 =3D vec_ld(0, (vector unsigned int *)&mb0->buf_addr); > + vaddr1 =3D vec_ld(0, (vector unsigned int *)&mb1->buf_addr); >=20 > /* convert pa to dma_addr hdr/data */ > dma_addr0 =3D vec_mergel(vaddr0, vaddr0); > @@ -84,8 +84,8 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq) > dma_addr1 =3D vec_add(dma_addr1, hdr_room); >=20 > /* flush desc with pa dma_addr */ > - vec_st(dma_addr0, 0, (vector unsigned long *)&rxdp++- > >read); > - vec_st(dma_addr1, 0, (vector unsigned long *)&rxdp++- > >read); > + vec_st(dma_addr0, 0, (vector unsigned int *)&rxdp++->read); > + vec_st(dma_addr1, 0, (vector unsigned int *)&rxdp++->read); > } >=20 > rxq->rxrearm_start +=3D RTE_I40E_RXQ_REARM_THRESH; > @@ -102,7 +102,7 @@ i40e_rxq_rearm(struct i40e_rx_queue *rxq) > } >=20 > static inline void > -desc_to_olflags_v(vector unsigned long descs[4], struct rte_mbuf **rx_pk= ts) > +desc_to_olflags_v(vector unsigned int descs[4], struct rte_mbuf **rx_pkt= s) > { > vector unsigned int vlan0, vlan1, rss, l3_l4e; >=20 > @@ -169,14 +169,14 @@ desc_to_olflags_v(vector unsigned long descs[4], > struct rte_mbuf **rx_pkts) > #define PKTLEN_SHIFT 10 >=20 > static inline void > -desc_to_ptype_v(vector unsigned long descs[4], struct rte_mbuf **rx_pkts= , > +desc_to_ptype_v(vector unsigned int descs[4], struct rte_mbuf **rx_pkts, > uint32_t *ptype_tbl) > { > - vector unsigned long ptype0 =3D vec_mergel(descs[0], descs[1]); > - vector unsigned long ptype1 =3D vec_mergel(descs[2], descs[3]); > + vector unsigned int ptype0 =3D vec_mergel(descs[0], descs[1]); > + vector unsigned int ptype1 =3D vec_mergel(descs[2], descs[3]); >=20 > - ptype0 =3D vec_sr(ptype0, (vector unsigned long){30, 30}); > - ptype1 =3D vec_sr(ptype1, (vector unsigned long){30, 30}); > + ptype0 =3D vec_sr(ptype0, (vector unsigned int){30, 30}); > + ptype1 =3D vec_sr(ptype1, (vector unsigned int){30, 30}); >=20 > rx_pkts[0]->packet_type =3D > ptype_tbl[(*(vector unsigned char *)&ptype0)[0]]; > @@ -214,7 +214,7 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, > struct rte_mbuf **rx_pkts, > rxq->crc_len, /* sub crc on data_len */ > 0, 0, 0 /* ignore non-length fields */ > }; > - vector unsigned long dd_check, eop_check; > + vector unsigned int dd_check, eop_check; >=20 > /* nb_pkts has to be floor-aligned to RTE_I40E_DESCS_PER_LOOP */ > nb_pkts =3D RTE_ALIGN_FLOOR(nb_pkts, RTE_I40E_DESCS_PER_LOOP); > @@ -274,7 +274,7 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, > struct rte_mbuf **rx_pkts, > for (pos =3D 0, nb_pkts_recd =3D 0; pos < nb_pkts; > pos +=3D RTE_I40E_DESCS_PER_LOOP, > rxdp +=3D RTE_I40E_DESCS_PER_LOOP) { > - vector unsigned long descs[RTE_I40E_DESCS_PER_LOOP]; > + vector unsigned int descs[RTE_I40E_DESCS_PER_LOOP]; > vector unsigned char pkt_mb1, pkt_mb2, pkt_mb3, > pkt_mb4; > vector unsigned short staterr, sterr_tmp1, sterr_tmp2; > vector unsigned long mbp1, mbp2; /* two mbuf pointer > @@ -432,7 +432,7 @@ _recv_raw_pkts_vec(struct i40e_rx_queue *rxq, > struct rte_mbuf **rx_pkts, >=20 > /* C.4 calc avaialbe number of desc */ > var =3D __builtin_popcountll((vec_ld(0, > - (vector unsigned long *)&staterr)[0])); > + (vector unsigned int *)&staterr)[0])); > nb_pkts_recd +=3D var; > if (likely(var !=3D RTE_I40E_DESCS_PER_LOOP)) > break; > diff --git a/drivers/net/ixgbe/ixgbe_ethdev.c > b/drivers/net/ixgbe/ixgbe_ethdev.c > index a127dc0d86..f0931928f1 100644 > --- a/drivers/net/ixgbe/ixgbe_ethdev.c > +++ b/drivers/net/ixgbe/ixgbe_ethdev.c > @@ -5618,39 +5618,39 @@ ixgbe_vt_check(struct ixgbe_hw *hw) > static uint32_t > ixgbe_uta_vector(struct ixgbe_hw *hw, struct rte_ether_addr *uc_addr) > { > - uint32_t vector =3D 0; > + uint32_t dpdk_vector =3D 0; >=20 > switch (hw->mac.mc_filter_type) { > case 0: /* use bits [47:36] of the address */ > - vector =3D ((uc_addr->addr_bytes[4] >> 4) | > + dpdk_vector =3D ((uc_addr->addr_bytes[4] >> 4) | > (((uint16_t)uc_addr->addr_bytes[5]) << 4)); > break; > case 1: /* use bits [46:35] of the address */ > - vector =3D ((uc_addr->addr_bytes[4] >> 3) | > + dpdk_vector =3D ((uc_addr->addr_bytes[4] >> 3) | > (((uint16_t)uc_addr->addr_bytes[5]) << 5)); > break; > case 2: /* use bits [45:34] of the address */ > - vector =3D ((uc_addr->addr_bytes[4] >> 2) | > + dpdk_vector =3D ((uc_addr->addr_bytes[4] >> 2) | > (((uint16_t)uc_addr->addr_bytes[5]) << 6)); > break; > case 3: /* use bits [43:32] of the address */ > - vector =3D ((uc_addr->addr_bytes[4]) | > + dpdk_vector =3D ((uc_addr->addr_bytes[4]) | > (((uint16_t)uc_addr->addr_bytes[5]) << 8)); > break; > default: /* Invalid mc_filter_type */ > break; > } >=20 > - /* vector can only be 12-bits or boundary will be exceeded */ > - vector &=3D 0xFFF; > - return vector; > + /* dpdk_vector can only be 12-bits or boundary will be exceeded */ > + dpdk_vector &=3D 0xFFF; > + return dpdk_vector; > } >=20 > static int > ixgbe_uc_hash_table_set(struct rte_eth_dev *dev, > struct rte_ether_addr *mac_addr, uint8_t on) > { > - uint32_t vector; > + uint32_t dpdk_vector; > uint32_t uta_idx; > uint32_t reg_val; > uint32_t uta_shift; > @@ -5669,9 +5669,9 @@ ixgbe_uc_hash_table_set(struct rte_eth_dev *dev, > if (hw->mac.type < ixgbe_mac_82599EB) > return -ENOTSUP; >=20 > - vector =3D ixgbe_uta_vector(hw, mac_addr); > - uta_idx =3D (vector >> ixgbe_uta_bit_shift) & ixgbe_uta_idx_mask; > - uta_shift =3D vector & ixgbe_uta_bit_mask; > + dpdk_vector =3D ixgbe_uta_vector(hw, mac_addr); > + uta_idx =3D (dpdk_vector >> ixgbe_uta_bit_shift) & > ixgbe_uta_idx_mask; > + uta_shift =3D dpdk_vector & ixgbe_uta_bit_mask; >=20 > rc =3D ((uta_info->uta_shadow[uta_idx] >> uta_shift & bit1) !=3D 0); > if (rc =3D=3D on) > diff --git a/drivers/net/ixgbe/ixgbe_rxtx.c b/drivers/net/ixgbe/ixgbe_rxt= x.c > index 349180e7c1..021e9860d4 100644 > --- a/drivers/net/ixgbe/ixgbe_rxtx.c > +++ b/drivers/net/ixgbe/ixgbe_rxtx.c > @@ -4755,12 +4755,12 @@ ixgbe_get_rscctl_maxdesc(struct rte_mempool > *pool) > * @type RX/TX/MISC > */ > static void > -ixgbe_set_ivar(struct rte_eth_dev *dev, u8 entry, u8 vector, s8 type) > +ixgbe_set_ivar(struct rte_eth_dev *dev, u8 entry, u8 dpdk_vector, s8 typ= e) > { > struct ixgbe_hw *hw =3D IXGBE_DEV_PRIVATE_TO_HW(dev->data- > >dev_private); > u32 ivar, index; >=20 > - vector |=3D IXGBE_IVAR_ALLOC_VAL; > + dpdk_vector |=3D IXGBE_IVAR_ALLOC_VAL; >=20 > switch (hw->mac.type) { >=20 > @@ -4772,7 +4772,7 @@ ixgbe_set_ivar(struct rte_eth_dev *dev, u8 entry, > u8 vector, s8 type) > index =3D (entry >> 2) & 0x1F; > ivar =3D IXGBE_READ_REG(hw, IXGBE_IVAR(index)); > ivar &=3D ~(0xFF << (8 * (entry & 0x3))); > - ivar |=3D (vector << (8 * (entry & 0x3))); > + ivar |=3D (dpdk_vector << (8 * (entry & 0x3))); > IXGBE_WRITE_REG(hw, IXGBE_IVAR(index), ivar); > break; >=20 > @@ -4782,13 +4782,13 @@ ixgbe_set_ivar(struct rte_eth_dev *dev, u8 > entry, u8 vector, s8 type) > index =3D (entry & 1) * 8; > ivar =3D IXGBE_READ_REG(hw, IXGBE_IVAR_MISC); > ivar &=3D ~(0xFF << index); > - ivar |=3D (vector << index); > + ivar |=3D (dpdk_vector << index); > IXGBE_WRITE_REG(hw, IXGBE_IVAR_MISC, ivar); > } else { /* RX/TX IVARS */ > index =3D (16 * (entry & 1)) + (8 * type); > ivar =3D IXGBE_READ_REG(hw, IXGBE_IVAR(entry >> > 1)); > ivar &=3D ~(0xFF << index); > - ivar |=3D (vector << index); > + ivar |=3D (dpdk_vector << index); > IXGBE_WRITE_REG(hw, IXGBE_IVAR(entry >> 1), > ivar); > } >=20 > diff --git a/drivers/net/txgbe/txgbe_ethdev.c > b/drivers/net/txgbe/txgbe_ethdev.c > index b267da462b..ee45078aee 100644 > --- a/drivers/net/txgbe/txgbe_ethdev.c > +++ b/drivers/net/txgbe/txgbe_ethdev.c > @@ -3502,39 +3502,39 @@ txgbe_dev_mtu_set(struct rte_eth_dev *dev, > uint16_t mtu) > static uint32_t > txgbe_uta_vector(struct txgbe_hw *hw, struct rte_ether_addr *uc_addr) > { > - uint32_t vector =3D 0; > + uint32_t dpdk_vector =3D 0; >=20 > switch (hw->mac.mc_filter_type) { > case 0: /* use bits [47:36] of the address */ > - vector =3D ((uc_addr->addr_bytes[4] >> 4) | > + dpdk_vector =3D ((uc_addr->addr_bytes[4] >> 4) | > (((uint16_t)uc_addr->addr_bytes[5]) << 4)); > break; > case 1: /* use bits [46:35] of the address */ > - vector =3D ((uc_addr->addr_bytes[4] >> 3) | > + dpdk_vector =3D ((uc_addr->addr_bytes[4] >> 3) | > (((uint16_t)uc_addr->addr_bytes[5]) << 5)); > break; > case 2: /* use bits [45:34] of the address */ > - vector =3D ((uc_addr->addr_bytes[4] >> 2) | > + dpdk_vector =3D ((uc_addr->addr_bytes[4] >> 2) | > (((uint16_t)uc_addr->addr_bytes[5]) << 6)); > break; > case 3: /* use bits [43:32] of the address */ > - vector =3D ((uc_addr->addr_bytes[4]) | > + dpdk_vector =3D ((uc_addr->addr_bytes[4]) | > (((uint16_t)uc_addr->addr_bytes[5]) << 8)); > break; > default: /* Invalid mc_filter_type */ > break; > } >=20 > - /* vector can only be 12-bits or boundary will be exceeded */ > - vector &=3D 0xFFF; > - return vector; > + /* dpdk_vector can only be 12-bits or boundary will be exceeded */ > + dpdk_vector &=3D 0xFFF; > + return dpdk_vector; > } >=20 > static int > txgbe_uc_hash_table_set(struct rte_eth_dev *dev, > struct rte_ether_addr *mac_addr, uint8_t on) > { > - uint32_t vector; > + uint32_t dpdk_vector; > uint32_t uta_idx; > uint32_t reg_val; > uint32_t uta_mask; > @@ -3547,9 +3547,9 @@ txgbe_uc_hash_table_set(struct rte_eth_dev > *dev, > if (hw->mac.type < txgbe_mac_raptor) > return -ENOTSUP; >=20 > - vector =3D txgbe_uta_vector(hw, mac_addr); > - uta_idx =3D (vector >> 5) & 0x7F; > - uta_mask =3D 0x1UL << (vector & 0x1F); > + dpdk_vector =3D txgbe_uta_vector(hw, mac_addr); > + uta_idx =3D (dpdk_vector >> 5) & 0x7F; > + uta_mask =3D 0x1UL << (dpdk_vector & 0x1F); >=20 > if (!!on =3D=3D !!(uta_info->uta_shadow[uta_idx] & uta_mask)) > return 0; > diff --git a/lib/eal/ppc/include/rte_altivec.h > b/lib/eal/ppc/include/rte_altivec.h > index 1551a94544..3fcc819c11 100644 > --- a/lib/eal/ppc/include/rte_altivec.h > +++ b/lib/eal/ppc/include/rte_altivec.h > @@ -7,6 +7,9 @@ > #define _RTE_ALTIVEC_H_ >=20 > /* To include altivec.h, GCC version must be >=3D 4.8 */ > +#ifdef __clang__ > +#define vector __vector > +#endif > #include >=20 > /* > diff --git a/lib/eal/ppc/include/rte_atomic.h > b/lib/eal/ppc/include/rte_atomic.h > index 86d3f9b2a1..bd4c3c67b1 100644 > --- a/lib/eal/ppc/include/rte_atomic.h > +++ b/lib/eal/ppc/include/rte_atomic.h > @@ -83,7 +83,7 @@ static inline int > rte_atomic16_dec_and_test(rte_atomic16_t *v) > static inline uint16_t > rte_atomic16_exchange(volatile uint16_t *dst, uint16_t val) > { > - return __atomic_exchange_2(dst, val, __ATOMIC_SEQ_CST); > + return __atomic_exchange_n(dst, val, __ATOMIC_SEQ_CST); > } >=20 > /*------------------------- 32 bit atomic operations -------------------= ------*/ > @@ -125,7 +125,7 @@ static inline int > rte_atomic32_dec_and_test(rte_atomic32_t *v) > static inline uint32_t > rte_atomic32_exchange(volatile uint32_t *dst, uint32_t val) > { > - return __atomic_exchange_4(dst, val, __ATOMIC_SEQ_CST); > + return __atomic_exchange_n(dst, val, __ATOMIC_SEQ_CST); > } >=20 > /*------------------------- 64 bit atomic operations -------------------= ------*/ > @@ -214,7 +214,7 @@ static inline void rte_atomic64_clear(rte_atomic64_t > *v) > static inline uint64_t > rte_atomic64_exchange(volatile uint64_t *dst, uint64_t val) > { > - return __atomic_exchange_8(dst, val, __ATOMIC_SEQ_CST); > + return __atomic_exchange_n(dst, val, __ATOMIC_SEQ_CST); > } >=20 > #endif > diff --git a/lib/eal/ppc/include/rte_cycles.h > b/lib/eal/ppc/include/rte_cycles.h > index 5585f9273c..160a2de0a7 100644 > --- a/lib/eal/ppc/include/rte_cycles.h > +++ b/lib/eal/ppc/include/rte_cycles.h > @@ -10,7 +10,9 @@ > extern "C" { > #endif >=20 > +#ifdef __linux__ > #include > +#endif >=20 > #include "generic/rte_cycles.h" >=20 > @@ -26,7 +28,13 @@ extern "C" { > static inline uint64_t > rte_rdtsc(void) > { > +#ifdef __linux__ > return __ppc_get_timebase(); > +#elif defined(__FreeBSD__) > + uint64_t __tb; > + __asm__ volatile ("mfspr %0, 268" : "=3Dr" (__tb)); > + return __tb; > +#endif > } >=20 > static inline uint64_t > -- > 2.32.0