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 0CA7AA00C5; Fri, 8 May 2020 07:32:36 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 407281DC0D; Fri, 8 May 2020 07:32:36 +0200 (CEST) Received: from EUR05-AM6-obe.outbound.protection.outlook.com (mail-am6eur05on2041.outbound.protection.outlook.com [40.107.22.41]) by dpdk.org (Postfix) with ESMTP id D8B1E1DBE7 for ; Fri, 8 May 2020 07:32:34 +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=3uFDgklLup1p4OcN6M/iyHeJk9mimqcEH/7qITrgfXQ=; b=O0RyPWeD0qyJbmZYED9qseF5iRCU9ZQPRkxF7ejb1MtZ4R7Hr/yhM79OzwdsVV2e1ws+p1/rYLpoOw/E/xbDUWK/jkeEAnl7WQM8e8Yu1gcyWMWbq/DxpuOssSIsqi2tTZkfbz8sGsbOAVKaq2oCaPLdlXVSDzVaNLWvf/Qhwyo= Received: from DBBPR09CA0048.eurprd09.prod.outlook.com (2603:10a6:10:d4::36) by VI1PR0802MB2240.eurprd08.prod.outlook.com (2603:10a6:800:9d::7) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.29; Fri, 8 May 2020 05:32:31 +0000 Received: from DB5EUR03FT003.eop-EUR03.prod.protection.outlook.com (2603:10a6:10:d4:cafe::b4) by DBBPR09CA0048.outlook.office365.com (2603:10a6:10:d4::36) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.27 via Frontend Transport; Fri, 8 May 2020 05:32:31 +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 DB5EUR03FT003.mail.protection.outlook.com (10.152.20.157) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.27 via Frontend Transport; Fri, 8 May 2020 05:32:31 +0000 Received: ("Tessian outbound ff098c684b24:v54"); Fri, 08 May 2020 05:32:31 +0000 X-CR-MTA-TID: 64aa7808 Received: from cffde5855c38.2 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 11473DC7-A4BE-49D7-9870-0795542DB499.1; Fri, 08 May 2020 05:32:26 +0000 Received: from EUR01-HE1-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id cffde5855c38.2 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Fri, 08 May 2020 05:32:26 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=LEJwbMH8Dwy4N06i7hgqNESAUcF++Ur44vlYVH1YwV0gCd7jAE+JD/t6gN+OxEiyB8lQHFJ4K+w2QxRQo8EUsdAm34mg6X4oswhuXjfpTw6sOOt+bi7sXV2iN7+GGErEAuY6xzXAaMvD/wlCBZrtAxERDsdRZ9HU8sIw5rPylCmQu+RY3O0BsVna7SHayXU1lBSDkkWqblhcbIdd3G1rK9gxvq+a5j4ELZOzUszIVN15EwJd6pc4tlK8tpK9F2vprJRm6J2hey0mgj5J3bxNhuI8GFqoe0LDyfbEFd2LOFQbjOSWGV1m+puIhiZagLFWdcEaHPesxnbNJaLlbSWn0Q== 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=3uFDgklLup1p4OcN6M/iyHeJk9mimqcEH/7qITrgfXQ=; b=dI5oOnrjjQulD+DrQqWm+Yk50REIndFgDjf+d3ouPNXdvQSlJyVW8JwYg7W/pgCLRn184w8m6bXrUernX5dfjnMavHXNXPn4/tkgSIxq0FjLQTbWJd1adalLLeaxsB3Sg5d6SkKrWPazwJmnb1UIXIeE2n5Z2OPeM8bThpn9kCw4OEIdrSSuBGKeusRoxa+98WWpbiUaNLFYfE/LNa0aSFMAiLmQnOcVVc1Pn3U5bgMz3mNb60u+ycFkDgd3sqa6D3qSzMh8FFxOrNgeKSuU2dRzUSuQqSsDX5bfmj9MUmCaqiAP6C5QWbLmLuQqlhyl8Fe7BVDpvgWYaF2D7j7Vrw== 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=3uFDgklLup1p4OcN6M/iyHeJk9mimqcEH/7qITrgfXQ=; b=O0RyPWeD0qyJbmZYED9qseF5iRCU9ZQPRkxF7ejb1MtZ4R7Hr/yhM79OzwdsVV2e1ws+p1/rYLpoOw/E/xbDUWK/jkeEAnl7WQM8e8Yu1gcyWMWbq/DxpuOssSIsqi2tTZkfbz8sGsbOAVKaq2oCaPLdlXVSDzVaNLWvf/Qhwyo= Received: from DBBPR08MB4646.eurprd08.prod.outlook.com (2603:10a6:10:f5::16) by DBBPR08MB4838.eurprd08.prod.outlook.com (2603:10a6:10:f6::10) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2979.28; Fri, 8 May 2020 05:32:23 +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.2979.027; Fri, 8 May 2020 05:32:23 +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+l64WNWhz7zUq1AmUBfvaQkqiQx4EwgAD3R4CAAcSWIIAF6VGAgAAjvcCAAAWbAIAAPWnggAAOHQCAA9EGEA== Date: Fri, 8 May 2020 05:32:23 +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: 625b30d5-7a88-4da1-8b7f-af4894d21db4.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: 81b83675-0ea8-45a8-d8fa-08d7f311345d x-ms-traffictypediagnostic: DBBPR08MB4838:|DBBPR08MB4838:|VI1PR0802MB2240: 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: 039735BC4E X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: Afdy6IAiAvLeZkkrpk0iTWnzIE1+qQC/R5C249r9Mr0helSWUqFCSBaasBS3SKblukMVcaBCJsfTDAkJXM1AlIc4IBVohiOgbV60jevS0/mFIyJVJ3muo9FouuGk7kGtwfsgW+8H/mKHdHrOvYGDns4vz9F0cKNqnuyhNIIvtGRb2ZUTK3GtUdhI3WckSxVRp2Bz+gM0v0Ln35qOlRCOso7zX5IOxR32QN4GU9OgGUa9bsqlyDVMkxyJUMcTJhJqFB9dBEUmCNJUNhVffXdIk9aOUoVs5MXJO23RnmCmq9vN9oAUJSHVhaqSvs61ZpRmHQ+e6KKwLi6LAg1qXz088hpW4VYtDnvDAEHVq8Hsv7S5yA+ArGlUsQ/oYifJthd5vsy9z4LX1t+ciStkRjczwvo72ilJv9pYN1XQMvEcjElzdVZ2nQ3HiQ19m0GVNNqrE+2GXC8/ZqTZ/75SaAOUChX18TRIFnS0qgfLMibIiTrifMxpql2WjGTfSWooF1kfFgnxnfDbaBNDVg0AEAlKJrHERMndEWp/ng9sopx0GnQEWds6MmO7V7U/TQmBVzlBVDos1j7cWvsz3Ru2nB5TlOBEvNcGzXqQM2ZSddNrQAjP7I9EJ64ml5FRKLs9sMoX 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)(346002)(39860400002)(396003)(366004)(136003)(376002)(33430700001)(76116006)(54906003)(66446008)(66476007)(66556008)(316002)(86362001)(110136005)(52536014)(55016002)(2906002)(4326008)(9686003)(6506007)(478600001)(30864003)(5660300002)(64756008)(7696005)(66946007)(33656002)(71200400001)(8676002)(966005)(83320400001)(83280400001)(26005)(83310400001)(83290400001)(33440700001)(186003)(8936002)(83300400001)(21314003)(579004)(559001); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: 6j1aR6etYqmfj6Xq0vQvBRuD4HewJleHGCjfItkWYDVpto7/AxVxF+lhMA2N7ye/hErChee5VqSSeyQ9PnulC1+FaC9xQt7Q/ORLYc1A9P/ncoj09/RfvRGAv0niWVuD7TCQqpQzU1wr4fKwsaBRfSvK7HWgIAurt2f7M0imB8vu0w9GW8Ov1/eYAyXKxFjUEhXqIGC7RMoynADw21aFQWpW9Ws7IUl5npZurLS+HXe3aXT2I64A0EQUcN5AuOVfLml2q/qmo852C23IzeWCrqDS18pvF+FWg/hBR7siexMZLKtURzt3YY6G2IpNwQ9MYbUrvFm8lyrP+kvfVhrwpIeVCnaW9/ytFgc5u0e1kIA+duPMUR3rvAAvdQtPbnhTi58o5uKP67GpYkOJFRCFTXCYU3s9pDS9t/7koMHHxECNXxziIyRLZ6fUaRjYJPRpiVvi6ViMKUrPPB5gIRTCu6W+BtVvEmuq4YTBsHJv6hy4nG4EJXi9kjSTub8onRmc Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DBBPR08MB4838 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: DB5EUR03FT003.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)(376002)(396003)(346002)(136003)(39860400002)(46966005)(33430700001)(186003)(966005)(33656002)(8676002)(4326008)(8936002)(70206006)(52536014)(70586007)(336012)(26005)(7696005)(86362001)(6506007)(55016002)(9686003)(110136005)(54906003)(2906002)(316002)(82740400003)(478600001)(47076004)(33440700001)(5660300002)(82310400002)(30864003)(81166007)(356005)(21314003); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 346fbd77-ac2e-4b38-048d-08d7f3112fc2 X-Forefront-PRVS: 039735BC4E X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: J7CtufUtTZDqw6yXnGQDhKuIiE9ITy+khW9wj+S/M+kMVk258vvW5LQVT5Fvq/grRTUAM/jCXoNXGiNRpeK/BsGOW2BlerqpkeS5cXtcuo5ChTQ1x6Q+axE7SntG+pQNr9z+eyTXoAaBVLT23CSGL9kW5inorPFn/V8en2Zxbei8BsYsrYBzIixof8JATph220+/LTbK2mA0QpA8TyHjGX3Lro8l8sAll7OrBAav7dRW+thz8eoiHM0N2FSMIEUoACWSbUfFPhlULIqj2C3tEGLMbGakR8mH6C19baLlh95oOQHNZoSKeUTkmSXiMUQc9+EVOS6keA/HczhqgNiChJFebWn4IKuQ3u9I4GCr6kU9kSZGs+Cd+KWAGdqgeAEPX2Tlt2O2EVm6q/8XVNzkpmcoWvvpZrIM/nWIc/iVM0iLhazwX02lx2fcYLOEMZuAx80q8U1I137EnaFuklazXuuQOworsTf8QUzisxPIlrgjq6eKPbfOR/ZQ8iWjpPzLCvawrpz0+7rX0ngaCh+Qi/Ncs1egFv8xNecw4Ml++aOzeAoa7R/PNGnT3JgOHNUWsJZiWMz4n6Mxk+0uxnM7S66SDNi2PH7W4S0aIXPkbQkzfD2JRnfgYXzYvq60nDtkzsN78j1mZ7Fylqwlbveig9duUOU5S+H8jYdmL425nygq2/QljMwJ1YDnMeE8WOHf X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 08 May 2020 05:32:31.4703 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 81b83675-0ea8-45a8-d8fa-08d7f311345d 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: VI1PR0802MB2240 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 t= ime. > > > > > > > > Is my understanding correct? > > > > > > > > > > > > > > You mean branching on esize[] values? > > > > > > Yes I was wondering where is the confusion. I interpreted as referring to the e= size parameter in rte_ring_xxx_elem APIs. Anyway, please see below. > > > > > > > > > > > > > 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? > > > > > > Which ones? AFAIK all ring dequeue/enqueue functions are inline right > now. > > Please see below. > > > > > > > > > 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. >=20 > Yes, and then each instance of enqueue/dequeue functions that is used by > upper layer would be in-lined. > So what upper layer function (library or app) you asked me to check? I am not bothered much about upper layer functions. I looked at the generat= e code for the function __rte_ring_enqueue_elems. Existing code has the if checks for 8 and 16. Your patch also has the checks. My patch does not have the checks as it passes the constants directly witho= ut using esize[] array in functions test_ring_burst_bulk_tests4. >=20 > > The compiler 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= the > 'esize'. > > If we can validate that for at least one ring library function used 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 know > > > for sure. > > > > > As it is a functional (not performance) test, I didn't dig furthe= r. > > > > The esize[] array is declared as a const. The compiler should be > > > > able to see > > > that it is a compile time constant. > > > > > > That was my expectation too, but that not what I am seeing. > > > > > > > > > > > > > > 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. > > > > > > Exactly. > > > The last thing I want - someone who uses older version of compiler, > > > etc., will start to see lower performance numbers with that test. > > > > > > > > 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 fa= ctor > 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 st= andard > 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 becomes > > > 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 syn= c > > > > > 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