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 17CCCA04B8; Tue, 5 May 2020 13:59:47 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id BBD8E1D5E8; Tue, 5 May 2020 13:59:46 +0200 (CEST) Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id B14B71D5BF for ; Tue, 5 May 2020 13:59:44 +0200 (CEST) IronPort-SDR: JLAQjwtna2/dK/9gVrs+iDxNYuC6G9yBDrHfMV6J9Sf2XgDD1GjCkXUqpCpDbSXegqNr9THwrf Q3IGwpuxaMIQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga006.fm.intel.com ([10.253.24.20]) by fmsmga101.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2020 04:59:43 -0700 IronPort-SDR: b/KL+mSg7jhhel7ToTwhLoNVxQISnO22cQ1KdE2dLwgWQBC1CKF6L0/6XnS/5Tk4ZDfn6PVgLq RoJeYJoRPgmA== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,354,1583222400"; d="scan'208";a="461353388" Received: from orsmsx104.amr.corp.intel.com ([10.22.225.131]) by fmsmga006.fm.intel.com with ESMTP; 05 May 2020 04:59:43 -0700 Received: from orsmsx162.amr.corp.intel.com (10.22.240.85) by ORSMSX104.amr.corp.intel.com (10.22.225.131) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 5 May 2020 04:59:42 -0700 Received: from ORSEDG002.ED.cps.intel.com (10.7.248.5) by ORSMSX162.amr.corp.intel.com (10.22.240.85) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 5 May 2020 04:59:42 -0700 Received: from NAM12-MW2-obe.outbound.protection.outlook.com (104.47.66.42) by edgegateway.intel.com (134.134.137.101) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 5 May 2020 04:59:42 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=KtBsdC/T9CbS+aC6yTImtgKDoglDj/b8Kh0Co+r1U1C9VoyULrKG8wz/Oof0z+uB4JlJqCGUZiW1uNDYxA0hggBRlUK7UM8NXS/o5rlwCH9BBTcBuRU5r1YUYWmkZOkFmktLqxXy6a4MbhL+CdE0NaLUat400j6STJAl0Vzlr/acnkNRk/9/9iWSCW5KTjX+ClniH9h8gHVbzsU7DcWCdJUQ2jhrYSyMtrN3dcJY/Ylpn/YX9nz6J4SPPUzr7QxtGNbWmGu0GWYPkanvdi2T8qwvGmmRwjm226+X0ZrR67Sdgk/2xDeXHc+88YDZ2vJWz+h/wLQwpuVpYiRVDiTe2w== 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=osL4oV2S1BMzw3ry5rPw9H6gKHCpS0+2GH2QC8TMAZI=; b=klwetSiWKig8meraZrgwoquVSRC5uHTrmEBsDZh0Lw1FLOuEJ/npZUJD0aupF/4g9csKneDfM1bl7Bg6uxyJ7F+Eju92rUh7fptDAalP+4s9O/DhKKZSPFAVE6l1MebH2aPL4P38agcGbQwy8uVaUqZbkj2dah1UUDRimM7POqDIpcr3x6dbhKwN0BKk4HOzNYxWxWJ6qzpYrNE8E2Z6z4FyMYyGyNiS/LNIuVXVm2cPFsxzTqVo4Q0nQHo/vjsAs+VCkzAw//b13ckMVU/mcdErPXjwtANOedceQsNcZvYUcVMfxwUMnVZYNqpJF4TK6GJk9+fSoQmvCv8v8Vi8/g== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=pass smtp.mailfrom=intel.com; dmarc=pass action=none header.from=intel.com; dkim=pass header.d=intel.com; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=intel.onmicrosoft.com; s=selector2-intel-onmicrosoft-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=osL4oV2S1BMzw3ry5rPw9H6gKHCpS0+2GH2QC8TMAZI=; b=j5NfKj2F59WqD+5uDB7KxoVSSJ2+iSGsx4vUcfeLfK3FSiSUxlBnASmqrlMWOYxDza225ZDU4x7BjQ46iZ91RSDK2csf/UIivEgOy+UZBuuuJXjRP3AGaYp7Z3EvhxlgVcJXJfvqVaXBRiZU4AEpnjVFXxcBpMMz/95yWOfVy68= Received: from BYAPR11MB3301.namprd11.prod.outlook.com (2603:10b6:a03:7f::26) by BYAPR11MB3448.namprd11.prod.outlook.com (2603:10b6:a03:76::21) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.21; Tue, 5 May 2020 11:59:40 +0000 Received: from BYAPR11MB3301.namprd11.prod.outlook.com ([fe80::f8cb:58cd:e958:fff4]) by BYAPR11MB3301.namprd11.prod.outlook.com ([fe80::f8cb:58cd:e958:fff4%6]) with mapi id 15.20.2958.030; Tue, 5 May 2020 11:59:40 +0000 From: "Ananyev, Konstantin" To: Honnappa Nagarahalli , "dev@dpdk.org" CC: "aconole@redhat.com" , nd , nd Thread-Topic: [PATCH] test/ring: code rework to reduce compilation time Thread-Index: AQHWHk+83qvZh/D4lkSDqayxys8lo6iQ6NuAgAC+FfCAAd3OAIAF4jmw Date: Tue, 5 May 2020 11:59:39 +0000 Message-ID: References: <20200429175714.31141-1-konstantin.ananyev@intel.com> In-Reply-To: Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: dlp-product: dlpe-windows dlp-reaction: no-action dlp-version: 11.2.0.6 authentication-results: arm.com; dkim=none (message not signed) header.d=none;arm.com; dmarc=none action=none header.from=intel.com; x-originating-ip: [192.198.151.181] x-ms-publictraffictype: Email x-ms-office365-filtering-correlation-id: 7bf9db01-4b9f-4aa3-4876-08d7f0ebcaf8 x-ms-traffictypediagnostic: BYAPR11MB3448: x-microsoft-antispam-prvs: x-ms-oob-tlc-oobclassifiers: OLM:9508; x-forefront-prvs: 0394259C80 x-ms-exchange-senderadcheck: 1 x-microsoft-antispam: BCL:0; x-microsoft-antispam-message-info: mR4co0zGokfO/X+KIh+uFInDjcnyqL3zqyeeYYB90ld6DMlE5l4ImW8JQBFxNZA25IJYWL28liuEUFFzq8ccI39E6OfXnVeDJneq+fiMOin5Ch5LoqBdENPESuyPrOw8zKGYRwdziZ+H4nogzz4SZn01mAGQ2+CFcjVA9YgdS7HkHRqAbgXyVVwL9yVL/Sgf5EIc2/tHp5b4AJipyq0wcM7tTOswn7WUC0Pg4cYAeLgr8m39UA0P2gESnlPlGVWB1r8BOcOCFBAX8iYxjQHzuN/9oImABR1iOZzTX+E+Ob/3r25yMsdB2Adyv4ZsqWfP8ZPM/fj5RmzlWyk/uQAJeRkGrhBKv+u/FP/OPfNpGEefMSRyv3y/OI3yYhyWy3/aM7F06zwF1f0MWQ8SG0Rfpty2yWuiFVBj1XGIkED9OMYp9f4NiEqyS5RvSxlvaUmdZx2DDUD5hoV9O61+8/AOxV/x+qNhcrPTwNFj5OJZeRDYs+EXb+i1zLtS7pt46+wFlcLRLpYziMkX258wFv+mXj6yb41nhuIuDNSY96UZl8YOkjEeqijSx0JEHmyJdHGakq1gIxhRFkGj4xlpSGaaFJrYIgPF8vmHtQ2naw5tgCg= x-forefront-antispam-report: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:BYAPR11MB3301.namprd11.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(346002)(376002)(366004)(136003)(39860400002)(396003)(33430700001)(66946007)(66556008)(66446008)(66476007)(2906002)(8936002)(186003)(76116006)(8676002)(478600001)(26005)(33440700001)(966005)(30864003)(64756008)(7696005)(52536014)(71200400001)(53546011)(6506007)(54906003)(4326008)(33656002)(86362001)(316002)(55016002)(110136005)(9686003)(5660300002)(559001)(579004); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: Ipe4y8oSIilsRbfW/U+c4xfjV77QiR2gDjeLtSjKECHqoxCDNpRTEOBU72kC7d3r0Ntb6Ngk6PNdhaoUH7We4iIuT34Q5f4axl3cyJ04MkkeF3JgSXrOepKR956aAydvPUfW1FVFQsyBa1A9EmhFfrtsV5QHh6rk3fxxppaROtcvECTgo9gh7684EoMkcAHj7n6VgbeaCeneKayqKj7HN6mqtIifiIoGL8KQ8jo0WlGuc5C28YlgxkoB3USgAh1X9lCNYAq00thztpMNaYy+EN0CFWPZ64PfPLt3ipefKinNEEH72GT/Pipth81o7KUMPSeJUgaQ17ku3M/rE6LPdwuKpZnYTz2VjCC7fh8t211/xIWHIlqPUGOknmkL9W7QWMLwsct8/72Py3tb2uTaAzK2zoGrc/pZKBN6pyZ0Zet92GdwkGO9uHjBxSq04n1si4w8D0wEQ4rnH4XxQcuevbvzbsj02ON82bRKTpZ8/YsMKVXBnSpNPJYtWmT46xEPgdwoeHDTYY6xsHsR0JaVOFdDCO3YPz9BN/msEQh3LStCy+VXwvCJDQ68OCvVZCwIrjZogPkfrkcdy5bICv6LeEOJmPYokRPJ/BXYdb8QxsxGhz3bai5GDTM+x1OVdMPP8kmDwjW47nQexm89Y02IldFakZLTOxeCNdXAHZ5qsLXk1sirF8C4wMPII1fQ+KtSERkl0F6TCtYcoCuLeYBuf8KZBrlnENiFAV5KuO5uHP1i2NXfBsZMoD6PpODAc0Tq9YIwsnWeWiGrPnoK5b5XUzzw7wcMbyltEZh942nd2uGC1ieIneiX+IdQGgdQK1DZ x-ms-exchange-transport-forked: True Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-CrossTenant-Network-Message-Id: 7bf9db01-4b9f-4aa3-4876-08d7f0ebcaf8 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 May 2020 11:59:40.2878 (UTC) X-MS-Exchange-CrossTenant-fromentityheader: Hosted X-MS-Exchange-CrossTenant-id: 46c98d88-e344-4ed4-8496-4ed7712e255d X-MS-Exchange-CrossTenant-mailboxtype: HOSTED X-MS-Exchange-CrossTenant-userprincipalname: 57FW871v3eB8VydvPncQHQIzc/nolJmQ0XFrAYoQtcjup724gXNbSogxMVLkCWH7opFPxxw5pzVpJvw26/OkBOkrGM043N62bpBz7b/0TlM= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3448 X-OriginatorOrg: intel.com 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 th= e > > > APIs would be used mostly. IMO, the APIs would be used with a constan= t > > value for element size so that the compiler will throw away the unwante= d > > 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 co= py > > functions are kept and the branch decisions are done at run time. > > > Is my understanding correct? > > > > You mean branching on esize[] values? > Yes >=20 > > 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 {...}=20 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.=20 As it is a functional (not performance) test, I didn't dig further. > 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 poi= nters. AFAIK, gcc does that with -O3', but not with '-O2'. 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 =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 effor= t 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 sc= enarios with the same APIs. So, distributed the esize across > different test functions. >=20 > > 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 rin= g'. > > > > > > > + .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, unsi= gned 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, unsi= gned 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_ds= t =3D > > > > NULL; @@ -214,11 +388,13 @@ test_ring_burst_bulk_tests1(unsigned in= t > > > > 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_ds= t =3D > > > > NULL; @@ -303,11 +478,13 @@ test_ring_burst_bulk_tests2(unsigned in= t > > > > 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_ds= t =3D > > > > NULL; @@ -399,11 +575,13 @@ test_ring_burst_bulk_tests3(unsigned in= t > > > > 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_ds= t =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