From patchwork Thu Aug 31 10:46:54 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Pavan Nikhilesh X-Patchwork-Id: 28146 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 037F52C72; Thu, 31 Aug 2017 12:47:46 +0200 (CEST) Received: from NAM03-CO1-obe.outbound.protection.outlook.com (mail-co1nam03on0073.outbound.protection.outlook.com [104.47.40.73]) by dpdk.org (Postfix) with ESMTP id 2A4DBFFA for ; Thu, 31 Aug 2017 12:47:43 +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=qFxbi4mA//bH/ROG4dYMRbTnszHOxqIsl4riV9vPEiY=; b=K4XW0Ijd7Zq29gK/hmNfhxNGCj/DxTvraJPS3kjW8oPuBAhp+8sDvytmKKO9GNM3/PCfQA0dAJRO2muhbXnW6jr7Om9EtXWtBc7TUgk0WS5AYGSzmDOlUE2/a//d7XpZk5+SJXcD63DbmQ0pBdDIqUEdYmo9M5FdbvreAn8vEWY= 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:40 +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:54 +0530 Message-Id: <1504176415-5236-2-git-send-email-pbhagavatula@caviumnetworks.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1504176415-5236-1-git-send-email-pbhagavatula@caviumnetworks.com> References: <1504176415-5236-1-git-send-email-pbhagavatula@caviumnetworks.com> 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: 64fd435f-6eb5-482c-e41f-08d4f05db4db 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:yLMlhPIirKLlSmWZdEVvZquB2U3ro83wjQ+kU4+5jaaE0WtvsRYwhlamJ/ipWdJAL2yu78MtQpOmRKaXuaBio4mss7XrktHhsS1FkSESnGrSsxCZI2rA8ClYIuzw9VpVCbS731x18QbHCuS13ZuHDBt8CbmpHLFrUDEJNyMrGnqpJPX1OoNkt7hr1uDjL8vW0DTPkSsrSetVFwWY02bOw0m/GhZD70UggGq6Fs9c7H8iOdZqA52GXhgZi2g8sGBz; 25:rweBf6vuyuv0SMUnkWUuFNrbu6ueo7leogTQnD2ZOhOP7Fqg3se5rcosZjQ7/8sZfADMgkva99s9LnEYunLUdpY7mZxNNS5swGR4Uca7NVtrmGv1IylJTA2Ldq7oTwHftFnYspdLK65UQ+EgXYGvVLsLkp+dBiBBqmzdHKhOJce33U2NmTIwoU6CTyrV9oSORDAV9wsk42yVafJvJURZih+ZgUtubzhFP9OVDJR1kh2fRgasCKI2bFPkzBAfPP3Y4Aa5S+3rUsqyNPKQJJ7+mOLySxDgdGOf4n9JDrPG8ySU3nM8mqCS2G9nhdX27h37bqSR1FNgICyYtLRTHlCDQg==; 31:lvG5WCCaco4JuysjqJ0hbDSHsp7zdnCjQc56bMTnvos8lWdAzk3QDp4UReOrkNc3TMPD6WrGETees2ErH2w+Bc+nmaNrIOxhgdOMLmK6kCPUswnfrHSSefp1eQtdRAIUhDdhTDdjdr/4D2l5ztwAQZ6yaycBwJhaFjLy5k6ll+6McKqizwb04gHn6fhjTKQDhiqh0ZXcA/X17ixjEMT4v5rHa/1l81A3HaobO72y/S0= X-MS-TrafficTypeDiagnostic: DM5PR07MB3465: X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3465; 20:r5aHNQkvA4Mu5IQSrVbEC75qe/orf4LiMr54Ks4PXgd8zoWph0EfQAtMut3GeWj1AWu/lBbm9UWsFoqSZF47mjkJZlbUYJpGszAmhJ4clE1sgKjR48aHk4VTEV+H9QKvbvXyE44N2JGx7alEZqZFPCAy4uw4zSZytLDi5JWex/ZtuLlFh7+WVO0xODshJnLv1BYj8YBiDHFo2TEh+Ppsm0pM6dVRoFbTWWGl7uxr979UXq3bIZ3vh1932q5tRwkUkPqyCe+7Q7xl1IWSGrb0hsr50JsmMbXLWKaq5a2l0ZAHTfIZSi0Bt0J3LK0kJCSb27Btr6KVcReKJuQMAFYln46PmWSrCWZPrYM0cyatokHVBBxBvj/CY236H/5t4C4MbdJ0BFVw6fxasuVqvnUTC+BuOPgcMovDOZJ/EnWiWbMeK/H3/JiQlZi271K+WqqiywKFHXIeiUQiq6aGtO+ttOYQMGwb70mXlJfX/tYC6c5SdW2Z0d0XP9pZy1ycsAies5SgZvrdCzyrCkp2MS/aegpCOElXthVeHBVn3Skg+LXr6VuwhbXPodcnjRi7IfS+OIIqZgMBkafIOWK1ETQPAKsn5taUZV4/Y0GKZrl56fM=; 4:+sK+vonfya4z0rSGWjYg2yGILTWrBKHvtQD0wdlpTSnPvS2jFJEV8NoF4Jr0MU82nkvBfCAF/BbbF0YIlsWRcl+QL25nU3XH3nGV/g3EaPf4RhLZDjAhgKv504lqCgTkZfMUJKPQCcvOS6sXtOXwpHcZ79YUJI35V9B5pTyBZgSL6kMpGmHbk243Ach/InPXcw+IvudxV3m3wdsAEaGC//zbPMbtxM/rmmaCYiwsMPraoHFfalWCcUr7YCz2gtdg X-Exchange-Antispam-Report-Test: UriScan:; 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)(966005)(69596002)(6512007)(189998001)(72206003)(47776003)(110136004)(81166006)(66066001)(107886003)(81156014)(8936002)(5009440100003)(53936002)(8676002)(6306002)(6116002)(6506006)(2906002)(97736004)(6486002)(36756003)(50466002)(3846002)(68736007)(305945005)(101416001)(2361001)(7736002)(5003940100001)(5660300001)(25786009)(478600001)(6916009)(2950100002)(42882006)(575784001)(6666003)(48376002)(105586002)(33646002)(53416004)(4326008)(106356001)(76176999)(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:ExFqLpn5PskiY/KntKP/oAEk/bqas/BzduavMVU4I?= 0wHSyx39yhhBB8zzdm1P5kSHu6oyJB42Vrm1gpG0fGV9hqPbZHEnAItv6ZSd6Xka03skiHRIY97xBYS/t+GFKsx9iplIZB7WiTkm76sMM0oSWczBz/HjPGBwI5hk4QiQh8j1Clgg59sOKl6WUdL1mDdI6wPS2SPeVTmRx7ttvwOwhBK4VqMsI/cZnhfnKdO3IPcGuLcBn434pCSzhJHle7Z1zHItcq6qrRHHdIOexZKGzer+CZN/efzxqBxMoU+FwSO5JqG6kgy4CauSkG5/2EPkkos3IrtlvHp9D8rnDV7PRp/pgKhe5f/0iGBArqo5vE4zzzugaAbpEKqHrIt0sdYyWRVrX1R9lPVDpIEBFdZc2wOX+RiQLLkXI4PUUWcCB2HdwcjOYdfZ0w5J5F5PQcMqyr91OmTIV/U9gyoUSAL+WTafS5mhTAl861l9bcBpMRlCoj5taxODPbm83tUu6s30YpVa2mJCNVZ/x9U9Xj7WugRuD7jSYabJnHuWUyhqwQYfTW9TmoBoN9Qez8ctxemNFnVGBgmZDno13pvCOHIRmesgsK4nOLjV6+Kj4YPflY5vmwF0pkua6DpfgetfYXQyB4bxJ/PwlTE9fnEJv32hKHhfr9vUphXFf6P7nz9fA4IayzHRN5u10RoHvMbapadDdnQ925VIl42eJ9yugYRZ9upUK72fNA9qCbXInFAlrci+TpT37bWsKmfBiySeGJGTaLW1Vrr7+9hjdcLfZ0q52d/9IBy70hZ4WCDjCwR7D5pxJVYbfc03YY4AFCyTEELzeIzT3d9+wWEYhEs78GCATpJrqlO2YBj8a46jiqFMrut82wko0WBsyiUy0C53C3vpcHe5DJghR+daCWNXm7xrvowCVJiDs8tB5VWW9k5nwZMHa8TH5q89expJEBIyTQlsQzHZ6dsS6TMKGABK3zfIhWLV+kXBNMyHHG+Meoc0u/TDdTo+W7P5khaRyYVkmcMdVGuQqzgXZjFOYbSXRCqx6IFAHl7ou8WwBVWXvSOyiuPbk1OSQZYZE9zcSnz9cB5KxOpnLNLvAZ+kVCeJkWaPd4MXuN8MvpFgoTbaqIkW81X7dZhTfg7KZus7/QUXtNsjgF3d/lRurcti5ZRE7JiD35f61A6mlkxWsaYDrb5KV7gectb+bmX0SxLojW8dbDOBB05/6IpbT2JfLIuBYX2oTrNT4s3Mul5fhambP6UxSE= X-Microsoft-Exchange-Diagnostics: 1; DM5PR07MB3465; 6:G6q5FBovKnv0A3/qM6t9iFyi67NjbpmxgNWlIxUQasYIWFOe8CgoTB36VgXZizzFOT/pDJBDcUP8zpV7waFOplDnD6SZS6/Boi9AwKqrSsSI56nuHMigmjggAHdRYkxRZMpcXbclVX37v3fWXBqXCSinONNLPahiJy4453FN0XG6QNNB9DonJuZZg40ksDS1iiCZ5pKDgIv+axf1kYetsU+h7GgON4745OscRftov09MHFQ++2xGeipKkSddOmyD+8sQSqYdIGMBluT+AHT6HXQ2hEboPUpXIIdZ5XU3jf/sWdzfAdwR1xg1bH+d7KpaSQ8rM9iDwAU1d5tg3oAS9A==; 5:Q5Ekj08QgTmMZxdH/0tQ2EFpNTwaRbYMucxWRKRNzP2r1iBXzQmFK13HNIYzcrPlCXut0/JJN6W9yk/qi6iLK8nT2MTV6lyDY9SxFPY6hWMF5PEMh71m4nXcrBV1Q5PofOp+GFoOez24kY/01a22MA==; 24:w27cNerzDCMH5MezW+RigBiUYF52KY3idqOY1L7wgYwiPIYnrcleMhKqKCMiRIs0gTM09kZ/XOifj8yNebR074As0H8W6pK/NBx09q5xAoc=; 7:ZNO/AXlCPReXRM2TMeJQyCWNximrJ7rA55V9gfU0QunDLSe5uS6Zuc/Lne8hbcqU/TiaYtoJX+IudAYf1N2bNijRBFNnhVptKAIB7sEyYV/s3DSD3Fzc0+s9OelFcpDsNhY1Q2/2FasZP69tTMAR4LRHbJ//s3TdAyaammmr9N1m3xYYu9mPj8oLD2mAdgPyoIuqx5KaZCO+XbtCLUSkHIn30Tn/YXTgoz//9DUieQU= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: caviumnetworks.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2017 10:47:40.5360 (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 2/3] eal: add u64 bit variant for 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" Currently, rte_reciprocal only supports unsigned 32bit divisors. This commit adds support for unsigned 64bit divisors. Rename unsigned 32bit specific functions appropriately and update librte_sched accordingly. Signed-off-by: Pavan Nikhilesh --- lib/librte_eal/bsdapp/eal/rte_eal_version.map | 3 +- lib/librte_eal/common/include/rte_reciprocal.h | 88 +++++++++++++++-- lib/librte_eal/common/rte_reciprocal.c | 120 +++++++++++++++++++++--- lib/librte_eal/linuxapp/eal/rte_eal_version.map | 3 +- lib/librte_sched/Makefile | 4 +- lib/librte_sched/rte_sched.c | 9 +- 6 files changed, 199 insertions(+), 28 deletions(-) diff --git a/lib/librte_eal/bsdapp/eal/rte_eal_version.map b/lib/librte_eal/bsdapp/eal/rte_eal_version.map index d0bda66..5fd6101 100644 --- a/lib/librte_eal/bsdapp/eal/rte_eal_version.map +++ b/lib/librte_eal/bsdapp/eal/rte_eal_version.map @@ -242,6 +242,7 @@ EXPERIMENTAL { DPDK_17.11 { global: - rte_reciprocal_value; + rte_reciprocal_value_u32; + rte_reciprocal_value_u64; } DPDK_17.08; diff --git a/lib/librte_eal/common/include/rte_reciprocal.h b/lib/librte_eal/common/include/rte_reciprocal.h index b6d752f..0252636 100644 --- a/lib/librte_eal/common/include/rte_reciprocal.h +++ b/lib/librte_eal/common/include/rte_reciprocal.h @@ -22,22 +22,94 @@ #ifndef _RTE_RECIPROCAL_H_ #define _RTE_RECIPROCAL_H_ -#include +#include -struct rte_reciprocal { +/** + * Unsigned 32-bit divisor structure. + */ +struct rte_reciprocal_u32 { uint32_t m; uint8_t sh1, sh2; -}; +} __rte_cache_aligned; + +/** + * Unsigned 64-bit divisor structure. + */ +struct rte_reciprocal_u64 { + uint64_t m; + uint8_t sh1; +} __rte_cache_aligned; +/** + * Divide given unsigned 32-bit integer with pre calculated divisor. + * + * @param a + * The 32-bit dividend. + * @param R + * The pointer to pre calculated divisor reciprocal structure. + * + * @return + * The result of the division + */ static inline uint32_t -rte_reciprocal_divide(uint32_t a, struct rte_reciprocal R) +rte_reciprocal_divide_u32(uint32_t a, struct rte_reciprocal_u32 *R) +{ + uint32_t t = (((uint64_t)a * R->m) >> 32); + + return (t + ((a - t) >> R->sh1)) >> R->sh2; +} + +static inline uint64_t +mullhi_u64(uint64_t x, uint64_t y) +{ + __uint128_t xl = x; + __uint128_t rl = xl * y; + + return (rl >> 64); +} + +/** + * Divide given unsigned 64-bit integer with pre calculated divisor. + * + * @param a + * The 64-bit dividend. + * @param R + * The pointer to pre calculated divisor reciprocal structure. + * + * @return + * The result of the division + */ +static inline uint64_t +rte_reciprocal_divide_u64(uint64_t a, struct rte_reciprocal_u64 *R) { - uint32_t t = (uint32_t)(((uint64_t)a * R.m) >> 32); + uint64_t q = mullhi_u64(R->m, a); + uint64_t t = ((a - q) >> 1) + q; - return (t + ((a - t) >> R.sh1)) >> R.sh2; + return t >> R->sh1; } -struct rte_reciprocal -rte_reciprocal_value(uint32_t d); +/** + * Generate pre calculated divisor structure. + * + * @param d + * The unsigned 32-bit divisor. + * + * @return + * Divisor structure. + */ +struct rte_reciprocal_u32 +rte_reciprocal_value_u32(uint32_t d); + +/** + * Generate pre calculated divisor structure. + * + * @param d + * The unsigned 64-bit divisor. + * + * @return + * Divisor structure. + */ +struct rte_reciprocal_u64 +rte_reciprocal_value_u64(uint64_t d); #endif /* _RTE_RECIPROCAL_H_ */ diff --git a/lib/librte_eal/common/rte_reciprocal.c b/lib/librte_eal/common/rte_reciprocal.c index 7ab99b4..5d7e367 100644 --- a/lib/librte_eal/common/rte_reciprocal.c +++ b/lib/librte_eal/common/rte_reciprocal.c @@ -31,18 +31,13 @@ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -#include -#include - -#include - -#include "rte_reciprocal.h" +#include /* find largest set bit. * portable and slow but does not matter for this usage. */ static inline int -fls(uint32_t x) +fls_u32(uint32_t x) { int b; @@ -54,21 +49,120 @@ fls(uint32_t x) return 0; } -struct rte_reciprocal -rte_reciprocal_value(uint32_t d) +struct rte_reciprocal_u32 +rte_reciprocal_value_u32(uint32_t d) { - struct rte_reciprocal R; + struct rte_reciprocal_u32 R; uint64_t m; int l; - l = fls(d - 1); + l = fls_u32(d - 1); m = ((1ULL << 32) * ((1ULL << l) - d)); m /= d; ++m; R.m = m; - R.sh1 = RTE_MIN(l, 1); - R.sh2 = RTE_MAX(l - 1, 0); + R.sh1 = l > 1 ? 1 : l; + R.sh2 = (l - 1 > 0) ? l - 1 : 0; + + return R; +} + +/* Code taken from Hacker's Delight: + * http://www.hackersdelight.org/HDcode/divlu.c. + * License permits inclusion here per: + * http://www.hackersdelight.org/permissions.htm + */ +static inline uint64_t +divide_128_div_64_to_64(uint64_t u1, uint64_t u0, uint64_t v, uint64_t *r) +{ + const uint64_t b = (1ULL << 32); /* Number base (16 bits). */ + uint64_t un1, un0, /* Norm. dividend LSD's. */ + vn1, vn0, /* Norm. divisor digits. */ + q1, q0, /* Quotient digits. */ + un64, un21, un10, /* Dividend digit pairs. */ + rhat; /* A remainder. */ + int s; /* Shift amount for norm. */ + + /* If overflow, set rem. to an impossible value. */ + if (u1 >= v) { + if (r != NULL) + *r = (uint64_t) -1; + return (uint64_t) -1; + } + + /* Count leading zeros. */ + s = __builtin_clzll(v); + if (s > 0) { + v = v << s; + un64 = (u1 << s) | ((u0 >> (64 - s)) & (-s >> 31)); + un10 = u0 << s; + } else { + + un64 = u1 | u0; + un10 = u0; + } + + vn1 = v >> 32; + vn0 = v & 0xFFFFFFFF; + + un1 = un10 >> 32; + un0 = un10 & 0xFFFFFFFF; + + q1 = un64/vn1; + rhat = un64 - q1*vn1; +again1: + if (q1 >= b || q1*vn0 > b*rhat + un1) { + q1 = q1 - 1; + rhat = rhat + vn1; + if (rhat < b) + goto again1; + } + + un21 = un64*b + un1 - q1*v; + + q0 = un21/vn1; + rhat = un21 - q0*vn1; +again2: + if (q0 >= b || q0*vn0 > b*rhat + un0) { + q0 = q0 - 1; + rhat = rhat + vn1; + if (rhat < b) + goto again2; + } + + if (r != NULL) + *r = (un21*b + un0 - q0*v) >> s; + return q1*b + q0; +} + +struct rte_reciprocal_u64 +rte_reciprocal_value_u64(uint64_t d) +{ + struct rte_reciprocal_u64 R; + + const uint32_t fld = 63 - __builtin_clzll(d); + + if ((d & (d - 1)) == 0) { + R.m = 0; + R.sh1 = (fld - 1) | 0x40; + } else { + uint64_t rem; + uint64_t multiplier; + uint8_t more; + + multiplier = divide_128_div_64_to_64(1ULL << fld, 0, d, &rem); + multiplier += multiplier; + + const uint64_t twice_rem = rem + rem; + if (twice_rem >= d || twice_rem < rem) + multiplier += 1; + more = fld; + R.m = 1 + multiplier; + R.sh1 = more | 0x40; + } + + R.sh1 &= 0x3F; return R; } diff --git a/lib/librte_eal/linuxapp/eal/rte_eal_version.map b/lib/librte_eal/linuxapp/eal/rte_eal_version.map index 65117cb..63ff2b8 100644 --- a/lib/librte_eal/linuxapp/eal/rte_eal_version.map +++ b/lib/librte_eal/linuxapp/eal/rte_eal_version.map @@ -247,6 +247,7 @@ EXPERIMENTAL { DPDK_17.11 { global: - rte_reciprocal_value; + rte_reciprocal_value_u32; + rte_reciprocal_value_u64; } DPDK_17.08; diff --git a/lib/librte_sched/Makefile b/lib/librte_sched/Makefile index 569656b..a2fd6f3 100644 --- a/lib/librte_sched/Makefile +++ b/lib/librte_sched/Makefile @@ -54,6 +54,8 @@ LIBABIVER := 1 SRCS-$(CONFIG_RTE_LIBRTE_SCHED) += rte_sched.c rte_red.c rte_approx.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_sched.h rte_bitmap.h +SYMLINK-$(CONFIG_RTE_LIBRTE_SCHED)-include += rte_sched_common.h rte_red.h +SYMLINK-$(CONFIG_RTE_LIBRTE_SCHED)-include += rte_approx.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 3b8ccaa..7bb6d51 100644 --- a/lib/librte_sched/rte_sched.c +++ b/lib/librte_sched/rte_sched.c @@ -228,7 +228,7 @@ struct rte_sched_port { uint64_t time_cpu_cycles; /* Current CPU time measured in CPU cyles */ uint64_t time_cpu_bytes; /* Current CPU time measured in bytes */ uint64_t time; /* Current NIC TX time measured in bytes */ - struct rte_reciprocal inv_cycles_per_byte; /* CPU cycles per byte */ + struct rte_reciprocal_u32 inv_cycles_per_byte; /* CPU cycles per byte */ /* Scheduling loop detection */ uint32_t pipe_loop; @@ -677,7 +677,7 @@ rte_sched_port_config(struct rte_sched_port_params *params) cycles_per_byte = (rte_get_tsc_hz() << RTE_SCHED_TIME_SHIFT) / params->rate; - port->inv_cycles_per_byte = rte_reciprocal_value(cycles_per_byte); + port->inv_cycles_per_byte = rte_reciprocal_value_u32(cycles_per_byte); /* Scheduling loop detection */ port->pipe_loop = RTE_SCHED_PIPE_INVALID; @@ -2147,8 +2147,9 @@ rte_sched_port_time_resync(struct rte_sched_port *port) uint64_t bytes_diff; /* Compute elapsed time in bytes */ - bytes_diff = rte_reciprocal_divide(cycles_diff << RTE_SCHED_TIME_SHIFT, - port->inv_cycles_per_byte); + bytes_diff = rte_reciprocal_divide_u32( + cycles_diff << RTE_SCHED_TIME_SHIFT, + &port->inv_cycles_per_byte); /* Advance port time */ port->time_cpu_cycles = cycles;