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 998E5A0522; Thu, 2 Jul 2020 22:47:21 +0200 (CEST) Received: from [92.243.14.124] (localhost [127.0.0.1]) by dpdk.org (Postfix) with ESMTP id EDC5C1D8CB; Thu, 2 Jul 2020 22:47:20 +0200 (CEST) Received: from EUR04-HE1-obe.outbound.protection.outlook.com (mail-eopbgr70058.outbound.protection.outlook.com [40.107.7.58]) by dpdk.org (Postfix) with ESMTP id BEC871D6C9 for ; Thu, 2 Jul 2020 22:47:18 +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=TnCNrcPj9fKudlOLy4ewRn91sgn8/3sk+9s9rPZy4kY=; b=yvOAAHgMHXKK8HWh8PFO9K2sYdKEo40poapFosO6/zpoLpzSeZxlk0frCRHhFuEaWyLSaU+KZQwND49/fXtGMogxb8pk7kdPk9e8Cz4oTJcosB89crx9y35DmJLbXdD6ZDjKf+rz4YL1GtdSK5rIRP1nQZghOE438Sc/GStQfF8= Received: from DB6PR0801CA0050.eurprd08.prod.outlook.com (2603:10a6:4:2b::18) by VI1PR08MB4479.eurprd08.prod.outlook.com (2603:10a6:803:fc::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.20; Thu, 2 Jul 2020 20:47:16 +0000 Received: from DB5EUR03FT020.eop-EUR03.prod.protection.outlook.com (2603:10a6:4:2b:cafe::4d) by DB6PR0801CA0050.outlook.office365.com (2603:10a6:4:2b::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.21 via Frontend Transport; Thu, 2 Jul 2020 20:47:16 +0000 X-MS-Exchange-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 DB5EUR03FT020.mail.protection.outlook.com (10.152.20.134) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.24 via Frontend Transport; Thu, 2 Jul 2020 20:47:16 +0000 Received: ("Tessian outbound 4e683f4039d5:v62"); Thu, 02 Jul 2020 20:47:16 +0000 X-CR-MTA-TID: 64aa7808 Received: from e9b337231106.1 by 64aa7808-outbound-1.mta.getcheckrecipient.com id 74C85489-74B7-4E3A-83E4-3B06840A483A.1; Thu, 02 Jul 2020 20:47:11 +0000 Received: from EUR01-DB5-obe.outbound.protection.outlook.com by 64aa7808-outbound-1.mta.getcheckrecipient.com with ESMTPS id e9b337231106.1 (version=TLSv1.2 cipher=ECDHE-RSA-AES256-GCM-SHA384); Thu, 02 Jul 2020 20:47:11 +0000 ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=SLp9wV0ibTLBPJWqBZ72Ce7a46OKLBDL1j51U4FcQHlxyHIGj7ted5SxnR0U0aRbgMR2K4AnejB8Ebubsvt6lxhk6ujCNYG5Y5ivalHV30zTtS9wZKtwkPaQlkat3Q0gaXbhLSkLO+izjmxe5zhdhXR5KgD6DVyTDwakmrWy2mCGg0mQ3o4teE/LSWxSSNdqXBLX1GrHCoVmToMVL7zwwYjU6pbs0R09psEHR7hxe+AqL5rWn4zT0TlZfXwVcEUq9K2JkulvM8Ew0RZ2BfSgwesuxwDREbgK6mczBnY38sI3K+4m4N6pgKuYGU0xHIX69Xaa254IOztzE/Dc1s7pSQ== 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=TnCNrcPj9fKudlOLy4ewRn91sgn8/3sk+9s9rPZy4kY=; b=UrwvE43J2mpBFk7TFbdZDjidsFsMF47ChJ+E9BN7mgksrVodL4AXbDxag6vlPCd8fp7Fbbzt8kp5Y7Qdk2ie3sPmfnsxzlkSD8yyUkJWjhUix2QnevxGoVP+tZStFICMwIQmVRJiL61nXPGetOyPSBWGk7MFUkKfkNgHGNTWniDr65S/2GqIZXN8TlCPwNQxc9UDXF/UcTOQdhD7pZr4ljN2zNAGI/Utq0n6SRYW00WCOAUYUCb4iZ/mq4H9DoBE3EQnfr+TSA1N7v+T/HuzbvSkXAXlPIl6x+uYt3XUwWlEprubWQXnBWeMO6RWDwRtMvZvevqAOKSG+AWRcus/cQ== 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=TnCNrcPj9fKudlOLy4ewRn91sgn8/3sk+9s9rPZy4kY=; b=yvOAAHgMHXKK8HWh8PFO9K2sYdKEo40poapFosO6/zpoLpzSeZxlk0frCRHhFuEaWyLSaU+KZQwND49/fXtGMogxb8pk7kdPk9e8Cz4oTJcosB89crx9y35DmJLbXdD6ZDjKf+rz4YL1GtdSK5rIRP1nQZghOE438Sc/GStQfF8= Received: from DB6PR0802MB2216.eurprd08.prod.outlook.com (2603:10a6:4:85::9) by DB8PR08MB5292.eurprd08.prod.outlook.com (2603:10a6:10:a6::13) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.3153.20; Thu, 2 Jul 2020 20:47:09 +0000 Received: from DB6PR0802MB2216.eurprd08.prod.outlook.com ([fe80::9d1d:207b:e89d:199d]) by DB6PR0802MB2216.eurprd08.prod.outlook.com ([fe80::9d1d:207b:e89d:199d%10]) with mapi id 15.20.3153.023; Thu, 2 Jul 2020 20:47:09 +0000 From: Honnappa Nagarahalli To: Konstantin Ananyev , "dev@dpdk.org" CC: "aconole@redhat.com" , nd , Honnappa Nagarahalli , "thomas@monjalon.net" , David Marchand , nd Thread-Topic: [PATCH] test/ring: code rework to reduce compilation time Thread-Index: AQHWHk+l64WNWhz7zUq1AmUBfvaQkqj1JnAA Date: Thu, 2 Jul 2020 20:47:09 +0000 Message-ID: References: <20200429175714.31141-1-konstantin.ananyev@intel.com> In-Reply-To: <20200429175714.31141-1-konstantin.ananyev@intel.com> Accept-Language: en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ts-tracking-id: de057697-adb5-414d-9404-91af70a3f12e.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: [217.140.111.135] x-ms-publictraffictype: Email X-MS-Office365-Filtering-HT: Tenant X-MS-Office365-Filtering-Correlation-Id: cf2721a0-c608-4a62-4e08-08d81ec91b0c x-ms-traffictypediagnostic: DB8PR08MB5292:|VI1PR08MB4479: x-ld-processed: f34e5979-57d9-4aaa-ad4d-b122a662184d,ExtAddr x-ms-exchange-transport-forked: True X-Microsoft-Antispam-PRVS: x-checkrecipientrouted: true nodisclaimer: true x-ms-oob-tlc-oobclassifiers: OLM:2733;OLM:2733; x-forefront-prvs: 0452022BE1 X-MS-Exchange-SenderADCheck: 1 X-Microsoft-Antispam-Untrusted: BCL:0; X-Microsoft-Antispam-Message-Info-Original: j7WPyPYl532ZrM3cXUQZDph0RiIz246VUiC5pQ+/5pMXYr6d6rAxBFGwARYzcMyCtZE9P946INZhY8HN6FyEvL3kJ9QV55+aSpO/w8846N+brQYOwRBQHZIcLgNMWHhr07GgRbfuo/KRJd6axs2pQtEMjSD15OaryNMS/LUTqhhWK5PBNIQ7CFYstYKy6enrDT1nJij8iW6dgStXXthnsMUVBrFdUUkOCzlfq4z7I2/EK8IpQQEAU6lHd/bHpalyMa4ioISMopsqgBd+AKG3g9qIBtHFQDzxGf+y4pj5hqQIKoSM5YOg1iyhQ1SsP9p48Ndxrf2B2DUrNJ5xe0AmcpwbyAxX5Zr1v8x21OYoroVYJ+DlB5qRuk8W0YdWs2SCsTRCXYdqG4klji5uVW+hmQ== X-Forefront-Antispam-Report-Untrusted: CIP:255.255.255.255; CTRY:; LANG:en; SCL:1; SRV:; IPV:NLI; SFV:NSPM; H:DB6PR0802MB2216.eurprd08.prod.outlook.com; PTR:; CAT:NONE; SFTY:; SFS:(4636009)(366004)(376002)(39860400002)(396003)(136003)(346002)(33656002)(5660300002)(9686003)(110136005)(8936002)(186003)(71200400001)(4326008)(30864003)(55016002)(8676002)(52536014)(7696005)(2906002)(6506007)(54906003)(83380400001)(66556008)(66946007)(66476007)(86362001)(66446008)(64756008)(316002)(76116006)(966005)(478600001)(26005); DIR:OUT; SFP:1101; x-ms-exchange-antispam-messagedata: d056morQJ8tBI4SzjB5fsJZo5g6gonK59UhrNUWdedOJpoNJ8HXdlAN3ecJ2B4O51oiCurAe4WBDW83glRb1TdNb0RIcMZCSbILgqi3fWheIfk4DG4KWvuVH/SQCLaKIaDGAqxjH44DUgcSRrd0W8FmjUyiwR+CBaB4BKiXifF+yPd8k5VKSbP4Kt9AoDvIxT2TxRBNcE9I7qGg/NPYnpoLxyA9+M6jN+O22Ay8U4MB20mw5NrNVMnTzaVKBYaze4kn5aUbNdm6+GyAdbg/H8iywPGIo5+Ko6DPtMj4usfdf/pXqEASnolKfQrLAXDQN0DUwrmj6utj70xYH2turAo+sBziMpxa9gL1SI1qve8EwIXpHiM/jvPXGcDA8Ugm94lUO1ZyZy4VrW5+btjKgg54CvxeivH8fFBEk6yFPiXD03V/H4A9vkugcJtfQWOuSUGDq8TWn9sEbT7gkD+dIigmcQmTWKuFcaf1wrPs1YzztMaMOFYtfd5hyWb/ySIjz Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable MIME-Version: 1.0 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DB8PR08MB5292 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: DB5EUR03FT020.eop-EUR03.prod.protection.outlook.com X-Forefront-Antispam-Report: CIP:63.35.35.123; CTRY:IE; LANG:en; SCL:1; SRV:; IPV:CAL; SFV:NSPM; H:64aa7808-outbound-1.mta.getcheckrecipient.com; PTR:ec2-63-35-35-123.eu-west-1.compute.amazonaws.com; CAT:NONE; SFTY:; SFS:(4636009)(396003)(376002)(39860400002)(136003)(346002)(46966005)(8676002)(316002)(110136005)(70586007)(47076004)(2906002)(81166007)(33656002)(8936002)(70206006)(83380400001)(82310400002)(82740400003)(54906003)(356005)(966005)(52536014)(55016002)(30864003)(478600001)(5660300002)(7696005)(336012)(9686003)(4326008)(6506007)(186003)(26005)(86362001); DIR:OUT; SFP:1101; X-MS-Office365-Filtering-Correlation-Id-Prvs: 2486cf9a-b702-4492-72c4-08d81ec91715 X-Forefront-PRVS: 0452022BE1 X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: AT0VhTwZ7KoLwZQGVCncjXUbMLbTpbeBvAZbfgXZNy04eTLg9LO6vCr5RSZD0he53Yn6i191o/D4ltq0d08kxN9LCQW46vRdVJbIY94Myjj7dIxv1+2cKTL4P0zWOzPBqcI81UiC8awovX3r/Lc6QWZGoRIby6e2d3vcOHdTwwrPOa68td/0GJHaEKj+sY0kJv6DcYlKBMvSl+0p0mGGtMDLnI2wGcACSWT4f+XLVt+g644Sxxx2tV5h8OJ2fZKuMW3gPFiT/Vw6ejZ/wxsI8kWknIm4g0uex84EmTuunrMir/PfXfupQ2hVMA/viotSxgf4hFxlyz6aQ41MClzRnSzpWdLo+dWK/F492tPiHqp5Ey2ub/p8nLBGeHHrT8VWsmQjlh0y8jpUbt1nQlEZ+mqcWJHdC/Q3vLei89XYgGJwxmi9hYWsBCIeiLwfj8h1I55CbQOwkdkeRHHUAZiG4nBrvuN8aw9q7qc7j7zoaPU= X-OriginatorOrg: arm.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 02 Jul 2020 20:47:16.3786 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: cf2721a0-c608-4a62-4e08-08d81ec91b0c 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-AuthSource: DB5EUR03FT020.eop-EUR03.prod.protection.outlook.com X-MS-Exchange-CrossTenant-AuthAs: Anonymous X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: VI1PR08MB4479 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" >=20 > Rework test code to reduce code complexity for the compiler and bring dow= n > compilation time and memory consumption. >=20 > Signed-off-by: Konstantin Ananyev Thomas has a nit [1]. Otherwise, Acked-by: Honnappa Nagarahalli [1] http://mails.dpdk.org/archives/dev/2020-May/166325.html > --- > app/test/test_ring.c | 373 +++++++++++++++++++++++++++++-------------- > 1 file changed, 249 insertions(+), 124 deletions(-) >=20 > 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 @@ >=20 > static const int esize[] =3D {-1, 4, 8, 16, 20}; >=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", > + .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 i= nt 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 i= nt 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 +3= 78,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_f= lags, > - 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; >=20 > 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]); >=20 > /* 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); >=20 > /* 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 in= t > 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); >=20 > - 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); >=20 > /* 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); >=20 > 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); >=20 > /* 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_f= lags, > - 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; >=20 > 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]); >=20 > /* 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); >=20 > /* 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 in= t > create_flags, > cur_dst =3D dst; >=20 > 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); >=20 > 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); >=20 > 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); >=20 > 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); >=20 > 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); >=20 > 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_f= lags, > - 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; >=20 > 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]); >=20 > /* 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); >=20 > /* 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 in= t > create_flags, >=20 > 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); >=20 > - 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_f= lags, > - 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; >=20 > 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]); >=20 > /* 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); >=20 > /* 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, >=20 > 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, > } >=20 > 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; >=20 > 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; >=20 > 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, > } >=20 > /* 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; >=20 > /* 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; > } >=20 > /* dump the ring status */ > -- > 2.17.1