From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.5 required=3.0 tests=DKIM_INVALID,DKIM_SIGNED, HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI,SIGNED_OFF_BY, SPF_HELO_NONE,SPF_PASS,UNPARSEABLE_RELAY,URIBL_BLOCKED autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 4B1FEC47247 for ; Tue, 5 May 2020 14:17:28 +0000 (UTC) Received: from dpdk.org (dpdk.org [92.243.14.124]) by mail.kernel.org (Postfix) with ESMTP id 8901520675 for ; Tue, 5 May 2020 14:17:27 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="p+NH7BZW"; dkim=fail reason="signature verification failed" (1024-bit key) header.d=armh.onmicrosoft.com header.i=@armh.onmicrosoft.com header.b="p+NH7BZW" DMARC-Filter: OpenDMARC Filter v1.3.2 mail.kernel.org 8901520675 Authentication-Results: mail.kernel.org; dmarc=none (p=none dis=none) header.from=arm.com Authentication-Results: mail.kernel.org; spf=pass smtp.mailfrom=dev-bounces@dpdk.org Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id A5B6B1D5B5; Tue, 5 May 2020 16:17:26 +0200 (CEST) Received: from EUR04-VI1-obe.outbound.protection.outlook.com (mail-eopbgr80084.outbound.protection.outlook.com [40.107.8.84]) by dpdk.org (Postfix) with ESMTP id C114B1D59C for ; Tue, 5 May 2020 16:17:25 +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=sIuRNbwCn/EBHKDXdzWu0cWQqy4i9M4AqGLiXsetR7A=; b=p+NH7BZWEFhNpSWfJ3XObf/GG3JTKjublGZZSEuAxW9WNCV5ELasFCJpR+3+AE4uxLn0gbUPK8PLue5d6hXgxM6g5OMxeJYkRLG92IPygaazQh5NBSVUjn2lcKEGNSZU0gcguIkf2xthKPo8urUS8rN8JFvOEjvnK0WJzzEjCUg= Received: from DB6PR1001CA0037.EURPRD10.PROD.OUTLOOK.COM (2603:10a6:4:55::23) by VI1PR0802MB2576.eurprd08.prod.outlook.com (2603:10a6:800:b4::16) 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 14:17:23 +0000 Received: from DB5EUR03FT008.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:55:cafe::fc) by DB6PR1001CA0037.outlook.office365.com (2603:10a6:4:55::23) 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 14:17:23 +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 DB5EUR03FT008.mail.protection.outlook.com (10.152.20.98) 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 14:17:23 +0000 Received: ("Tessian outbound 4cdf5642225a:v54"); Tue, 05 May 2020 14:17:23 +0000 X-CR-MTA-TID: 64aa7808 Received: from b4808e656120.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 665980A1-B7E5-417C-A692-F9ABA90F4CC3.1; Tue, 05 May 2020 14:17:18 +0000 Received: from EUR05-VI1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id b4808e656120.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Tue, 05 May 2020 14:17:18 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=I3PG8sH15epvJE1zzG8BZlKT3Nl9HOqhHROjwuIStsWiMm+rWk2LLghPqnvdTgsgFC8R1CyEoFumRzNY7vPndkUb4gRfo/HrPpYG3vkSsbzWteeY6GEHa3tD7a6+NYp38C9XIARQcwlmm0V9KAj/lmF3Q0ORonScpRJCTnqGdK7ELwSGIH+24lG49+3/tZkQ+awZSAryM66WMpPslRc484jjkLxhAyLxWQFyv7HCWHnslM0/om16OjXTvjgpHjfrvP+v6xR+Ra15wRRotf+s5aMnOYLpsuJNsi2oJJ9/7ovWppxROp/CJ8FPQBMNMfxbEAhOu+p0fDcm239bm4RNXQ== 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=sIuRNbwCn/EBHKDXdzWu0cWQqy4i9M4AqGLiXsetR7A=; b=cpZ5IRMjjLlBUfptA/0aSYx9fzTCGXIaVRlb2TpdPAHCD7bnk8kEgCq/eNwctFynqOUFArAIOUKqctANvgiFbPht0GYzPVpwvb0arVA5fCL1Gnm9xUXUWicu3GoTfZBS7SIFyW4Cxh2FTUJOTxQNFSbpGClUVGMGkQju8ypzfxsrR3OJDrSHA/wb9sA617IzpYP1kwXRt+SW9Wi+pc5Fr8T3Nq+JVGwLURjcxuVc69oYTJw8m+y6jKNFZ1t5w7isRxG0oB4cUzv1i6s0Qjz3wtt+y9wBhKsMi2Tlvvah0W0xyPvnDGbGOPK+SYfMZgom73gyOTOZbgz1zNr/hwcS4g== 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=sIuRNbwCn/EBHKDXdzWu0cWQqy4i9M4AqGLiXsetR7A=; b=p+NH7BZWEFhNpSWfJ3XObf/GG3JTKjublGZZSEuAxW9WNCV5ELasFCJpR+3+AE4uxLn0gbUPK8PLue5d6hXgxM6g5OMxeJYkRLG92IPygaazQh5NBSVUjn2lcKEGNSZU0gcguIkf2xthKPo8urUS8rN8JFvOEjvnK0WJzzEjCUg= Received: from DBBPR08MB4646.eurprd08.prod.outlook.com (2603:10a6:10:f5::16) by DBBPR08MB4412.eurprd08.prod.outlook.com (2603:10a6:10:ca::14) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.20; Tue, 5 May 2020 14:17:16 +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.030; Tue, 5 May 2020 14:17:16 +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+l64WNWhz7zUq1AmUBfvaQkqiQx4EwgAD3R4CAAcSWIIAF6VGAgAAjvcA= Date: Tue, 5 May 2020 14:17:16 +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: 5388f4f6-edea-4414-8065-97238589ee30.1 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: 47b14ad1-b92a-42ae-5552-08d7f0ff07f2 x-ms-traffictypediagnostic: DBBPR08MB4412:|DBBPR08MB4412:|VI1PR0802MB2576: 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: 7oZqGHSJrndQPACzDTpgrUDSrmGLHILS3RNNWZYXKA6BhH+pcd/HmcxZXUQJNjFK7rt4Eoz7bULewAn99quz8gdS6GZImwrH74H4qNhYmgxdIrpiWwid6XUjkmLj4g/JZxpSQBhQf/C9+MdcSHTXUTyxXSy5QBkS6t+yh00cGpjZAduDeGoQuu8WUQvBeD+YI5hpMfhBySGKV/6Cz3RdbuGwunaryBmTfSS+QfaB+fPx0yVFFCt/SujduP50xdSfdi4WE46JjGFxbYjLn8PNK9DClCZFhILQqXpC+bNPlAb0AZ4q4nwsUaG8qz1Toyg7GEYo34+S8F5dQZ5oxbAt9PBgoytTfMLbgQkDn6nMLxLrKqtdvu+b4SAYwY1+LbTpuQdlY6usu+oFqsRLlCaMBzJPHM3IXJu7gCk7wQ2XhLEhzI3UlG/Bn1l0TUz9ubK5DjaxUUGMPuCkVRLlsASTbn95AXIHEpu1a6o7HW2oBiFJT9cU6tOIQjHanIjfmoz1sJGIFHo/3AkSK6tvIOhZ9V4+YQv8ND/MX4m3MvtSu/Nu0zFSzm/XXq+ALJXz7ClokKUE/5yGgy5eFX7004fQev6B0NIm1emUmGjGxpzadJE= 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)(366004)(346002)(136003)(396003)(376002)(33430700001)(7696005)(316002)(4326008)(53546011)(54906003)(86362001)(6506007)(110136005)(33440700001)(30864003)(26005)(71200400001)(66476007)(64756008)(66556008)(66946007)(8676002)(8936002)(52536014)(66446008)(76116006)(186003)(9686003)(966005)(33656002)(5660300002)(478600001)(55016002)(2906002)(579004)(559001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: Bfv2qD7V3Jvo+sDod6XFEzFQtOvA0NRB0pgLm2TPHR5j98yv44j3Whiam578N2WAQhMMGwNsgeNMrHRHtaTUFN4kTWaNCsrWMZW/uQoIFm11tOSIkJ0BCKDGNC8TLKKDLG6kKNcBwXdxmub+qaUXNlf9V9/dkF3WWjrILvqmTyucXBIFBPygU4tgxqDtWYv46GJVdES6YpnJJr7K4QVEC3GTWT4BHzXhpWh965iKreS2QzJdw2rDA0/u6ynvSIruykCBcrtbW3kAJ8FzGZmzcvKR5YNE+ZeQI9S+kRo5kVK7BbvQjFctTeazaHcm8qHj0FVECOLyHE16rhdLZI9o8FslxHBwz76mV+qavNFS3f26j+nUMnUM4zZPNmWwF4D1XZyvNJxcl6r8LN0FsNdsiJh9mjSHiX3EadYmmnmWVfdM3w4Xrvds6vOkwDMPpxDhm9Mh5qg7IhN1V3Cn6u2tH4mz7mvM6eu68RyxnRa6KKL7/reAFOWk8+FAHxj8SAUHFST3vAoMrg1k/q7DjfTTv+6GjHjr/vCopIpLs+qpr4V945sc7wdcYcqi85opTUzlH6paDHNhAZkLLErZg9kXbGG1SPVtNEBaisokSK+LL8dbYNMV5hins6rhXdAgOvshJ6yovxWvclVm6T6O9UFDG/Le9kdBjlWbAyN56cEL9Bf9Lj/bekoBUxADWwfaAXg/hikMxmvVTFcyhIVdie4uoxJu1/fonUd09hHQ3jeiyF0/k1zMnKAinCGF/F6nYlT7rNV0Z89+MZ96rzqtIlpySlmD8j5eLLra21nSqRuRWP2HuO+SldFKhoEDJfDoioAG Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4412 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: DB5EUR03FT008.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)(346002)(39860400002)(376002)(136003)(46966005)(33430700001)(86362001)(4326008)(6506007)(53546011)(70206006)(186003)(70586007)(26005)(52536014)(110136005)(478600001)(54906003)(316002)(2906002)(336012)(81166007)(356005)(9686003)(5660300002)(55016002)(82310400002)(82740400003)(33656002)(966005)(30864003)(8936002)(7696005)(8676002)(33440700001)(47076004); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 71e2d5ee-27c2-44cc-d840-08d7f0ff039c X-Forefront-PRVS: 0394259C80 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: mRCgKSosaMfcOrSFinv1C8fG6WSmkJWpUoYG+dOkiFgC2qnYsIGQDZewU3nwBLlPADbPolojujrDtib/D9fg8zazpnMAIhKnxIppd88ZQS4gCktIqkdfpxhANN21SPeugdbpcayekxvoJ63L94rxsvXjf0B87Xi8tHEXhblmxxRygp2FQl/EXreAn3cRSDx/VBRvVPuxr2YuKVsxg1KLuQzpuRoHu/1ce2Yq91DFaoaOelwy2EOVO+CfxAQ53j3r+1ETPpqlD+F6Sluqkxi/JP9VxAZM9qTLeCjuBLpGKn1qSudKZBgGFmsGRQrfKaI0HyCT9X41vp10O+7RDvTxXiAsE0jgThxYNWfEaYjDdG9RxFPzgxXtNPZ2Do/l+dz08eENm9ugYE/VpZBr+8eOPdo7K3laDLDHudJvxYIYWiIKbFGogFvE3zJAFmAtPvBbv7ODdTqQANZpM96d8DP8hQ9Z0jyP1L7NtYats1hB7d1jqTnILqY4IYZ8SVAyM10wGZc34caPfCPyIjzri8EbSAH17CTtk2oav6yDD46i+0Ayzf2K2vnAxUF/dRySSfi7sWFZifuYnA/5h5x1ivKiA7SrdGCog3HS6DJYUWbHxtss/o3PrGEY8isPtlwCYvGARdm5dqScA9BFEvuWqfR+vIKtocHUxwUAKsEtBCCL+tc= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 May 2020 14:17:23.6793 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 47b14ad1-b92a-42ae-5552-08d7f0ff07f2 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: VI1PR0802MB2576 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 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? > > > > > > 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 patc= h too, I > think we can go with your patch. >=20 > 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 {...} Do you see this in the actual ring library functions? I want to make sure t= hat the library functions '__rte_ring_enqueue_elems' and '__rte_ring_dequeu= e_elems' are optimized. >=20 > Probably gcc wasn't able to remove it because we use esize[] instead of h= ard- > coded values, might be there is some other reason, I don't know 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 to se= e that it is a compile time constant. >=20 > > But, can you do similar > > change to test_ring_perf.c to keep it consistent? >=20 > 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 affe= ct the performance numbers. > Don't know what the story with clang and different versions of the compil= er. > Is there any real need for that? > On my box test_ring_perf.c compilation takes ~8s. > Konstantin >=20 >=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[]) 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 differen= t 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 standard r= ing'. > > > > > > > > > + .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, un= signed > 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, un= signed > 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 becom= es 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