From patchwork Tue Sep 5 11:38:34 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh X-Patchwork-Id: 28366 Return-Path: X-Original-To: patchwork@dpdk.org Delivered-To: patchwork@dpdk.org Received: from [92.243.14.124] (localhost [IPv6:::1]) by dpdk.org (Postfix) with ESMTP id 5BF8C3254; Tue, 5 Sep 2017 13:39:08 +0200 (CEST) Received: from NAM03-BY2-obe.outbound.protection.outlook.com (mail-by2nam03on0080.outbound.protection.outlook.com [104.47.42.80]) by dpdk.org (Postfix) with ESMTP id 8044A2C2F for ; Tue, 5 Sep 2017 13:39:06 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=CAVIUMNETWORKS.onmicrosoft.com; s=selector1-cavium-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=QQlPPutNcamsLqgHTj6O1g9EehPZ6rlP7jhhRpEGa0c=; b=CKiRLyvDGsmhyhfJYgOw5sup2xg6GIk2l+F6of+cQ5jTGSSppjaFPpSIBJOGo9tn0y00PVbKaEUdaj9STfvlCR1mxZc6gU+dgqNP+DBMqmVxJUzFtiokLxWXsQLGL3MqlqF9yCBf+b93qj3N3Zcn9NHDxm6l22nOlA+9aWPVJZw= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from PBHAGAVATULA-LT.caveonetworks.com (111.93.218.67) by CY4PR07MB3464.namprd07.prod.outlook.com (10.171.252.145) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.20.13.10; Tue, 5 Sep 2017 11:39:03 +0000 From: Pavan Nikhilesh To: cristian.dumitrescu@intel.com, stephen@networkplumber.org Cc: dev@dpdk.org, Pavan Bhagavatula Date: Tue, 5 Sep 2017 17:08:34 +0530 Message-Id: <1504611516-27404-1-git-send-email-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 MIME-Version: 1.0 X-Originating-IP: [111.93.218.67] X-ClientProxiedBy: BM1PR01CA0090.INDPRD01.PROD.OUTLOOK.COM (10.174.208.158) To CY4PR07MB3464.namprd07.prod.outlook.com (10.171.252.145) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 07a8dbca-0aae-489d-46a8-08d4f452b633 X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(300000502095)(300135100095)(22001)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:CY4PR07MB3464; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 3:pm15jmhxmvMvnwWTMZErerUcvyDXnI+954L6+Zp+bhc0DfTptTtEjC99uUepSd92iW2gHdc2/qUnDVagoKOZDK7NLhyVFQY2iS1wX7DDSPRnGlSW8wUQJV96RGwspjaXRrNdJet8omSJhbO/IMsZRy1vpkziyPtvX5hWU+TXcAiB9TbI4+SdN9ySOgYPOh/IY/UNqXCVYDQfhRgSqXZ7JKawhlomdj91uJnhZN0qIGVZ9jY61T5l6/EWCfPqQ0J7; 25:EulBmdXB+5JV2gCjtAAXLjfpp7FcS0imIzvejwZax9yLYRxiyrV/O93oECaP7ZpQyovhoGumXxiPVkJACawB4I9cg7XK/TodprJ8GAU1Yhj9zr5z1tDlSxMsR7LkPBhkVsZMA/Nz7rjH3XoEuR4UwxnShFLVm+SJ2gErLl4cqpCY3mqMXljvepaD0LL9eYPDBQxrf4r7G/zay6pPRtShvuPEnDgApwL9VFmNra4MI8EqtS8W4mlpRdDdhhGsKGaboGI9TA5ieuMI8aJqGnvjsUXk2720fX96ExiuEGu3nX/5qxdhPn7nX5XsR33JDwwF507fdMKwe0WRfaTVVS6HqQ==; 31:tepgM2Mz9uDEhqANQeSXL65IaKg3mfNMR0/h5RiaGGIjQdmNtunzqAn+xTz1A9SWXc1M72zKZA+/TJF99/LWD04K/XWkWLDjP9dR9SyusVWb9UotC0JrRMA6Nz+eLKDry3zerYrT6nQmDzx+TrtV/nS4689UtBX0+wFyV1UpL4qaNhaBe0fPevkDQnLSY8hUBnDNyrR+qjlcprM8MLgluGriEaMbCLHRrYBci+iOKcY= X-MS-TrafficTypeDiagnostic: CY4PR07MB3464: X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 20:a/soITSPWWsmfaU9Lo8Sa1rf4dd7O+rkfuFyfEFhkpCV3+cg+luh3Z8AwkE5+FDruGgXZbOm9viqTG2jB10AZm1LOIcqAhlEdTZoaMNDEw8zDtsS75z584C/FQbOdKjImwaclyeEtRvjyna2hsmDeqKgyVbdZ4gIfRwJwSmPrUN+U/5n23QbZ+zu0qTbdLA6/UcLXi1wZXKUCjuVlONExLELaPZA3B9yWxksC4a6CKuGIMkBvByNkNgy6rcAMfDeFHDR+Gh1Zye5rh+wVBOo3CcrxBx4o2TIHnK+Y9CJ6eFaUURC0GRcbBrJu+eYm0eB6fNk8J6fM1rsiYIKOc5RyRnoscz5vp6l45hhp7Al1Zfe5RQYo4vO0tHBpB+0MAERqzU1FDwHSrwYyWKeULXLnSCE72RBGkMN7u2DWEnOPzKU6GHrsRoYAYDaH1OxTtTb4+iBZpW6SeUc5SkSTX4xJx8DqWBVkrGNVT62WUS2aHDauLGCL9i5bQcEQq97J00e4rdIx9/O11iQ4sb/0WowzBsB3PCHuaHwdxQZDXUboRLf81s8y1XVltpUyONPJal8KanYNxFS11ve3p8hBs1/mzyOkMZBrelWzY4zC0KbYnk= X-Exchange-Antispam-Report-Test: UriScan:(278428928389397)(228905959029699); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(2401047)(8121501046)(5005006)(93006095)(100000703101)(100105400095)(10201501046)(3002001)(6041248)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123562025)(20161123555025)(20161123558100)(20161123560025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:CY4PR07MB3464; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:CY4PR07MB3464; X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 4:RxsaKgZ+RbKzWQINGrve8gsn0vEXS/cPpGdQ/4V7OGtYOMxfcNSryd3rAFATGitnqnuPDiQOU1FQ61yZ+i0EJV+zKXk8X5UQn6dSL+SZo9ZjCSaAOz4DdaFuYVE7XEl1rST2LlmB/p21wPriFs2xOnBHkQwibFuI0ZqMzRBexCzCKdTbMVKLdHKyRy9Rm2Ce2GVz3Y3MsmO4RG3kx0M5A5X7aD0kQCgPwCL+kBIZp7Zq4PcgFNOBr1gDCm5ktCPUR8Uxi/1wxlDbSIA957bD+brc4jrxg2SHsQgCwaIz9F09Iujv4i+GvD3y5Umu0f5h9fjLr1kNEizwzPE1v2OlZg== X-Forefront-PRVS: 0421BF7135 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(189002)(199003)(36756003)(68736007)(42186005)(189998001)(50466002)(305945005)(5003940100001)(7736002)(33646002)(66066001)(6512007)(69596002)(8676002)(53936002)(81156014)(81166006)(106356001)(105586002)(48376002)(47776003)(110136004)(53416004)(107886003)(5009440100003)(50986999)(50226002)(8936002)(101416001)(97736004)(6116002)(6506006)(6486002)(3846002)(6666003)(478600001)(42882006)(575784001)(72206003)(5660300001)(25786009)(4326008)(2906002)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:CY4PR07MB3464; H:PBHAGAVATULA-LT.caveonetworks.com; FPR:; SPF:None; PTR:InfoNoRecords; MX:1; A:1; LANG:en; Received-SPF: None (protection.outlook.com: cavium.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; CY4PR07MB3464; 23:SQYsDIi9u+BCFeK/G0zHFihoZvCBUCMFkBIQSKrY1?= EkpnV9+CHzlrdFUlFL8OuipLB3xi8/XNHTiSPrb8nBs7Luk0A2Ru5y30Ro1V1GhZWT4a55vgvk7WqXv9FiDo2q041/zEbH3NSUWJJVG4CWCQlH7iPHP0jAiWpoTTbJzuDIzrHsEkBHVL0rE2XGpHlry6BX+w7HM3eCK8fIMR8XF949yZuuCTcn4iefxZoQ3Ygm5E7fnRi7E6oLjyac4IEJaoLYYx3uRP9jNZLs+2aLc5lb6T0MhjvFlxa281vbYTBMniCEW4lMOmatSOpvmrz2FbktMAmjGvSpBT+em9cyFHDithY7uydsNvytZuqK4ea0jaDZSdYZs5k0CPGwzCAgZMU60IRkOdj4fpgXmM4+PC4P+IrBbHI9qV3IGiF5sxOXGtoieu4o5yVoZNp8MlgeMape2fiG5/Eh2hSZN80RtVYV7cHLWBUlimcT2vHkqljiyBsXDrYvAN6/u7b5teqV9M/k3BXr6lbw0J25x2XpHwbEV7u437Vq5Up6tNiWIwQOE2DiNIXD6KnUZhCP+3c0sK0n/kire+Fn/alNDamCBBBcYGbtreWmcwekQfUm5eok89dglCzoMLoxRlEem0+n3ptswJwQv2WDcAMfWFyIiAy6GCe5z3ICjwaBK5FZ3yCYpgU2hOaJ8r5igh33wJqQjEg9S2oqNt6pd89pQUzak9MROmDaoI8W+FAOkBlcbbJJRJNxeYnXspnDb/UknG3vPfDkXtWsixemN5fHIIIvCPERNQJqZ8zEBrYhARSFnrf0XlrxFH1qH78nR0uWNrfcIwHT8ieoP83VXCgmNhluqE+pFfw5G2zt1wFTFw5I1/yWlgVOqfXGYoQlFvrFjjebgpUEKvKk9t/6sFS8V3CSsl5MQr5sb/WbcEw5MmMN3c71M6FhSEXT2hUEuV7+lyNJgKETzxTvZB2S6lLvsXGDA8EUa9fxvIP/w1FMSGx5Z1KnrRp/mruGO94I0RnP2m7GdV+ZduQq7Hri3h0xL0bhw8OrbwCmHPYplQar1l64EPZPcCslLEjs/YIf88JHSSNXE3A0F6xZ+Chvgnbxvs4O3DewbL12VJkJst4bNtJ/wzaU= X-Microsoft-Exchange-Diagnostics: 1; CY4PR07MB3464; 6:pJQMaW8JcTDOxjyUUb9j4VfECr65fxSUrC8Sj4rtaEQbTM33XQh6G4VdhvwfVVlQ0lPr4f/TFRYal0XMLN6fQs8nT5a/HOq7P+L46IbTvluyQ/ptO53XIVAu+V8fIYt/t+mrv25/yxiMdx54V7OZRiVFO+5dppl21megtEuzPZvk3Qo7ufCkIiWPH9GPY3HiV9/BH8tpMd/oCeazigCJLXQt3N8Vu9tqX5lGFCX0hInLkZOcJJMN5ImzDD7KnjeUNJ4JnFfL5f3eKOLTEKUFEljehEmaDRubcp5yxd9jq1DYELBdwrVYJbtivQlpWwBsPErg17ZqiyhjGn+nWt5dcA==; 5:H/9RxMCYp8il4pQ6C27LE7nUfxePEVNQWQQRAopsGKOea2Rzq+XRn5Hs7APtfDdc4Ggrlvkennpr7Mt+mPbZRGQJAdwVfNvR+iC1jE6BX299IR4MqJf2e1k/zm74vlZgOwko07ifV1JMk8DqSt35HA==; 24:VvokYMPjWOqVhPJbmzG1fnPXyAWdu1HRC/7NQKNqVNdst4SWX2bsnpn931Ou9NoXJpMctaiP3YHYBrUgCH8xQR7Ph2Iz9otz/fkDNjpemXI=; 7:+FQWEDkN2u2xzFObmtDcdTliKFDT2ZNo+Gy5HccZ6sTHuqH3sQ56L42S5LUPVHoUw2S7+/rQL/P3XfzzlFd/PjzlBAyaVPG0epY1xEkL+GszLs/jqthPsmouMGjlDwcjisv4ivHPNwf7kGu7BS6tllBiyXHAnqqP7jRLG4hvHnDnzEBRROTH1uHXJ57mfq96JsxzUAGQwHPyupaWwS1ia2QWGWmufo/TJvJauKjf25g= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 05 Sep 2017 11:39:03.0048 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: CY4PR07MB3464 Subject: [dpdk-dev] [PATCH v5 1/3] eal: introduce integer divide through reciprocal 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" From: Pavan Bhagavatula In some use cases of integer division, denominator remains constant and numerator varies. It is possible to optimize division for such specific scenarios. The librte_sched uses rte_reciprocal to optimize division so, moving it to eal/common would allow other libraries and applications to use it. Signed-off-by: Pavan Nikhilesh Reviewed-by: Anatoly Burakov --- v5 changes: - fix test print strings v4 changes: - minor fix for test cases - fix u32 divisor generation v3 changes: - fix x86_32 compilation issue - fix improper licence in test v2 changes: - fix compilation issues with .map files - add test cases for correctness and performance - remove extra licence inclusion - fix coding style issues lib/librte_eal/bsdapp/eal/Makefile | 1 + lib/librte_eal/bsdapp/eal/rte_eal_version.map | 7 +++++++ lib/librte_eal/common/Makefile | 1 + lib/{librte_sched => librte_eal/common/include}/rte_reciprocal.h | 6 ++++-- lib/{librte_sched => librte_eal/common}/rte_reciprocal.c | 6 ++++-- lib/librte_eal/linuxapp/eal/Makefile | 1 + lib/librte_eal/linuxapp/eal/rte_eal_version.map | 7 +++++++ lib/librte_sched/Makefile | 2 -- lib/librte_sched/rte_sched.c | 2 +- 9 files changed, 26 insertions(+), 7 deletions(-) rename lib/{librte_sched => librte_eal/common/include}/rte_reciprocal.h (87%) rename lib/{librte_sched => librte_eal/common}/rte_reciprocal.c (96%) -- 2.7.4 diff --git a/lib/librte_eal/bsdapp/eal/Makefile b/lib/librte_eal/bsdapp/eal/Makefile index 005019e..56f9804 100644 --- a/lib/librte_eal/bsdapp/eal/Makefile +++ b/lib/librte_eal/bsdapp/eal/Makefile @@ -88,6 +88,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += malloc_elem.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += malloc_heap.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_keepalive.c SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_service.c +SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_reciprocal.c # from arch dir SRCS-$(CONFIG_RTE_EXEC_ENV_BSDAPP) += rte_cpuflags.c diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index 79e7d31..d0bda66 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -238,3 +238,10 @@ EXPERIMENTAL { rte_service_unregister; } DPDK_17.08; + +DPDK_17.11 { + global: + + rte_reciprocal_value; + +} DPDK_17.08; diff --git a/lib/librte_eal/common/Makefile b/lib/librte_eal/common/Makefile index e8fd67a..a680b2d 100644 --- a/lib/librte_eal/common/Makefile +++ b/lib/librte_eal/common/Makefile @@ -42,6 +42,7 @@ INC += rte_hexdump.h rte_devargs.h rte_bus.h rte_dev.h rte_vdev.h INC += rte_pci_dev_feature_defs.h rte_pci_dev_features.h INC += rte_malloc.h rte_keepalive.h rte_time.h INC += rte_service.h rte_service_component.h +INC += rte_reciprocal.h GENERIC_INC := rte_atomic.h rte_byteorder.h rte_cycles.h rte_prefetch.h GENERIC_INC += rte_spinlock.h rte_memcpy.h rte_cpuflags.h rte_rwlock.h diff --git a/lib/librte_sched/rte_reciprocal.h b/lib/librte_eal/common/include/rte_reciprocal.h similarity index 87% rename from lib/librte_sched/rte_reciprocal.h rename to lib/librte_eal/common/include/rte_reciprocal.h index 5e21f09..b6d752f 100644 --- a/lib/librte_sched/rte_reciprocal.h +++ b/lib/librte_eal/common/include/rte_reciprocal.h @@ -29,13 +29,15 @@ struct rte_reciprocal { uint8_t sh1, sh2; }; -static inline uint32_t rte_reciprocal_divide(uint32_t a, struct rte_reciprocal R) +static inline uint32_t +rte_reciprocal_divide(uint32_t a, struct rte_reciprocal R) { uint32_t t = (uint32_t)(((uint64_t)a * R.m) >> 32); return (t + ((a - t) >> R.sh1)) >> R.sh2; } -struct rte_reciprocal rte_reciprocal_value(uint32_t d); +struct rte_reciprocal +rte_reciprocal_value(uint32_t d); #endif /* _RTE_RECIPROCAL_H_ */ diff --git a/lib/librte_sched/rte_reciprocal.c b/lib/librte_eal/common/rte_reciprocal.c similarity index 96% rename from lib/librte_sched/rte_reciprocal.c rename to lib/librte_eal/common/rte_reciprocal.c index 652f023..7ab99b4 100644 --- a/lib/librte_sched/rte_reciprocal.c +++ b/lib/librte_eal/common/rte_reciprocal.c @@ -41,7 +41,8 @@ /* find largest set bit. * portable and slow but does not matter for this usage. */ -static inline int fls(uint32_t x) +static inline int +fls(uint32_t x) { int b; @@ -53,7 +54,8 @@ static inline int fls(uint32_t x) return 0; } -struct rte_reciprocal rte_reciprocal_value(uint32_t d) +struct rte_reciprocal +rte_reciprocal_value(uint32_t d) { struct rte_reciprocal R; uint64_t m; diff --git a/lib/librte_eal/linuxapp/eal/Makefile b/lib/librte_eal/linuxapp/eal/Makefile index 90bca4d..98f3b8e 100644 --- a/lib/librte_eal/linuxapp/eal/Makefile +++ b/lib/librte_eal/linuxapp/eal/Makefile @@ -100,6 +100,7 @@ SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += malloc_elem.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += malloc_heap.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_keepalive.c SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_service.c +SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_reciprocal.c # from arch dir SRCS-$(CONFIG_RTE_EXEC_ENV_LINUXAPP) += rte_cpuflags.c diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index 468c706..65117cb 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -243,3 +243,10 @@ EXPERIMENTAL { rte_service_unregister; } DPDK_17.08; + +DPDK_17.11 { + global: + + rte_reciprocal_value; + +} DPDK_17.08; diff --git a/lib/librte_sched/Makefile b/lib/librte_sched/Makefile index 18274e7..569656b 100644 --- a/lib/librte_sched/Makefile +++ b/lib/librte_sched/Makefile @@ -52,10 +52,8 @@ LIBABIVER := 1 # all source are stored in SRCS-y # SRCS-$(CONFIG_RTE_LIBRTE_SCHED) += rte_sched.c rte_red.c rte_approx.c -SRCS-$(CONFIG_RTE_LIBRTE_SCHED) += rte_reciprocal.c # install includes SYMLINK-$(CONFIG_RTE_LIBRTE_SCHED)-include := rte_sched.h rte_bitmap.h rte_sched_common.h rte_red.h rte_approx.h -SYMLINK-$(CONFIG_RTE_LIBRTE_SCHED)-include += rte_reciprocal.h include $(RTE_SDK)/mk/rte.lib.mk diff --git a/lib/librte_sched/rte_sched.c b/lib/librte_sched/rte_sched.c index b7cba11..3b8ccaa 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -42,12 +42,12 @@ #include #include #include +#include #include "rte_sched.h" #include "rte_bitmap.h" #include "rte_sched_common.h" #include "rte_approx.h" -#include "rte_reciprocal.h" #ifdef __INTEL_COMPILER #pragma warning(disable:2259) /* conversion may lose significant bits */