From patchwork Thu Aug 31 10:46:53 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh X-Patchwork-Id: 28145 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 3E7852C02; Thu, 31 Aug 2017 12:47:30 +0200 (CEST) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0063.outbound.protection.outlook.com [104.47.40.63]) by dpdk.org (Postfix) with ESMTP id 4BE0B2C00 for ; Thu, 31 Aug 2017 12:47:28 +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=kmneIRbfpvf6Rakq5ze6WbHfpue4yh46lapFaUc440k=; b=bSvNNcgKguh5xJ2qw2vN15YVTNEqtSxoQhnF44AFU9zxvy3GjxoZkWbuVgxX+LtfwjCsmjoaTGv161abP0yl46XpRvxTwa6coG8JVKRmK1SQBalI/5mU2TEkE5xpfCsTlFqElYefaGOegNXlUr9p5JFbqEyY9FOQ8a6Ylk3PIVE= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=Pavan.Bhagavatula@cavium.com; Received: from PBHAGAVATULA-LT.caveonetworks.com (111.93.218.67) by DM5PR07MB3465.namprd07.prod.outlook.com (10.164.153.20) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1385.9; Thu, 31 Aug 2017 10:47:24 +0000 From: Pavan Nikhilesh To: dev@dpdk.org Cc: cristian.dumitrescu@intel.com, stephen@networkplumber.org, Pavan Nikhilesh Date: Thu, 31 Aug 2017 16:16:53 +0530 Message-Id: <1504176415-5236-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: BM1PR01CA0082.INDPRD01.PROD.OUTLOOK.COM (10.174.208.150) To DM5PR07MB3465.namprd07.prod.outlook.com (10.164.153.20) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 71639ded-56af-4087-c0e2-08d4f05dab7f X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(300000500095)(300135000095)(300000501095)(300135300095)(22001)(300000502095)(300135100095)(2017030254152)(300000503095)(300135400095)(2017052603199)(201703131423075)(201703031133081)(201702281549075)(300000504095)(300135200095)(300000505095)(300135600095)(300000506095)(300135500095); SRVR:DM5PR07MB3465; X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3465; 3:VtD+vhckyAv5Vi4kGlo9tPyJVi5eRMMUhb9Uiz5PyZ5WRl9VYQDUPeaJlSaTaWybapu4To9VgRz0Pg19iCPSU7UkkYIjVUkTJ1BxXqgbbO7QTlwljwh6mrTm2Py5ae3iXJCs65Wj2J3SNL7zOWM5UyeLRoOTV4Ve23rsW7f9dXVCg5wmH4UiyLsbl7OwH9Wf8GIYqu+VABQudf/TALuO+lelzOUHTvzg2A7GhpIMXdl0VWRHTY3YRBbGlxgn9DAx; 25:rspl4FLwys88UBX2JYeMN01QH1GQe03NATCmOfRzDdYv9Y4nmPaF2tW8hvsPgd1n+F7BFDuLBgbSdT8xO/rj7Uiahj7ZBpfQz6LS/sJUAkF+2mcQfmzNkS6nqWqLgHxzuQltCgNHokOeZW2jXOsQh6qBz6Y0i/PhpAuNoRKAca0vf4D69AXV836JrVU+4EP3P/zKLJ9iOzy0aRxVeyxuLWae1K3r17t2wL/0JYJ5Np8Tfsl7QSl5HZsHlCbEGsowgILiOmTmYBB4WMI2G8hWKIjsfYkyzBiwqZ3u9RsNf9HiuXFK3AQ5aAVR6sGla62tsK6mbptF7JW3H2NUJ377pQ==; 31:rW27kuD2h2YaHsV/X825C0WIKrQB8EBHFEb/m9pB27mK1ywUlDsJ2k+AVGOmEcCDMSNlPBSm0jly69RgYHYpM4Zn1GABVoV5SHLviIJlwePG6LUZKa6+sEibv/BxwWzPWScL1vxwgezvBOkAA/5fh7Yb+9LznCyFhKe8qHqTui4pS03tBEq2QzSdo8Ob1b9g/JhRSRxX35gPt1CHxmN/DP8aslmata7DXTEk42wpe7A= X-MS-TrafficTypeDiagnostic: DM5PR07MB3465: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3465; 20:wUAO7QsWU+VKdbWNrRFF59pBXxSnyP+SjshUzDoBVxjA2B7Xl1vhxm77dmJdVwiHadFxQSq/t+T1ILo88kE5kV7KjyAE0j3ysvCsaWHdmfVnRP4S+EmKd1piECAhQYs/9A97Cm7li0hLTMn5t2M1WjXd+31I1IICTm1nKK1k/5lG/33Lkv87sxxmZbH1YBWhWn1BE+5KlfToMtVErUiH23x+xnRkidn+fi1w3Dl96xEcVxvOD4XZUMj5KU0ZXEtqcmwvKg1np1gDb8GCURp/jjuO1uMtOnWLvCfzIpTWSgc4MRrxyVgE5/NRj/Jwek/KP8HxbCPvPuOU4NAtOgVun5/mqGZ/GODR/vgEwORG5qBRTP/rWbPgIKo/yzcQk6jNonIBiyOg8ygQbHcxw2ddq9zzUIHVFLD1YfOhyaYXy3hRZ8F+r6m57u/9mhHhGJM3TU9c0uJgyha9Sh+TW6ISuW57X8twzRqo3G1RumdKUElr4mE2wRUjrqeBLu76Jc3kWEELPAzGJEgrJ7kQSfNFj5RmmCLNrq/RCxOVCgLtoy7SpQxT0D1vymh3onQ4h+tgGZE0yVf4ynXBtvVTligujbcc1rB+msQ7/+GCfARP0Ds=; 4:+NiVuZS8mrhGkzoeh8rLHO2uDg/lsbrPgijmgdOBxiy2CyvBxfisPXkxtd744/BsGWQ0UreKRXa56N1yYhQYZTLpZcN6Aa8blMEwSPxK9eSq43c9jyQgK40vSoRm1P88foujxSw3Anstpg5CgdVFmc6bRZ3cle69T90zQ8nJtGeDctCvWhQ0reBKNpzBSLsW/aXbE3mWmM2OwVgTPflXOnKvImA4QElYyjKLfGkRCstrHgYRxPvIg/n2LsityJI+XQFGBjqh56QnUaEmrymEEv9c0jdJkp5DMPzZFBycAO0= X-Exchange-Antispam-Report-Test: UriScan:(278428928389397); X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700101)(100105000095)(100000701101)(100105300095)(100000702101)(100105100095)(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(100000703101)(100105400095)(93006095)(6041248)(20161123558100)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123560025)(20161123562025)(20161123555025)(20161123564025)(6072148)(201708071742011)(100000704101)(100105200095)(100000705101)(100105500095); SRVR:DM5PR07MB3465; BCL:0; PCL:0; RULEID:(100000800101)(100110000095)(100000801101)(100110300095)(100000802101)(100110100095)(100000803101)(100110400095)(100000804101)(100110200095)(100000805101)(100110500095); SRVR:DM5PR07MB3465; X-Forefront-PRVS: 04163EF38A X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10009020)(6009001)(189002)(199003)(50226002)(69596002)(6512007)(189998001)(72206003)(47776003)(110136004)(81166006)(66066001)(107886003)(81156014)(8936002)(5009440100003)(53936002)(8676002)(6116002)(6506006)(2906002)(97736004)(6486002)(36756003)(50466002)(3846002)(68736007)(305945005)(101416001)(2361001)(7736002)(5003940100001)(5660300001)(25786009)(478600001)(6916009)(42882006)(575784001)(6666003)(48376002)(105586002)(33646002)(53416004)(4326008)(106356001)(2351001)(50986999)(42186005)(42262002); DIR:OUT; SFP:1101; SCL:1; SRVR:DM5PR07MB3465; 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; DM5PR07MB3465; 23:fPPEuqzfwSGu22phgXs1+8m+b+Gnnu4BZt1eWL6jm?= DTKr9WaCgCTNqI4icCVTt4urSE/RIzOeUnN3FEbhINUf4d6dfx7xgd/qQE/5fk2igOjYpuMIVSxmAX1oJ5WHIIVWGgGaZiTfoAn9y3bOJA48BZ9jBJVy8Irm+M43JY2+cERroZAsq8y8/BlTCMmWR1jhk+c/FbrmePKp5K1yKfe4MibpN3PciKEWivNNk8ZdgUtxT+6uInRSDfeMvq0fIZ7TA/5S52MxnV+YgiMMaYXPnC86terdcDcn/T5Flbl+lipnjCcT01skihn+JPMqYrUNu/GTn8pda7Xh7MD2yijWgnS0GLgJ3GVv0nsCad4wsaxsX2n8YFrXjD6lHXc90jLq4cyOQgjf394G2AC0riN0KHQKPdfI4cEhzejpN+VVeblggF3szeubgiWjfMFQcQYKpDWzqx7jdIu13F5G/4X/tnqGl4NR81At3KoZyHHBaESOCj66g5t3Gc+s2+A8ghJQl2Omx4kLji4Ix7uc+ZYUH5bh+B/rsmaHfbUld3bCFw+CagzexnOXa62C1WYfkBoAdgZNJEEu9WdEZ/YN0SlE6HEe/CwWpQbziCwGgwNeDntvPi5vvXiNrVoch8Fd8bkgV6s/lawU/til0DW6Yzg5LGkg45xaskMvDf+ifLDrfbOOZRfXTeKfclOSNQ9lY8XyAcULKnztxC2tnOpOx3i5Yql13/9LEQJhkvPfbE24BUA7jxCzR1Ujd6xqgTuD2jP8hVUTbW5kZAkErIuiRetWe1jSRPVQ50d5kW55W7u92mfTFwA+QQm01Sz1wBWUj6ACpsRqEm9VcvfwiRZKJ0RjD3TrZ9pB5KXbbMGnqcRRyOxnmmh9xKQ0b5kYAULTYbNHRgqbJVBKL/xg4OG47JHxTZtX5o1QUpMWGb46PgHVqTPDQ26v8czDTP/4HmifjGC9s8TOptbbT4lC0O5CUBDJmvhALZW6zpf+VlbORuTpcQq7JWON3ZNn/xoGmXA/lSJel3O3RBvIhDfpZYixgSWaOuoOORQOLAgx4kwpJ6z399p7sgobXAvup6U+puOXXKrtqGNovwKUDME95F0AsQOydCCUOmrLx0UTuykSjxkJvpmy/DCLphOQI4noMJxXkaxqT5CTIk7MUsFpfQhuL5cPia9wl5kYb9fhdZIH+XJX8c= X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3465; 6:Zffe3kxDc0PnnDKRiqQg/LHmvtjl6MA8QiazUapYihZ3uEjUXBUYya/t54duNCsqMWqTIfIVERVAGgDNe8/BalVTM8mvMZ6vxGYZZQ4bN5bomrLhdR8foItSMZH+UmCDe16FXKwbLYl1AxVTKzUrEA+nOeJIc5Q7EJwkGxw7fSVTb6h722aYiM+g0/soblg2iyyEZ9Q7+iXJGVp0/ciNySN7xIVCNhZTrpS70+R2Zvs1d7EXz8LgnPzK99AxRMWipGrHE+Bw9bLAaIv9nKuE9Z+y1S4R4MAc+R2QNSeTE1IDCRoDaLeEJ6Cga/E717T7/CClNxrOW5AGjKdBFH9XzA==; 5:r/20RDQVvH9W/j5Wb99/Vpq2B01Rz2ZjxNuKv8HWMZwS+8RiMavxN7j+RiYtKpadsWVo8SDS0UuMa/+je521Z2ww9F6nUUXBTdJDekwmcvzQGVrKfOWyQ7GUYiP5yHQvWgCiLr9cG3652HvpJKdsOw==; 24:oUO+EbYl6LWIlPVS/jxIF55UJx0pRbf/30m74SkHNmIvnPX5NnCAsHbrNxkOktk+I5X349C/+8YG47+Bp6lPC0RQzM0d1vHPIJADssmRsx0=; 7:4xEKk9er1D1lGdcC4kYld+MlKGiRJmgDTxVIPni7sqz1jFPH88KUM3fymEPXj2mg+I6xztaP0Slec1mGRBVzjduwu2IG/BiQxxNLHDL3skbUxMvWqQCQ5/N3MNz+XjO+V/zNgmVrg7WmXWQVo8ct1tnbfyzp2BcrC3Nuu5d4Y0KH4o0VpeVWV58qLlRJVUV1X6XglQTSvMdgLH1xPvm0EpOzwyM0Kt3FnC1BgkKF6m8= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2017 10:47:24.8639 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 711e4ccf-2e9b-4bcf-a551-4094005b6194 X-MS-Exchange-Transport-CrossTenantHeadersStamped: DM5PR07MB3465 Subject: [dpdk-dev] [PATCH v2 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" 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 --- 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 */