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 94946A04B8; Tue, 5 May 2020 16:27:45 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id 078B81D5C1; Tue, 5 May 2020 16:27:45 +0200 (CEST) Received: from mga14.intel.com (mga14.intel.com [192.55.52.115]) by dpdk.org (Postfix) with ESMTP id 9EA681D5BF for ; Tue, 5 May 2020 16:27:42 +0200 (CEST) IronPort-SDR: ay60zKGplQDsv4g6eIx6vO/ko7s5q6XSoqydCfacx02SjdrD518U7TkBLGy691CyDC8nSjt2ZE w4STbOP8s6DQ== X-Amp-Result: SKIPPED(no attachment in message) X-Amp-File-Uploaded: False Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga103.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 May 2020 07:27:41 -0700 IronPort-SDR: swEk5JrPxLif/6wkWfObyoKNRyLZlcDupPNzafYLArIh1VM/IJntke54llas/K22CBgpLzouCG manHVL6hMUnQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.73,355,1583222400"; d="scan'208";a="294984731" Received: from fmsmsx103.amr.corp.intel.com ([10.18.124.201]) by fmsmga002.fm.intel.com with ESMTP; 05 May 2020 07:27:41 -0700 Received: from fmsmsx120.amr.corp.intel.com (10.18.124.208) by FMSMSX103.amr.corp.intel.com (10.18.124.201) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 5 May 2020 07:27:41 -0700 Received: from FMSEDG001.ED.cps.intel.com (10.1.192.133) by fmsmsx120.amr.corp.intel.com (10.18.124.208) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 5 May 2020 07:27:41 -0700 Received: from NAM12-BN8-obe.outbound.protection.outlook.com (104.47.55.168) by edgegateway.intel.com (192.55.55.68) with Microsoft SMTP Server (TLS) id 14.3.439.0; Tue, 5 May 2020 07:27:40 -0700 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=ANWrDkc2vupYZphd/xMUzWQhrKejBkEhzsPQQc62Do1avddFsD9HHeI1G0++S4qPpFZCvwe6igFhVm/XntBIZERKsURZatpIjCPcyTF0EW2X0eJzB+yJr5Bave+4+ekOxBN/pmcTmkfAXn1MHSFUOPEz1RmRCZjHj35eBxiXGrT7ooK1qDj+lZPQFjnSMnmrG9PyiKtS/KhhT7mqcGUWjbQU/yJvAgB+5B/L6Qu29jXydbZMIIF49sLYOkgyCs8pTLC2SD+uE3naFeSliKy0m0bYVBSVakA92geUkxN65kEg7P3EtJKPLGET0Uuse6OsH6h63DqFIb57ab/fPb5YWg== 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=haZkKoVrPvVtSfOMvspVUramonUBE72QS6G2hLycVKQ=; b=TD3xM6rrVJ36M0ppWhEB+kFYG0p/C6a9hSUPWLuFIFeQj0wQGjWZ4vzl71OeEk9Bnkkf5rYAWILwvod23inTSNg1swCg4GVl2keDnU2vijkvVgsdN3kB5o3Q665OaJBEEqMrBswltBka4tREf15nF9k29j8yunbQRezRSIhP39mxVw8U2K6BiK1Bmcg0+wqFxgOLEWZxJ6HpBwF5L5UMi1kMl0m/uFJ8F5wzrvIQQZ4IZaHQG2bhfRSPmKZpD/jMcR8iq8ga3EvF4pcRZ5h9ZyPO3EkV93+UmhSATBDntZSIse6YX4iuQkud7pafOLK3zD9HgRyF+gKUhNZDUNKOTQ== 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=haZkKoVrPvVtSfOMvspVUramonUBE72QS6G2hLycVKQ=; b=RBl9ft/NipNj4agJp/3QXMhWZoPxpwDQ4fb6zgtk2KcxuaRMBGNfAyxUGnQTBdT4SvVnsBAjboTjaQcVycofxwPNuivct2IdYOwLLY2SaroOmO8WG9XCdOf+ffjLztB/oI/wQhVDitQcRISAaRqv8XjZlLriNHQn2AyvRC6fPNA= Received: from BYAPR11MB3301.namprd11.prod.outlook.com (2603:10b6:a03:7f::26) by BYAPR11MB3733.namprd11.prod.outlook.com (2603:10b6:a03:fb::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.2958.29; Tue, 5 May 2020 14:27:38 +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 14:27:38 +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+FfCAAd3OAIAF4jmwgAAsKwCAAAFFAA== Date: Tue, 5 May 2020 14:27:38 +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: c477706c-e6b1-416d-a397-08d7f1007697 x-ms-traffictypediagnostic: BYAPR11MB3733: 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: rp7TEBDtBW1mzedmne9CcRdtLBuHmY7uuJ0wr3vsBmW1NWuRztt383oGZpXI805B57wBq4m7/8sVuz+ldtoO5FxJQXqqxFSHypBswMHyf21s5ACeYensHqZgyG0NF89AuNOt7CkU2C2p2FRcyz7bEj7aut3wEGoXOKMSerbAsgHhqPP8KyoEi45FO8jTRnqYrckRwRsPvD3z+lCz8MSDSAw4w3ZuyUnmL9fJ3r3p+tcHrQUSS5mZu4U1JAv69XMGWbCOOjK2uLGc8ukDzGOJU0jM0f/VQUScEV71wxeLO17xMNPt/kwopaKHbuyMthgp9axCJssjr3EH8aoAD1SwEXQvYnGnqFhPynv+D9mQ/MNtQ6N1QfnoIgSzIto/9kZ6u/cjtP0edr3TarWtTbzC3O80JvB9azpHnJHL5xtv0FVsTAdHqaIIrp43Bfu7yJSr/is/yvTlNibVAD+xAnBCqNgZIsE+Y1xws+3ITbNgGJAIug1Z4gJ55gxp8e+BQccAcPjcCNYAaxrOWbU88Iy6N8+Va/D13H6LnM3x3uoqJmSBzF7FNhpXUfpkgugT62Z6Y7A+lJ6YBBVQcwLFlYSTXDhXE6yaCKoqD1fjH17MYeQ= 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:(396003)(39860400002)(136003)(376002)(366004)(346002)(33430700001)(5660300002)(55016002)(8676002)(9686003)(33656002)(33440700001)(316002)(54906003)(71200400001)(110136005)(478600001)(4326008)(52536014)(966005)(26005)(2906002)(66946007)(76116006)(30864003)(86362001)(186003)(64756008)(66476007)(66446008)(66556008)(6506007)(8936002)(7696005)(53546011)(579004)(559001); DIR:OUT; SFP:1102; x-ms-exchange-antispam-messagedata: d5XBvR9ILdCiCPSNt3ujVlj8xlQocrc9y8mJ9Hbeta8Kt93B2sIurZVl2m8WmzMP/ui7lMClgxfI1KKWVbzXsY2+/gUkJc06nd4VAfYc35FDoqVUqZ9TJ5dj4ZL7Iwh0QeyyMVbavcpw3MXA8RcNdBn/jfNewJzV7NpokxeFXTzlIAy4Fy8EL+Mi/1m1CiQc71gwBUdTfCRNXqaMrGQiLvaKT8jwdzzWsI3lQzR9OgH258JgizICSshpUe7iRoNUcD7tDxbnSeM6dVKgFahhEvis/FjWU7f9qj2DHMosnLAnaS41FEQGmbrswJyjHmCSQBS1PHLtotSC9xVIzMWdYw/Prs5y+/XMB4M6FS2hPHeC+o3H5QA0LzuulISX+COB5+zPsw9xgEqPauvhOlNS4DOp1GwskctwOideMZzweoRHHmSeqZpFHno20TrvvvlDNmtI6N12EjYk8QCZar2KdQ3eIzJL/l85/lv1I61KGVB1jhTPwHGjlDxd0UoFRqBk6GWyYUYqf4k1Z8qKdxn5PpxgbmVb184JWAFx0AdXTVIaU2ifFOVXk4PPmB/R/JnJSaPwnJJRxGdjqMKJiPgr55/KArBTaHcNRzbPFKA4t6XmPIoViWDEL3sUWJvqUlAlSrPEwTIYX46rMSOUCudaz5vlqGPCk+JykAduRF2HdP/vZ4BB+5AISnxkX1szMPCOIIwCXmDq+yjLVUOYwy0D4zqCpWJl5ttbmW8sgLGemzKpWjAfSKdw7aMzWKK8aKr9rEup0uD2Ibs/prrrdN4PwHlT62muTe4jdPJOSIBDQs2WqLxJjRtgUSLUEBQ6WMir 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: c477706c-e6b1-416d-a397-08d7f1007697 X-MS-Exchange-CrossTenant-originalarrivaltime: 05 May 2020 14:27:38.5409 (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: L4stXXP7hh6b6mIk/bLwEhUheThrcYOwZdPIy3t0rAMhTxys04KTqfNetWy0NfcEao21CwGv1q3D4/CHr69i/8BkQL5BhiW20GbZVXTjszs= X-MS-Exchange-Transport-CrossTenantHeadersStamped: BYAPR11MB3733 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 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 th= e > > > > > 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 pa= tch 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_ri= ng() 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? Which ones? AFAIK all ring dequeue/enqueue functions are inline right now. > I want to make sure that the library functions '__rte_ring_enqueue_elems'= and > '__rte_ring_dequeue_elems' are optimized. >=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 sur= e. > > 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 = see that it is a compile time constant. That was my expectation too, but that not what I am seeing. =20 > > > > > But, can you do similar > > > change to test_ring_perf.c to keep it consistent? > > > > In principle it is doable, but needs extra care. > > We need to make sure that compiler will be able to inline functions via > > pointers. > > AFAIK, gcc does that with -O3', but not with '-O2'. > If the unwanted code is not removed during compilation, we will see it af= fect the performance numbers. Exactly.=20 The last thing I want - someone who uses older version of compiler, etc., will start to see lower performance numbers with that test.=20 =20 > > Don't know what the story with clang and different versions of the comp= iler. > > Is there any real need for that? > > On my box test_ring_perf.c compilation takes ~8s. > > Konstantin > > > > > > > > > > > > > > > Main intention in my changes was to avoid using > > > > test_ring_enqueue/test_ring_dequeue, > > > > as it seems too many branches here and it takes compiler a lot of > > > > effort to resolve all of them at compile time. > > > > So I replaced it with array of function pointers > > > > (test_enqdeq_impl[]) and iterating over it. > > > > That way compiler knows straightway which function to use. > > > > > > > > > Can you please check this? https://patches.dpdk.org/patch/69567/ > > > > > > > > As I can see your approach reduces number of test-cases by factor o= f 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 differen= t > > > scenarios with the same APIs. So, distributed the esize across differ= ent 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= 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 in= t > > > > 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, **cu= r_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,1= 7 > > > > > > +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 in= t > > > > 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, **cu= r_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,3= 9 > > > > > > +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 in= t > > > > 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, **cu= r_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,1= 5 > > > > > > +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 bec= omes empty. > > > > > > */ > > > > > > static int > > > > > > -test_ring_burst_bulk_tests4(unsigned int api_type, unsigned in= t > > > > 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, **cu= r_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