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 4E5DBA04AF; Tue, 5 May 2020 20:14:08 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id E10BA1D6A5; Tue, 5 May 2020 20:14:07 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2062.outbound.protection.outlook.com [40.107.22.62]) by dpdk.org (Postfix) with ESMTP id E596B1D6A0 for ; Tue, 5 May 2020 20:14:05 +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=pLjC1az5XWB91v4oSUVnbt7p6dcdQc919T5hiP4GyIE=; b=ra584GaxNgk9fbWv+CtqaHn2zKtdc80Pv8QUTKLXCh9bJvHLwSj4twlqnK/EdAmmK9cjxTjiiozA3ihiNgqpXpRswknVVaJZlkakUjgNyZtXX4IkHAdNLnC+Q+23wa/9bPIYl8z1Y4B56L4hYr2FnHDgoDeOnqlU4dblsoM9l1A= Received: from DB6P192CA0011.EURP192.PROD.OUTLOOK.COM (2603:10a6:4:b8::21) by AM5PR0802MB2580.eurprd08.prod.outlook.com (2603:10a6:203:a2::12) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.19; Tue, 5 May 2020 18:14:03 +0000 Received: from DB5EUR03FT062.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:b8:cafe::91) by DB6P192CA0011.outlook.office365.com (2603:10a6:4:b8::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.26 via Frontend Transport; Tue, 5 May 2020 18:14:03 +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 DB5EUR03FT062.mail.protection.outlook.com (10.152.20.197) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20 via Frontend Transport; Tue, 5 May 2020 18:14:03 +0000 Received: ("Tessian outbound 567b75aed2b9:v54"); Tue, 05 May 2020 18:14:02 +0000 X-CR-MTA-TID: 64aa7808 Received: from 94943b8eab69.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 6FB3BB64-8ED4-48EE-9D96-62638C31D3A2.1; Tue, 05 May 2020 18:13:57 +0000 Received: from EUR04-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id 94943b8eab69.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 05 May 2020 18:13:57 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=isiy/Hr4qfqBj4JBT07CjXSTOFv4QNFuw0/RluD6EstDfXIeJ4G63jzRfuwDX3uT0af3HSGetS2PyVLF5lXTK41Dma8ehxBuZTBdgd7HRuL41yv7CdR1lD0q9hMksqtzB4rA7S41LEmhv5OiKF2p7Ov2qwFj0GEu5AjhxixwA08wDATgoJxYU+58kzWpkc6i/enGC62wePOZ9/Rxl8rB3Igrsxyfl5grBZerd3F6LhPY5w2SgRiFIqXuWXTp2fmcGuZa8JlOiDt2psJJ1suZPdHVGZ4Zh/2EVhMRveeM/IZ23QFnFx5QBXB+9ytTsglENQxgT1aFsKqGg0poMrczPQ== 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=pLjC1az5XWB91v4oSUVnbt7p6dcdQc919T5hiP4GyIE=; b=N7vXzUeKP+g03bBErKQqa3RvWRn/obdqhFP9v47Bkz9eoDBhqUlBEryZ0KFZcMtq3+HugQD6184aRBe65XWFf+J0PnxMY4ZHt5bdlFFGo1Yqrk64ZDdCKDqartm+Ux5xRcrWHHQSrAP/d6XqvC9/bPKjooAIMKntzpeH5uMKr9G2o4oMMT+NIoTMQXSNhLdfnUfX6geQDJyYWSLd5oNR4wZoSo8T45LszBtqh9qqE2euOvJWeADtM914SFlmW4M7/luAmK5D4lCLvDFQP5juxoDqBlv5L+R0zNH7rpk9psrFYSFvyfR2WBv3sM0YDMTm1qBhrK8zjvuoDlJXmlC4BQ== 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=pLjC1az5XWB91v4oSUVnbt7p6dcdQc919T5hiP4GyIE=; b=ra584GaxNgk9fbWv+CtqaHn2zKtdc80Pv8QUTKLXCh9bJvHLwSj4twlqnK/EdAmmK9cjxTjiiozA3ihiNgqpXpRswknVVaJZlkakUjgNyZtXX4IkHAdNLnC+Q+23wa/9bPIYl8z1Y4B56L4hYr2FnHDgoDeOnqlU4dblsoM9l1A= Received: from AM6PR08MB4644.eurprd08.prod.outlook.com (2603:10a6:20b:c9::10) by AM6PR08MB4278.eurprd08.prod.outlook.com (2603:10a6:20b:71::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.27; Tue, 5 May 2020 18:13:55 +0000 Received: from AM6PR08MB4644.eurprd08.prod.outlook.com ([fe80::c17e:19ec:d94b:bc23]) by AM6PR08MB4644.eurprd08.prod.outlook.com ([fe80::c17e:19ec:d94b:bc23%3]) with mapi id 15.20.2958.030; Tue, 5 May 2020 18:13:54 +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+l64WNWhz7zUq1AmUBfvaQkqiQx4EwgAD3R4CAAcSWIIAF6VGAgAAjvcCAAAWbAIAAPWng Date: Tue, 5 May 2020 18:13:54 +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: 583e5b72-72b0-41e3-95fe-0cb78b18bda0.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: [70.113.25.165] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: 0ed9970b-18cb-41bb-3906-08d7f12017c1 x-ms-traffictypediagnostic: AM6PR08MB4278:|AM6PR08MB4278:|AM5PR0802MB2580: x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:9508;OLM:9508; x-forefront-prvs: 0394259C80 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: RstfGAvx+w5vK4p8ZDSPLEoYp3PXTUx+ey9mi8bZQpHOKL3eoy0qMisQJDlfzlBQlEWfPCT9rhN6xBK9GTU8zd1qPzpSnjNvbTi/DrSdRISvvCvreasDpzipeiE4L495zCg/S2InF/Md2o4QXiq2xxpsSGWLvRlphuTbyfj205dve61W7TDCoZjzZ6GiNY/+s2Xp3/8Nh5xmB9k8acyVeyJQKPqqkefdjgFqlr32Hys+4Y3HEBYs3qRp629kAkyR/6qW9Znd84AEJvR/Pk+kDPw+u4ooOAYrVqoVarFsnp8c/ZquJTgy9PLPlp0pCx0cbm3IoqfxFV2GW4dWMKwag5PtVXpKvXj01TBW41fXoYinsJIkSdSwGYy0bEs05RVzY02mBDsRKBcK8e48C7Hjf31+rhthnl/Rl3tcdCldc7WtFBwSpoOYwEzJ26Dc/G6O5CaRecd/R48ITClOeYRmAKNdQFkfQS8pKR5gYvz4I5MW28j6AeR7LJHbpkkgc4Hb9N+92N+xOgV36VdQ0H5mGy0qaAN769HqRtmSs90DwltR/8MyKeIPmTkvFB8rtrMmlKeEhCreLG6Ylt9atF4cwFVYtoVrVec3JvuKOMBYUBM= X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:AM6PR08MB4644.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(346002)(366004)(136003)(376002)(396003)(39860400002)(33430700001)(5660300002)(110136005)(26005)(4326008)(54906003)(66446008)(33656002)(64756008)(66556008)(76116006)(316002)(53546011)(186003)(52536014)(86362001)(71200400001)(66476007)(66946007)(33440700001)(6506007)(8936002)(7696005)(478600001)(55016002)(966005)(9686003)(8676002)(30864003)(2906002)(579004)(559001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: MIaCPjbcBl/vynf/Uqhw6H8DNZlahRWROpcbH5r7EmEqysyrL0OfkNgUL6/wmQUdPibX+iIiElEED3QXcDH8nW9y/68yNNeIlPIrtdXgoN6rFdlRyfLNc8wLi0hp1Y/4JbM3ow6a6qQRzKuzaO9ornw4+UxAfprDLdq/ZY8jUD3CRyHYgmFaA+yF1urFVhE4d5VQFsr680WsIkZVE2LunrvTXTe1/nAVW8ga0f4RLyXXHkpKwCtZoeS5wdEtAB2TZEQPPkbKjNnHphYcAkmVKjlbcbrpwvrOvxgpstQ3m8O4UhtGj5iGKUZBo1IGtWRpfEztaYRReWQIRPQXKm80FUqmG7h1hGbsguM8GM6k/oPXhYrpGqE4WQPNh3A0pMtkFYISqkyzKqh08f6r7Y/e2FJOpX0KJdGfSjXQ7HMEAGZyBjA8Cxmox1fV5awbysrLDpAxj8BuAN9utzb/vXtQQefZMzqGi7yWJzufQG0a74n9oZiIE0O+y0avrR7cOacitlDBxx5hELtV3pBGdnzPwxr1jJbtKYh1ewFheYe9MHRkrZ9ejwz1juHMZZ4O/qUPlFRaFqY+EOWSC367ueD7IwzRtejSxJSn+Y9f/x3pFL6S4qk6nrJNy5wt5ob0OriDLzc7aAO2K3HT+Vu0RmAGdQuCs4r9UG1L3dZqWOKrtnD+Hma/79Stp0szvbPIAR6r3K9ms2iVqgMx1zsy555BbzuF+nRZm9mdK6oTrTOuFpTPV+c5l+Jia6/K1dXDdtFZFQiZho3eWz5heotCrT/eC0Y3dNDZE//cyINyiMWCJIY= Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: AM6PR08MB4278 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: DB5EUR03FT062.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)(396003)(376002)(346002)(39860400002)(136003)(46966005)(33430700001)(966005)(186003)(26005)(54906003)(30864003)(7696005)(53546011)(6506007)(336012)(110136005)(55016002)(9686003)(70206006)(81166007)(8936002)(47076004)(8676002)(33656002)(82740400003)(478600001)(70586007)(33440700001)(82310400002)(5660300002)(356005)(316002)(2906002)(86362001)(52536014)(4326008); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: ef046a61-5d73-4e6a-49cb-08d7f120129f X-Forefront-PRVS: 0394259C80 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: A4oLvoU38esMzya8AuFUZlSCte1Kk2SPqe+gIcRmKj7gnQGAhrybKtfC6h3AMGQxd5Ib5bw9zlnA1um2qVJ+f5QRo7L17NMMwULOUN77m+EV1TcInyZq1c1YUbo608309lppFMlQ2ToUfWlhbf2jOKhTL0QLf0RpjQXCaSe8rIyz3+0yHDs/SpdGy1NiwP5lwqtiuucDWxEJOtBEuj8gm6R4sdDUevNWhBFZFGJLDZI7QmEjW2A5fLCBtgGSyhdWMqWW445hAXllqSqMjEtWylMQuMj3YZpnN8myvzQrXn0AZdzJd7m+wIDP1LnhtPA5zV/bXlnnLIN9Lg7j3lnctSk/BgjJcmpd7sWJG4k1O1ZVO32PPBFTACiPu82aSjt+k2B0N33L6H0B3oPTODSrrEXa0OqTSLpLIVyO4J2xrG5w2s5QYfb492izo856zDZaTVMRCJ7OXU/7cG3Cyp6DB7HfoUKEcktrywZWvQ9dd+mNlnkwcjpXxolxM1XZ61A9dYlJiZ/koEQIKgcgh7cq9v+9TDN80G9rGh4HbjZ3JrFvjeNi4TfdZ5pOvpihsek2a2sG1XtlB2e/iiFQrcIzgw+FAG1fcBrfUCqvE2qoSbct9wvDP/dqtvMWuZMA3P5Bi0qjXSKZQHT4dRO4t196Bm16LuUEvs/o8t4AOrazWow= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2020 18:14:03.5921 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 0ed9970b-18cb-41bb-3906-08d7f12017c1 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: AM5PR0802MB2580 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" > > > > > > > > > > > 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 do= ne). > > > > > > > > > > > > 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? > > > > > > > > > > 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 too, I > > > think we can go with your patch. > > > > > > Just to clarify, what I meant: > > > For both binaries (without the patch and with the patch) inside > > > test_ring() I see runtime branches on esize value. > > > Literally the code that corresponds to: > > > if (esize =3D=3D 8) {...} > > > else if (esize =3D=3D 16) {...} > > > else {...} I am not concerned about the functions in test_ring.c. > > Do you see this in the actual ring library functions? >=20 > Which ones? AFAIK all ring dequeue/enqueue functions are inline right now= . Please see below. >=20 > > I want to make sure that the library functions > > '__rte_ring_enqueue_elems' and '__rte_ring_dequeue_elems' are optimized= . Each enqueue/dequeue function ultimately calls these 2 functions. The compi= ler here should remove the 'if (esize =3D=3D 8) {...} else if (esize =3D=3D= 16) {...} else {...}' with just the required piece of code depending on th= e 'esize'. If we can validate that for at least one ring library function u= sed in this patch, we should be good. > > > > > > > > Probably gcc wasn't able to remove it because we use esize[] instead > > > of hard- coded values, might be there is some other reason, I don't k= now > for sure. > > > As it is a functional (not performance) test, I didn't dig further. > > The esize[] array is declared as a const. The compiler should be able t= o see > that it is a compile time constant. >=20 > That was my expectation too, but that not what I am seeing. >=20 > > > > > > > But, can you do similar > > > > change to test_ring_perf.c to keep it consistent? > > > > > > In principle it is doable, but needs extra care. > > > We need to make sure that compiler will be able to inline functions > > > via pointers. > > > AFAIK, gcc does that with -O3', but not with '-O2'. > > If the unwanted code is not removed during compilation, we will see it > affect the performance numbers. >=20 > Exactly. > The last thing I want - someone who uses older version of compiler, etc.,= will > start to see lower performance numbers with that test. >=20 > > > Don't know what the story with clang and different versions of the > compiler. > > > Is there any real need for that? > > > On my box test_ring_perf.c compilation takes ~8s. > > > Konstantin > > > > > > > > > > > > > > > > > > > > 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[]) and iterating over it. > > > > > That way compiler knows straightway which function to use. > > > > > > > > > > > Can you please check this? > > > > > > https://patches.dpdk.org/patch/69567/ > > > > > > > > > > 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 one esize value, correct? > > > > Yes, basically test_ring_burst_bulk_tests[1-4] were covering > > > > different scenarios with the same APIs. So, distributed the esize > > > > across different test > > > functions. > > > > > > > > > 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 > > > > > > > > > > Konstantin > > > > > > > > > > > > > > > > > > -----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 standa= rd 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, unsigned > > > 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, unsigned > > > 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 b= ecomes > empty. > > > > > > > */ > > > > > > > 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