From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from dpdk.org (dpdk.org [92.243.14.124]) by inbox.dpdk.org (Postfix) with ESMTP id 72B0CA04B1; Fri, 1 May 2020 19:48:23 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 0D99B1DA37; Fri, 1 May 2020 19:48:23 +0200 (CEST) Received: from EUR05-DB8-obe.outbound.protection.outlook.com (mail-db8eur05on2076.outbound.protection.outlook.com [40.107.20.76]) by dpdk.org (Postfix) with ESMTP id D830E1DA07 for ; Fri, 1 May 2020 19:48:21 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XVV4eKvNkpRSoWcdDBZppFhydGh1I0U3c3fFgfaFMaQ=; b=aC8ajWmcn8AIoqMqfb/rxkG1nsGxLc1pZtTxzzCsQbvBx/k4KbW0fd6Jv1/sCuduuhO8JRjRjEGyPw9JJEQNzs6iitPl6f+Bu1r+pg+8lY4xVkF78zWeU5gubTNytZ5vyPlcZMZaGsavj4yzbscgqh8rPUuDvDacYtKaEoqpeX4= Received: from DB8PR03CA0003.eurprd03.prod.outlook.com (2603:10a6:10:be::16) by AM0PR08MB3539.eurprd08.prod.outlook.com (2603:10a6:208:e2::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2937.22; Fri, 1 May 2020 17:48:19 +0000 Received: from DB5EUR03FT039.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:be:cafe::6e) by DB8PR03CA0003.outlook.office365.com (2603:10a6:10:be::16) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Fri, 1 May 2020 17:48:19 +0000 Authentication-Results: spf=pass (sender IP is 63.35.35.123) smtp.mailfrom=arm.com; dpdk.org; dkim=pass (signature was verified) header.d=armh.onmicrosoft.com;dpdk.org; dmarc=bestguesspass action=none header.from=arm.com; Received-SPF: Pass (protection.outlook.com: domain of arm.com designates 63.35.35.123 as permitted sender) receiver=protection.outlook.com; client-ip=63.35.35.123; helo=64aa7808-outbound-1.mta.getcheckrecipient.com; Received: from 64aa7808-outbound-1.mta.getcheckrecipient.com (63.35.35.123) by DB5EUR03FT039.mail.protection.outlook.com (10.152.21.120) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Fri, 1 May 2020 17:48:19 +0000 Received: ("Tessian outbound 567b75aed2b9:v54"); Fri, 01 May 2020 17:48:19 +0000 X-CR-MTA-TID: 64aa7808 Received: from 385fc9cbc18b.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 2FA0EE02-8706-4DAE-AFDE-60880242E6B0.1; Fri, 01 May 2020 17:48:14 +0000 Received: from EUR03-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 385fc9cbc18b.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 01 May 2020 17:48:14 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=Yc4AA7QApObQRinJI2+VCXAWH9h0qA+414heli53Mu+gnwmyT2Cx+UNK8+2jXcuVTdzx2mnshAC+haEvh1qyMjLqySngbq50gJhXFrfYqzo8jX3CDwk+FvBCyUP9YJMb9D7gOzABmXzLbnSMyGitKxeqvJd6Q6ys7Kz/hjCGp+mhlPPOzBRNv22j9LfGAwSWoo7InO1p/7WlA8MGKzqhj6+wKpqyVzL8di1+MzZejM5J0n40ThrTsK1QppXETbvDedqXKk0zPcJF+1ZqU2WkxMq80HKs0tH95X7eqmWypadRO/BpWa/8hCGCG67DmcvIfwe3C+M/DzN4mkphoh19ug== 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-SenderADCheck; bh=XVV4eKvNkpRSoWcdDBZppFhydGh1I0U3c3fFgfaFMaQ=; b=HwcpHZM03RONP17e+SBjXOcx3VT8ZwBlSPN4MlOqeL7vG8/bEoB/EtzWKmgblE2o3zxx3O5FMC0BdW4+PoNpc1rAOyQDLBsJs4rsZUrj+C6F2JD2BSghmsbeUXPOjHcr5Yq/za9YOzfwAPy51M4eKLsjj82hMHnN9PGwDJanHXftP8420Xb11aUq+TW4N5tFp/jDdPhvXE5AqTk+t+UVXCFqnk0+a+PaYo5PQBfS8Y0YYbI4fJOA7IIpZQcJq03EPKsfJp/PkzCSUgHWN+mAYfOA1vUi4WTmsIUFPt8ujzxrfBOOukp2sV1h1jSGWFErSCtSFPCti7o4Ox608DX3RQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=arm.com; dmarc=pass action=none header.from=arm.com; dkim=pass header.d=arm.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=armh.onmicrosoft.com; s=selector2-armh-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=XVV4eKvNkpRSoWcdDBZppFhydGh1I0U3c3fFgfaFMaQ=; b=aC8ajWmcn8AIoqMqfb/rxkG1nsGxLc1pZtTxzzCsQbvBx/k4KbW0fd6Jv1/sCuduuhO8JRjRjEGyPw9JJEQNzs6iitPl6f+Bu1r+pg+8lY4xVkF78zWeU5gubTNytZ5vyPlcZMZaGsavj4yzbscgqh8rPUuDvDacYtKaEoqpeX4= Received: from DBBPR08MB4646.eurprd08.prod.outlook.com (2603:10a6:10:f5::16) by DBBPR08MB4252.eurprd08.prod.outlook.com (2603:10a6:10:c2::23) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Fri, 1 May 2020 17:48:12 +0000 Received: from DBBPR08MB4646.eurprd08.prod.outlook.com ([fe80::1870:afc4:b90f:609d]) by DBBPR08MB4646.eurprd08.prod.outlook.com ([fe80::1870:afc4:b90f:609d%5]) with mapi id 15.20.2958.020; Fri, 1 May 2020 17:48:12 +0000 From: Honnappa Nagarahalli To: "Ananyev, Konstantin" , "dev@dpdk.org" CC: "aconole@redhat.com" , nd , Honnappa Nagarahalli , nd Thread-Topic: [PATCH] test/ring: code rework to reduce compilation time Thread-Index: AQHWHk+l64WNWhz7zUq1AmUBfvaQkqiQx4EwgAD3R4CAAcSWIA== Date: Fri, 1 May 2020 17:48:12 +0000 Message-ID: References: <20200429175714.31141-1-konstantin.ananyev@intel.com> In-Reply-To: Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: f644ce0a-9f70-4a5c-9841-26d755f96f1c.0 x-checkrecipientchecked: true Authentication-Results-Original: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=arm.com; x-originating-ip: [217.140.111.135] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: c756c107-e788-49aa-baca-08d7edf7d5d3 x-ms-traffictypediagnostic: DBBPR08MB4252:|DBBPR08MB4252:|AM0PR08MB3539: x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:8273;OLM:8273; x-forefront-prvs: 0390DB4BDA X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: DbLWzGKNdHfZm+L54Kt5/KVq1FfRPJeEG5j7PEzcYSntaEw8nOG49HfzquuLFfvwA6zrcev12x2PDZp8OGE5bO1SmWniWAapeASYaAUJyh9UpyiL6Yvus8R+7s1HekZKTCiKN9JThyNldqRS6Qth1OP4Idfds1FDjR4Ns3yCIigJx/X32TbYwiGtRU14liaqsh3Vqfj6xdDBIHNnfkSLdfM+ausvHzf1fIETu/quMlUweCcO8CtLdcyM4x0FRkAEouTdGFAditFnniw5mYtSTSR5nUsx362KAD3MGxNk2Ozrn2XY+9xAafbqIA58UFIJ+VFe0ojKav4PFWnfvfe+OFU2D+Y6/7PYS2u9PlKbFW3kb1OXaMCrMoH++tJtgrnProNUhYh8ug6liktRGzmfo0FKNl6dFGe5knN+vpb+EmGeuGNi6sVjWjRa/STscojZ76lQ+MXjAdtCvG2MIBCx+QJh69sydflvBxbGYgIgyccK2EHMI7vrpBotKB9YGK3001tkgrL+hLfGO27txrZhkA== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DBBPR08MB4646.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(39860400002)(136003)(396003)(376002)(346002)(366004)(4326008)(6506007)(53546011)(33656002)(478600001)(66946007)(7696005)(52536014)(8936002)(186003)(66476007)(66556008)(64756008)(66446008)(966005)(26005)(76116006)(86362001)(316002)(8676002)(2906002)(55016002)(54906003)(9686003)(110136005)(30864003)(5660300002)(71200400001)(579004); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: 4EX0iPVEAbv8qde/Kx1KEYViHNoA384CcvcQFd/V5r/JVRrJC+c5UrLiNBIOy1+8L8/guO0i7WvPOlM1ardKKucBWxwlETe/g8F0krmIYBmgdICUS382Z6qSc4nQKhdtPuphtPHlvDR1oblegWEFMfjRFgPBV2XF9lVzXxwheJlZvfP/cT40PDv+bmOArd7oh5kiAhwxaXPBktg8ti+2G2kd6lWfQyH0S5mCqYuFxtVXc/m3E3nlZgZZjk1ZxXXv36K/sXJ371SsVRMYnZukYaqmXztxnw9kNCnXHri8NYuBCnGveYjcAg0BaJBbZ0g0//2OyD/sa/gsLuYEw9MlDJSxS05O//e+M0lnMe5psytWiqcP7pwCVvNj+wmNgIiHWA78jCJk35HF8Bhvn0D5K+TbR1rBCTqTGx/sWv56SG74Coo3WxEmN3sNu87UlZ8HCvNT70RCxpB0xiUaKw9FKZoVODE6Tx9p+5aGfHuE0DWQzdOdG6QGoyQlCSNhw7IGARydYRrD980dODFvNm8tmQomjikbJNReHmAsYK1CihHiLBxrRmAgFypUgFZzaplkeuWoQ4OvUQ40Cc9mqdlaPXanAvXnY4ZTkhNIqq6SnV9BL+rUNxW6/aTr7z9Xax0SV0up9p3V6FrBvQZm1At99laBkdPg3c5gfiKcminyp7dnmKlnbv326QoDrREvJ8AlJQwf8vFzOgxzMRK4QxW9032Acge/lkFntNLBMXb6Xw6R2Bs1r1mA8shWIbzzTIMwYNCraD/KSVhexvz6AjE2D1r0oGt4yJ3Uqtutdxy5hx/KvMBH2+cCKSvT5DPBXdZo Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4252 Original-Authentication-Results: intel.com; dkim=none (message not signed) header.d=none;intel.com; dmarc=none action=none header.from=arm.com; X-EOPAttributedMessage: 0 X-MS-Exchange-Transport-CrossTenantHeadersStripped: DB5EUR03FT039.eop-EUR03.prod.protection.outlook.com X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFTY:; SFS:(4636009)(346002)(136003)(376002)(396003)(39860400002)(46966005)(356005)(2906002)(53546011)(47076004)(82740400003)(70586007)(7696005)(336012)(186003)(30864003)(4326008)(6506007)(26005)(82310400002)(81166007)(9686003)(70206006)(54906003)(55016002)(110136005)(8936002)(966005)(316002)(52536014)(478600001)(5660300002)(33656002)(8676002)(86362001); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 0fbc8160-39ce-459f-df4d-08d7edf7d1c2 X-Forefront-PRVS: 0390DB4BDA X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: 9BlwBTu3u6Py0Dh7tJ64LM3L2y4CvL5OvPxNPBxLGSMFnFxO5LJanj8Qyk257+uHwkeci8gvyX7DtwFIcWqU8pZOaLNZxEtuFNZ2XKy/LloW+mxcEb3OWo1lv5EoS1tYKOLFei7k8uqlkHnpvXL28DWJyeVGmzxFYuA4w8wa4xVjzE1I5buRJGpNW30CS+rphjWwujaXveRyari0DmZgh/TovklsK2W6oRHlWQk1beG/XH3xb/aG2adOsYZiAe8axapsRIKmRi0uqfcmkjQUtywM90HxNMVkEDT7ylZc2fvk3eQ1rJ4wv8R8jIGL7m7NIrgCa9blPbYSLHenCYrr8lyi6jFwkOuhyBwn66H6EkpRgywBRDE4lyMZe4cr8rzzY9+lssNvG3tbxJJZ7+jxyO+oMpVQV4xGHyYhQd2ZY32erQ7pwBwRDDMiWLai5rgvYoaR6hBp9LVw8A6WEWm0PvxuujZoRH+LUs1W1gshZFUVfsU+4kDzRhVsSBv7TseMXv7AI8i+nmxXHQBuSOM5Y00Kj8q8A3HD/oMBUTnRsHFySpPTHk9QhOMHxUk+05Mi9ZR0wswwRGBkvUHgjhSuiEgBjKUs5MRmP1j9zFTKu+E= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 01 May 2020 17:48:19.6132 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: c756c107-e788-49aa-baca-08d7edf7d5d3 X-MS-Exchange-CrossTenant-Id: f34e5979-57d9-4aaa-ad4d-b122a662184d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=f34e5979-57d9-4aaa-ad4d-b122a662184d; Ip=[63.35.35.123]; Helo=[64aa7808-outbound-1.mta.getcheckrecipient.com] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM0PR08MB3539 Subject: Re: [dpdk-dev] [PATCH] test/ring: code rework to reduce compilation time X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 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" >=20 >=20 > Hi Honnappa, >=20 > > Hi Konstantin, > > I like the way the tests are organized and it looks good. > > > > I am just wondering about the way it is being tested here. The intent > > to write the test cases the way they are currently is to mimic how the > > APIs would be used mostly. IMO, the APIs would be used with a constant > value for element size so that the compiler will throw away the unwanted > code (in the functions where the actual copy is being done). > > > > With your method here, it looks to me like all the branches in the copy > functions are kept and the branch decisions are done at run time. > > Is my understanding correct? >=20 > You mean branching on esize[] values? Yes > Actually from what I've seen that happens for both cases: > before and after the patch (gcc 7.3 -O3). I did not look at the generated code. If it is happening with your patch to= o, I think we can go with your patch. But, can you do similar change to tes= t_ring_perf.c to keep it consistent? >=20 > Main intention in my changes was to avoid using > test_ring_enqueue/test_ring_dequeue, > as it seems too many branches here and it takes compiler a lot of effort = to > resolve all of them at compile time. > So I replaced it with array of function pointers (test_enqdeq_impl[]) an= d > iterating over it. > That way compiler knows straightway which function to use. >=20 > > Can you please check this? https://patches.dpdk.org/patch/69567/ >=20 > As I can see your approach reduces number of test-cases by factor of 5: > now each of test_ring_burst_bulk_tests[1-4] is executed only with just on= e > esize value, correct? Yes, basically test_ring_burst_bulk_tests[1-4] were covering different scen= arios with the same APIs. So, distributed the esize across different test f= unctions. > In term of compilation speed - it helps. > On my box with (gcc 7.3 -O3) compiling test_ring.c takes: > orig code: ~100s > with 69567 (your patch): < 20s > with 69559 (my patch): < 10s >=20 > Konstantin >=20 > > > > > -----Original Message----- > > > From: Konstantin Ananyev > > > Sent: Wednesday, April 29, 2020 12:57 PM > > > To: dev@dpdk.org > > > Cc: aconole@redhat.com; Honnappa Nagarahalli > > > ; Konstantin Ananyev > > > > > > Subject: [PATCH] test/ring: code rework to reduce compilation time > > > > > > Rework test code to reduce code complexity for the compiler and > > > bring down compilation time and memory consumption. > > > > > > Signed-off-by: Konstantin Ananyev > > > --- > > > app/test/test_ring.c | 373 > > > +++++++++++++++++++++++++++++-------------- > > > 1 file changed, 249 insertions(+), 124 deletions(-) > > > > > > diff --git a/app/test/test_ring.c b/app/test/test_ring.c index > > > e21557cd9..0ae97d341 100644 > > > --- a/app/test/test_ring.c > > > +++ b/app/test/test_ring.c > > > @@ -58,6 +58,181 @@ > > > > > > static const int esize[] =3D {-1, 4, 8, 16, 20}; > > > > > > +static const struct { > > > + const char *desc; > > > + uint32_t api_type; > > > + uint32_t create_flags; > > > + struct { > > > + unsigned int (*flegacy)(struct rte_ring *r, > > > + void * const *obj_table, unsigned int n, > > > + unsigned int *free_space); > > > + unsigned int (*felem)(struct rte_ring *r, const void *obj_table, > > > + unsigned int esize, unsigned int n, > > > + unsigned int *free_space); > > > + } enq; > > > + struct { > > > + unsigned int (*flegacy)(struct rte_ring *r, > > > + void **obj_table, unsigned int n, > > > + unsigned int *available); > > > + unsigned int (*felem)(struct rte_ring *r, void *obj_table, > > > + unsigned int esize, unsigned int n, > > > + unsigned int *available); > > > + } deq; > > > +} test_enqdeq_impl[] =3D { > > > + { > > > + .desc =3D "MP/MC sync mode", > > Details about the tests are already printed by the function > 'test_ring_print_test_string'. This string should be 'Test standard ring'= . > > > > > + .api_type =3D TEST_RING_ELEM_BULK | > > > TEST_RING_THREAD_DEF, > > > + .create_flags =3D 0, > > > + .enq =3D { > > > + .flegacy =3D rte_ring_enqueue_bulk, > > > + .felem =3D rte_ring_enqueue_bulk_elem, > > > + }, > > > + .deq =3D { > > > + .flegacy =3D rte_ring_dequeue_bulk, > > > + .felem =3D rte_ring_dequeue_bulk_elem, > > > + }, > > > + }, > > > + { > > > + .desc =3D "SP/SC sync mode", > > > + .api_type =3D TEST_RING_ELEM_BULK | > > > TEST_RING_THREAD_SPSC, > > > + .create_flags =3D RING_F_SP_ENQ | RING_F_SC_DEQ, > > > + .enq =3D { > > > + .flegacy =3D rte_ring_sp_enqueue_bulk, > > > + .felem =3D rte_ring_sp_enqueue_bulk_elem, > > > + }, > > > + .deq =3D { > > > + .flegacy =3D rte_ring_sc_dequeue_bulk, > > > + .felem =3D rte_ring_sc_dequeue_bulk_elem, > > > + }, > > > + }, > > > + { > > > + .desc =3D "MP/MC sync mode", > > > + .api_type =3D TEST_RING_ELEM_BULK | > > > TEST_RING_THREAD_MPMC, > > > + .create_flags =3D 0, > > > + .enq =3D { > > > + .flegacy =3D rte_ring_mp_enqueue_bulk, > > > + .felem =3D rte_ring_mp_enqueue_bulk_elem, > > > + }, > > > + .deq =3D { > > > + .flegacy =3D rte_ring_mc_dequeue_bulk, > > > + .felem =3D rte_ring_mc_dequeue_bulk_elem, > > > + }, > > > + }, > > > + { > > > + .desc =3D "MP_RTS/MC_RTS sync mode", > > > + .api_type =3D TEST_RING_ELEM_BULK | > > > TEST_RING_THREAD_DEF, > > > + .create_flags =3D RING_F_MP_RTS_ENQ | > > > RING_F_MC_RTS_DEQ, > > > + .enq =3D { > > > + .flegacy =3D rte_ring_enqueue_bulk, > > > + .felem =3D rte_ring_enqueue_bulk_elem, > > > + }, > > > + .deq =3D { > > > + .flegacy =3D rte_ring_dequeue_bulk, > > > + .felem =3D rte_ring_dequeue_bulk_elem, > > > + }, > > > + }, > > > + { > > > + .desc =3D "MP_HTS/MC_HTS sync mode", > > > + .api_type =3D TEST_RING_ELEM_BULK | > > > TEST_RING_THREAD_DEF, > > > + .create_flags =3D RING_F_MP_HTS_ENQ | > > > RING_F_MC_HTS_DEQ, > > > + .enq =3D { > > > + .flegacy =3D rte_ring_enqueue_bulk, > > > + .felem =3D rte_ring_enqueue_bulk_elem, > > > + }, > > > + .deq =3D { > > > + .flegacy =3D rte_ring_dequeue_bulk, > > > + .felem =3D rte_ring_dequeue_bulk_elem, > > > + }, > > > + }, > > > + { > > > + .desc =3D "MP/MC sync mode", > > > + .api_type =3D TEST_RING_ELEM_BURST | > > > TEST_RING_THREAD_DEF, > > > + .create_flags =3D 0, > > > + .enq =3D { > > > + .flegacy =3D rte_ring_enqueue_burst, > > > + .felem =3D rte_ring_enqueue_burst_elem, > > > + }, > > > + .deq =3D { > > > + .flegacy =3D rte_ring_dequeue_burst, > > > + .felem =3D rte_ring_dequeue_burst_elem, > > > + }, > > > + }, > > > + { > > > + .desc =3D "SP/SC sync mode", > > > + .api_type =3D TEST_RING_ELEM_BURST | > > > TEST_RING_THREAD_SPSC, > > > + .create_flags =3D RING_F_SP_ENQ | RING_F_SC_DEQ, > > > + .enq =3D { > > > + .flegacy =3D rte_ring_sp_enqueue_burst, > > > + .felem =3D rte_ring_sp_enqueue_burst_elem, > > > + }, > > > + .deq =3D { > > > + .flegacy =3D rte_ring_sc_dequeue_burst, > > > + .felem =3D rte_ring_sc_dequeue_burst_elem, > > > + }, > > > + }, > > > + { > > > + .desc =3D "MP/MC sync mode", > > > + .api_type =3D TEST_RING_ELEM_BURST | > > > TEST_RING_THREAD_MPMC, > > > + .create_flags =3D 0, > > > + .enq =3D { > > > + .flegacy =3D rte_ring_mp_enqueue_burst, > > > + .felem =3D rte_ring_mp_enqueue_burst_elem, > > > + }, > > > + .deq =3D { > > > + .flegacy =3D rte_ring_mc_dequeue_burst, > > > + .felem =3D rte_ring_mc_dequeue_burst_elem, > > > + }, > > > + }, > > > + { > > > + .desc =3D "MP_RTS/MC_RTS sync mode", > > > + .api_type =3D TEST_RING_ELEM_BURST | > > > TEST_RING_THREAD_DEF, > > > + .create_flags =3D RING_F_MP_RTS_ENQ | > > > RING_F_MC_RTS_DEQ, > > > + .enq =3D { > > > + .flegacy =3D rte_ring_enqueue_burst, > > > + .felem =3D rte_ring_enqueue_burst_elem, > > > + }, > > > + .deq =3D { > > > + .flegacy =3D rte_ring_dequeue_burst, > > > + .felem =3D rte_ring_dequeue_burst_elem, > > > + }, > > > + }, > > > + { > > > + .desc =3D "MP_HTS/MC_HTS sync mode", > > > + .api_type =3D TEST_RING_ELEM_BURST | > > > TEST_RING_THREAD_DEF, > > > + .create_flags =3D RING_F_MP_HTS_ENQ | > > > RING_F_MC_HTS_DEQ, > > > + .enq =3D { > > > + .flegacy =3D rte_ring_enqueue_burst, > > > + .felem =3D rte_ring_enqueue_burst_elem, > > > + }, > > > + .deq =3D { > > > + .flegacy =3D rte_ring_dequeue_burst, > > > + .felem =3D rte_ring_dequeue_burst_elem, > > > + }, > > > + }, > > > +}; > > > + > > > +static unsigned int > > > +test_ring_enq_impl(struct rte_ring *r, void **obj, int esize, unsign= ed int n, > > > + unsigned int test_idx) > > > +{ > > > + if (esize =3D=3D -1) > > > + return test_enqdeq_impl[test_idx].enq.flegacy(r, obj, n, NULL); > > > + else > > > + return test_enqdeq_impl[test_idx].enq.felem(r, obj, esize, n, > > > + NULL); > > > +} > > > + > > > +static unsigned int > > > +test_ring_deq_impl(struct rte_ring *r, void **obj, int esize, unsign= ed int n, > > > + unsigned int test_idx) > > > +{ > > > + if (esize =3D=3D -1) > > > + return test_enqdeq_impl[test_idx].deq.flegacy(r, obj, n, NULL); > > > + else > > > + return test_enqdeq_impl[test_idx].deq.felem(r, obj, esize, n, > > > + NULL); > > > +} > > > + > > > static void** > > > test_ring_inc_ptr(void **obj, int esize, unsigned int n) { @@ > > > -203,8 +378,7 @@ test_ring_negative_tests(void) > > > * Random number of elements are enqueued and dequeued. > > > */ > > > static int > > > -test_ring_burst_bulk_tests1(unsigned int api_type, unsigned int > create_flags, > > > - const char *tname) > > > +test_ring_burst_bulk_tests1(unsigned int test_idx) > > > { > > > struct rte_ring *r; > > > void **src =3D NULL, **cur_src =3D NULL, **dst =3D NULL, **cur_dst = =3D > > > NULL; @@ -214,11 +388,13 @@ test_ring_burst_bulk_tests1(unsigned int > > > api_type, unsigned int create_flags, > > > const unsigned int rsz =3D RING_SIZE - 1; > > > > > > for (i =3D 0; i < RTE_DIM(esize); i++) { > > > - test_ring_print_test_string(tname, api_type, esize[i]); > > > + test_ring_print_test_string(test_enqdeq_impl[test_idx].desc, > > > + test_enqdeq_impl[test_idx].api_type, esize[i]); > > > > > > /* Create the ring */ > > > r =3D test_ring_create("test_ring_burst_bulk_tests", esize[i], > > > - RING_SIZE, SOCKET_ID_ANY, > > > create_flags); > > > + RING_SIZE, SOCKET_ID_ANY, > > > + test_enqdeq_impl[test_idx].create_flags); > > > > > > /* alloc dummy object pointers */ > > > src =3D test_ring_calloc(RING_SIZE * 2, esize[i]); @@ -240,17 > > > +416,17 @@ test_ring_burst_bulk_tests1(unsigned int api_type, > > > +unsigned int > > > create_flags, > > > rand =3D RTE_MAX(rte_rand() % RING_SIZE, 1UL); > > > printf("%s: iteration %u, random shift: %u;\n", > > > __func__, i, rand); > > > - ret =3D test_ring_enqueue(r, cur_src, esize[i], rand, > > > - api_type); > > > + ret =3D test_ring_enq_impl(r, cur_src, esize[i], rand, > > > + test_idx); > > > TEST_RING_VERIFY(ret !=3D 0); > > > > > > - ret =3D test_ring_dequeue(r, cur_dst, esize[i], rand, > > > - api_type); > > > + ret =3D test_ring_deq_impl(r, cur_dst, esize[i], rand, > > > + test_idx); > > > TEST_RING_VERIFY(ret =3D=3D rand); > > > > > > /* fill the ring */ > > > - ret =3D test_ring_enqueue(r, cur_src, esize[i], rsz, > > > - api_type); > > > + ret =3D test_ring_enq_impl(r, cur_src, esize[i], rsz, > > > + test_idx); > > > TEST_RING_VERIFY(ret !=3D 0); > > > > > > TEST_RING_VERIFY(rte_ring_free_count(r) =3D=3D 0); @@ > > > -259,8 +435,8 @@ test_ring_burst_bulk_tests1(unsigned int api_type, > > > unsigned int create_flags, > > > TEST_RING_VERIFY(rte_ring_empty(r) =3D=3D 0); > > > > > > /* empty the ring */ > > > - ret =3D test_ring_dequeue(r, cur_dst, esize[i], rsz, > > > - api_type); > > > + ret =3D test_ring_deq_impl(r, cur_dst, esize[i], rsz, > > > + test_idx); > > > TEST_RING_VERIFY(ret =3D=3D (int)rsz); > > > TEST_RING_VERIFY(rsz =3D=3D rte_ring_free_count(r)); > > > TEST_RING_VERIFY(rte_ring_count(r) =3D=3D 0); @@ - > > > 294,8 +470,7 @@ test_ring_burst_bulk_tests1(unsigned int api_type, > > > unsigned int create_flags, > > > * dequeued data. > > > */ > > > static int > > > -test_ring_burst_bulk_tests2(unsigned int api_type, unsigned int > create_flags, > > > - const char *tname) > > > +test_ring_burst_bulk_tests2(unsigned int test_idx) > > > { > > > struct rte_ring *r; > > > void **src =3D NULL, **cur_src =3D NULL, **dst =3D NULL, **cur_dst = =3D > > > NULL; @@ -303,11 +478,13 @@ test_ring_burst_bulk_tests2(unsigned int > > > api_type, unsigned int create_flags, > > > unsigned int i; > > > > > > for (i =3D 0; i < RTE_DIM(esize); i++) { > > > - test_ring_print_test_string(tname, api_type, esize[i]); > > > + test_ring_print_test_string(test_enqdeq_impl[test_idx].desc, > > > + test_enqdeq_impl[test_idx].api_type, esize[i]); > > > > > > /* Create the ring */ > > > r =3D test_ring_create("test_ring_burst_bulk_tests", esize[i], > > > - RING_SIZE, SOCKET_ID_ANY, > > > create_flags); > > > + RING_SIZE, SOCKET_ID_ANY, > > > + test_enqdeq_impl[test_idx].create_flags); > > > > > > /* alloc dummy object pointers */ > > > src =3D test_ring_calloc(RING_SIZE * 2, esize[i]); @@ -323,39 > > > +500,39 @@ test_ring_burst_bulk_tests2(unsigned int api_type, > > > +unsigned int > > > create_flags, > > > cur_dst =3D dst; > > > > > > printf("enqueue 1 obj\n"); > > > - ret =3D test_ring_enqueue(r, cur_src, esize[i], 1, api_type); > > > + ret =3D test_ring_enq_impl(r, cur_src, esize[i], 1, test_idx); > > > if (ret !=3D 1) > > > goto fail; > > > cur_src =3D test_ring_inc_ptr(cur_src, esize[i], 1); > > > > > > printf("enqueue 2 objs\n"); > > > - ret =3D test_ring_enqueue(r, cur_src, esize[i], 2, api_type); > > > + ret =3D test_ring_enq_impl(r, cur_src, esize[i], 2, test_idx); > > > if (ret !=3D 2) > > > goto fail; > > > cur_src =3D test_ring_inc_ptr(cur_src, esize[i], 2); > > > > > > printf("enqueue MAX_BULK objs\n"); > > > - ret =3D test_ring_enqueue(r, cur_src, esize[i], MAX_BULK, > > > - api_type); > > > + ret =3D test_ring_enq_impl(r, cur_src, esize[i], MAX_BULK, > > > + test_idx); > > > if (ret !=3D MAX_BULK) > > > goto fail; > > > cur_src =3D test_ring_inc_ptr(cur_src, esize[i], MAX_BULK); > > > > > > printf("dequeue 1 obj\n"); > > > - ret =3D test_ring_dequeue(r, cur_dst, esize[i], 1, api_type); > > > + ret =3D test_ring_deq_impl(r, cur_dst, esize[i], 1, test_idx); > > > if (ret !=3D 1) > > > goto fail; > > > cur_dst =3D test_ring_inc_ptr(cur_dst, esize[i], 1); > > > > > > printf("dequeue 2 objs\n"); > > > - ret =3D test_ring_dequeue(r, cur_dst, esize[i], 2, api_type); > > > + ret =3D test_ring_deq_impl(r, cur_dst, esize[i], 2, test_idx); > > > if (ret !=3D 2) > > > goto fail; > > > cur_dst =3D test_ring_inc_ptr(cur_dst, esize[i], 2); > > > > > > printf("dequeue MAX_BULK objs\n"); > > > - ret =3D test_ring_dequeue(r, cur_dst, esize[i], MAX_BULK, > > > - api_type); > > > + ret =3D test_ring_deq_impl(r, cur_dst, esize[i], MAX_BULK, > > > + test_idx); > > > if (ret !=3D MAX_BULK) > > > goto fail; > > > cur_dst =3D test_ring_inc_ptr(cur_dst, esize[i], MAX_BULK); @@ > > > -390,8 +567,7 @@ test_ring_burst_bulk_tests2(unsigned int api_type, > > > unsigned int create_flags, > > > * Enqueue and dequeue to cover the entire ring length. > > > */ > > > static int > > > -test_ring_burst_bulk_tests3(unsigned int api_type, unsigned int > create_flags, > > > - const char *tname) > > > +test_ring_burst_bulk_tests3(unsigned int test_idx) > > > { > > > struct rte_ring *r; > > > void **src =3D NULL, **cur_src =3D NULL, **dst =3D NULL, **cur_dst = =3D > > > NULL; @@ -399,11 +575,13 @@ test_ring_burst_bulk_tests3(unsigned int > > > api_type, unsigned int create_flags, > > > unsigned int i, j; > > > > > > for (i =3D 0; i < RTE_DIM(esize); i++) { > > > - test_ring_print_test_string(tname, api_type, esize[i]); > > > + test_ring_print_test_string(test_enqdeq_impl[test_idx].desc, > > > + test_enqdeq_impl[test_idx].api_type, esize[i]); > > > > > > /* Create the ring */ > > > r =3D test_ring_create("test_ring_burst_bulk_tests", esize[i], > > > - RING_SIZE, SOCKET_ID_ANY, > > > create_flags); > > > + RING_SIZE, SOCKET_ID_ANY, > > > + test_enqdeq_impl[test_idx].create_flags); > > > > > > /* alloc dummy object pointers */ > > > src =3D test_ring_calloc(RING_SIZE * 2, esize[i]); @@ -420,15 > > > +598,15 @@ test_ring_burst_bulk_tests3(unsigned int api_type, > > > +unsigned int > > > create_flags, > > > > > > printf("fill and empty the ring\n"); > > > for (j =3D 0; j < RING_SIZE / MAX_BULK; j++) { > > > - ret =3D test_ring_enqueue(r, cur_src, esize[i], > > > MAX_BULK, > > > - api_type); > > > + ret =3D test_ring_enq_impl(r, cur_src, esize[i], > > > MAX_BULK, > > > + test_idx); > > > if (ret !=3D MAX_BULK) > > > goto fail; > > > cur_src =3D test_ring_inc_ptr(cur_src, esize[i], > > > MAX_BULK); > > > > > > - ret =3D test_ring_dequeue(r, cur_dst, esize[i], > > > MAX_BULK, > > > - api_type); > > > + ret =3D test_ring_deq_impl(r, cur_dst, esize[i], > > > MAX_BULK, > > > + test_idx); > > > if (ret !=3D MAX_BULK) > > > goto fail; > > > cur_dst =3D test_ring_inc_ptr(cur_dst, esize[i], @@ - > > > 465,21 +643,24 @@ test_ring_burst_bulk_tests3(unsigned int api_type, > > > unsigned int create_flags, > > > * Enqueue till the ring is full and dequeue till the ring becomes e= mpty. > > > */ > > > static int > > > -test_ring_burst_bulk_tests4(unsigned int api_type, unsigned int > create_flags, > > > - const char *tname) > > > +test_ring_burst_bulk_tests4(unsigned int test_idx) > > > { > > > struct rte_ring *r; > > > void **src =3D NULL, **cur_src =3D NULL, **dst =3D NULL, **cur_dst = =3D NULL; > > > int ret; > > > unsigned int i, j; > > > - unsigned int num_elems; > > > + unsigned int api_type, num_elems; > > > + > > > + api_type =3D test_enqdeq_impl[test_idx].api_type; > > > > > > for (i =3D 0; i < RTE_DIM(esize); i++) { > > > - test_ring_print_test_string(tname, api_type, esize[i]); > > > + test_ring_print_test_string(test_enqdeq_impl[test_idx].desc, > > > + test_enqdeq_impl[test_idx].api_type, esize[i]); > > > > > > /* Create the ring */ > > > r =3D test_ring_create("test_ring_burst_bulk_tests", esize[i], > > > - RING_SIZE, SOCKET_ID_ANY, > > > create_flags); > > > + RING_SIZE, SOCKET_ID_ANY, > > > + test_enqdeq_impl[test_idx].create_flags); > > > > > > /* alloc dummy object pointers */ > > > src =3D test_ring_calloc(RING_SIZE * 2, esize[i]); @@ -496,8 > > > +677,8 @@ test_ring_burst_bulk_tests4(unsigned int api_type, > > > +unsigned int > > > create_flags, > > > > > > printf("Test enqueue without enough memory space\n"); > > > for (j =3D 0; j < (RING_SIZE/MAX_BULK - 1); j++) { > > > - ret =3D test_ring_enqueue(r, cur_src, esize[i], > > > MAX_BULK, > > > - api_type); > > > + ret =3D test_ring_enq_impl(r, cur_src, esize[i], > > > MAX_BULK, > > > + test_idx); > > > if (ret !=3D MAX_BULK) > > > goto fail; > > > cur_src =3D test_ring_inc_ptr(cur_src, esize[i], @@ - > > > 505,7 +686,7 @@ test_ring_burst_bulk_tests4(unsigned int api_type, > > > unsigned int create_flags, > > > } > > > > > > printf("Enqueue 2 objects, free entries =3D MAX_BULK - 2\n"); > > > - ret =3D test_ring_enqueue(r, cur_src, esize[i], 2, api_type); > > > + ret =3D test_ring_enq_impl(r, cur_src, esize[i], 2, test_idx); > > > if (ret !=3D 2) > > > goto fail; > > > cur_src =3D test_ring_inc_ptr(cur_src, esize[i], 2); @@ -517,8 > > > +698,8 @@ test_ring_burst_bulk_tests4(unsigned int api_type, > > > +unsigned int > > > create_flags, > > > else > > > num_elems =3D MAX_BULK; > > > /* Always one free entry left */ > > > - ret =3D test_ring_enqueue(r, cur_src, esize[i], num_elems, > > > - api_type); > > > + ret =3D test_ring_enq_impl(r, cur_src, esize[i], num_elems, > > > + test_idx); > > > if (ret !=3D MAX_BULK - 3) > > > goto fail; > > > cur_src =3D test_ring_inc_ptr(cur_src, esize[i], MAX_BULK - 3); > @@ > > > -528,15 +709,15 @@ test_ring_burst_bulk_tests4(unsigned int > > > api_type, unsigned int create_flags, > > > goto fail; > > > > > > printf("Test enqueue for a full entry\n"); > > > - ret =3D test_ring_enqueue(r, cur_src, esize[i], MAX_BULK, > > > - api_type); > > > + ret =3D test_ring_enq_impl(r, cur_src, esize[i], MAX_BULK, > > > + test_idx); > > > if (ret !=3D 0) > > > goto fail; > > > > > > printf("Test dequeue without enough objects\n"); > > > for (j =3D 0; j < RING_SIZE / MAX_BULK - 1; j++) { > > > - ret =3D test_ring_dequeue(r, cur_dst, esize[i], > > > MAX_BULK, > > > - api_type); > > > + ret =3D test_ring_deq_impl(r, cur_dst, esize[i], > > > MAX_BULK, > > > + test_idx); > > > if (ret !=3D MAX_BULK) > > > goto fail; > > > cur_dst =3D test_ring_inc_ptr(cur_dst, esize[i], @@ - > > > 544,7 +725,7 @@ test_ring_burst_bulk_tests4(unsigned int api_type, > > > unsigned int create_flags, > > > } > > > > > > /* Available memory space for the exact MAX_BULK entries > */ > > > - ret =3D test_ring_dequeue(r, cur_dst, esize[i], 2, api_type); > > > + ret =3D test_ring_deq_impl(r, cur_dst, esize[i], 2, test_idx); > > > if (ret !=3D 2) > > > goto fail; > > > cur_dst =3D test_ring_inc_ptr(cur_dst, esize[i], 2); @@ -554,8 > > > +735,8 @@ test_ring_burst_bulk_tests4(unsigned int api_type, > > > +unsigned int > > > create_flags, > > > num_elems =3D MAX_BULK - 3; > > > else > > > num_elems =3D MAX_BULK; > > > - ret =3D test_ring_dequeue(r, cur_dst, esize[i], num_elems, > > > - api_type); > > > + ret =3D test_ring_deq_impl(r, cur_dst, esize[i], num_elems, > > > + test_idx); > > > if (ret !=3D MAX_BULK - 3) > > > goto fail; > > > cur_dst =3D test_ring_inc_ptr(cur_dst, esize[i], MAX_BULK - 3); > @@ > > > -816,22 +997,7 @@ static int > > > test_ring(void) > > > { > > > int32_t rc; > > > - unsigned int i, j; > > > - const char *tname; > > > - > > > - static const struct { > > > - uint32_t create_flags; > > > - const char *name; > > > - } test_sync_modes[] =3D { > > > - { > > > - RING_F_MP_RTS_ENQ | RING_F_MC_RTS_DEQ, > > > - "Test MT_RTS ring", > > > - }, > > > - { > > > - RING_F_MP_HTS_ENQ | RING_F_MC_HTS_DEQ, > > > - "Test MT_HTS ring", > > > - }, > > > - }; > > > + unsigned int i; > > > > > > /* Negative test cases */ > > > if (test_ring_negative_tests() < 0) @@ -848,65 +1014,24 @@ > > > test_ring(void) > > > * The test cases are split into smaller test cases to > > > * help clang compile faster. > > > */ > > > - tname =3D "Test standard ring"; > > > - > > > - for (j =3D TEST_RING_ELEM_BULK; j <=3D TEST_RING_ELEM_BURST; j <<= =3D 1) > > > - for (i =3D TEST_RING_THREAD_DEF; > > > - i <=3D TEST_RING_THREAD_MPMC; i > > > <<=3D 1) > > > - if (test_ring_burst_bulk_tests1(i | j, 0, tname) < 0) > > > - goto test_fail; > > > - > > > - for (j =3D TEST_RING_ELEM_BULK; j <=3D TEST_RING_ELEM_BURST; j <<= =3D 1) > > > - for (i =3D TEST_RING_THREAD_DEF; > > > - i <=3D TEST_RING_THREAD_MPMC; i > > > <<=3D 1) > > > - if (test_ring_burst_bulk_tests2(i | j, 0, tname) < 0) > > > - goto test_fail; > > > - > > > - for (j =3D TEST_RING_ELEM_BULK; j <=3D TEST_RING_ELEM_BURST; j <<= =3D 1) > > > - for (i =3D TEST_RING_THREAD_DEF; > > > - i <=3D TEST_RING_THREAD_MPMC; i > > > <<=3D 1) > > > - if (test_ring_burst_bulk_tests3(i | j, 0, tname) < 0) > > > - goto test_fail; > > > - > > > - for (j =3D TEST_RING_ELEM_BULK; j <=3D TEST_RING_ELEM_BURST; j <<= =3D 1) > > > - for (i =3D TEST_RING_THREAD_DEF; > > > - i <=3D TEST_RING_THREAD_MPMC; i > > > <<=3D 1) > > > - if (test_ring_burst_bulk_tests4(i | j, 0, tname) < 0) > > > - goto test_fail; > > > - > > > - /* Burst and bulk operations with MT_RTS and MT_HTS sync modes > > > */ > > > - for (i =3D 0; i !=3D RTE_DIM(test_sync_modes); i++) { > > > - for (j =3D TEST_RING_ELEM_BULK; j <=3D TEST_RING_ELEM_BURST; > > > - j <<=3D 1) { > > > - > > > - rc =3D test_ring_burst_bulk_tests1( > > > - TEST_RING_THREAD_DEF | j, > > > - test_sync_modes[i].create_flags, > > > - test_sync_modes[i].name); > > > - if (rc < 0) > > > - goto test_fail; > > > - > > > - rc =3D test_ring_burst_bulk_tests2( > > > - TEST_RING_THREAD_DEF | j, > > > - test_sync_modes[i].create_flags, > > > - test_sync_modes[i].name); > > > - if (rc < 0) > > > - goto test_fail; > > > - > > > - rc =3D test_ring_burst_bulk_tests3( > > > - TEST_RING_THREAD_DEF | j, > > > - test_sync_modes[i].create_flags, > > > - test_sync_modes[i].name); > > > - if (rc < 0) > > > - goto test_fail; > > > - > > > - rc =3D test_ring_burst_bulk_tests3( > > > - TEST_RING_THREAD_DEF | j, > > > - test_sync_modes[i].create_flags, > > > - test_sync_modes[i].name); > > > - if (rc < 0) > > > - goto test_fail; > > > - } > > > + for (i =3D 0; i !=3D RTE_DIM(test_enqdeq_impl); i++) { > > > + > > > + > > > + rc =3D test_ring_burst_bulk_tests1(i); > > > + if (rc < 0) > > > + goto test_fail; > > > + > > > + rc =3D test_ring_burst_bulk_tests2(i); > > > + if (rc < 0) > > > + goto test_fail; > > > + > > > + rc =3D test_ring_burst_bulk_tests3(i); > > > + if (rc < 0) > > > + goto test_fail; > > > + > > > + rc =3D test_ring_burst_bulk_tests4(i); > > > + if (rc < 0) > > > + goto test_fail; > > > } > > > > > > /* dump the ring status */ > > > -- > > > 2.17.1