From patchwork Tue Aug 11 07:33:53 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: hongbo.zhang@freescale.com X-Patchwork-Id: 52290 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f197.google.com (mail-lb0-f197.google.com [209.85.217.197]) by patches.linaro.org (Postfix) with ESMTPS id 0F7FE22919 for ; Tue, 11 Aug 2015 07:57:43 +0000 (UTC) Received: by lbcli1 with SMTP id li1sf13062539lbc.2 for ; Tue, 11 Aug 2015 00:57:41 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:delivered-to:delivered-to:from:to:date :message-id:in-reply-to:references:mime-version:spamdiagnosticoutput :spamdiagnosticmetadata:cc:subject:precedence:list-id :list-unsubscribe:list-archive:list-post:list-help:list-subscribe :content-type:content-transfer-encoding:errors-to:sender :x-original-sender:x-original-authentication-results:mailing-list; bh=EQeY12RZl4BPIFAGSZbZKK1WR5HjIx4b6ADdXMrShhI=; b=TFm7i0SsN7/gwrjeEkpW+cpcCoPLNB1lWo0rnspcP/3mHGDg9tj5rdPiPfJGtaGHv1 AAjuTe3PG0zMSgkywgZyyN6fAV85vENmRQVI8/rwr44XQi/EQIFoUMZgUvDHXoY73Ji8 TiPdMCjpkOqTR+qFoe+DfsQvb5QHTjLiFOFh/0VHoWm2fSd2DdJ84hnAOBbPkvzBgfOS r+JsiK8HeXcuJHadXdmnFIJPtN7xR9otLhD0B7jiy3FyyetjngOFW0p+SiXHnM0liUz9 SzBQAoEAz0PBViZ7wAvCVpfiUSb5asNlM11achZ0CkYKInK9qwWbJdq7ijyzXHWID+sH UuWw== X-Gm-Message-State: ALoCoQk9L57G2EGRzZa8WgXxGG2Wo47CFOy74Fu7x/j5chVDQuap0FVnaIByUuHQT8VdWGok82KQ X-Received: by 10.112.138.2 with SMTP id qm2mr7670586lbb.19.1439279861690; Tue, 11 Aug 2015 00:57:41 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.19.167 with SMTP id g7ls784729lae.75.gmail; Tue, 11 Aug 2015 00:57:41 -0700 (PDT) X-Received: by 10.112.159.1 with SMTP id wy1mr25522807lbb.55.1439279861424; Tue, 11 Aug 2015 00:57:41 -0700 (PDT) Received: from mail-lb0-f177.google.com (mail-lb0-f177.google.com. [209.85.217.177]) by mx.google.com with ESMTPS id f5si748580lbd.110.2015.08.11.00.57.41 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Aug 2015 00:57:41 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) client-ip=209.85.217.177; Received: by lbcbn3 with SMTP id bn3so13965285lbc.2 for ; Tue, 11 Aug 2015 00:57:41 -0700 (PDT) X-Received: by 10.112.166.106 with SMTP id zf10mr24725962lbb.36.1439279861294; Tue, 11 Aug 2015 00:57:41 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.112.7.198 with SMTP id l6csp2355137lba; Tue, 11 Aug 2015 00:57:40 -0700 (PDT) X-Received: by 10.107.135.140 with SMTP id r12mr26116556ioi.153.1439279859441; Tue, 11 Aug 2015 00:57:39 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id z5si1063017igg.2.2015.08.11.00.57.38; Tue, 11 Aug 2015 00:57:39 -0700 (PDT) Received-SPF: pass (google.com: domain of lng-odp-bounces@lists.linaro.org designates 54.225.227.206 as permitted sender) client-ip=54.225.227.206; Received: by lists.linaro.org (Postfix, from userid 109) id 803CB62059; Tue, 11 Aug 2015 07:57:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252.ec2.internal X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAD_ENC_HEADER,BAYES_00, RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H2,SPF_HELO_PASS,URIBL_BLOCKED autolearn=disabled version=3.4.0 Received: from ip-10-142-244-252.ec2.internal (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id 174BF6206E; Tue, 11 Aug 2015 07:53:50 +0000 (UTC) X-Original-To: lng-odp@lists.linaro.org Delivered-To: lng-odp@lists.linaro.org Received: by lists.linaro.org (Postfix, from userid 109) id 9F60862042; Tue, 11 Aug 2015 07:53:33 +0000 (UTC) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0140.outbound.protection.outlook.com [157.56.110.140]) by lists.linaro.org (Postfix) with ESMTPS id 5EC9162033 for ; Tue, 11 Aug 2015 07:52:59 +0000 (UTC) Received: from CH1PR03CA002.namprd03.prod.outlook.com (10.255.156.147) by BY2PR03MB490.namprd03.prod.outlook.com (10.141.142.20) with Microsoft SMTP Server (TLS) id 15.1.231.11; Tue, 11 Aug 2015 07:52:57 +0000 Received: from BN1AFFO11FD008.protection.gbl (10.255.156.132) by CH1PR03CA002.outlook.office365.com (10.255.156.147) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Tue, 11 Aug 2015 07:52:56 +0000 Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.158.2 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.158.2; helo=az84smr01.freescale.net; Received: from az84smr01.freescale.net (192.88.158.2) by BN1AFFO11FD008.mail.protection.outlook.com (10.58.52.68) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Tue, 11 Aug 2015 07:52:56 +0000 Received: from hongbo.ap.freescale.net (hongbo.ap.freescale.net [10.193.20.23]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t7B7qjK4024123; Tue, 11 Aug 2015 00:52:53 -0700 From: To: Date: Tue, 11 Aug 2015 15:33:53 +0800 Message-ID: <1439278439-11386-4-git-send-email-hongbo.zhang@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1439278439-11386-1-git-send-email-hongbo.zhang@freescale.com> References: <1439278439-11386-1-git-send-email-hongbo.zhang@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BN1AFFO11FD008; 1:0z6ABClGvEDVn/S+ep6FN8hosOA6nw4Df8xWrmpZ8pO8j0t42AG/v6cMhnGiI2BRPGa80xRwD2XZQSjx9iN0K7Qens3QCsldUSeL7w8LHuk0msVMGer0UpWrgnbtjPVB3uNOVJ52ImPalxAOspuX0CQdy1jqrIGKLwKbKOCIfnUgs/KSSi+o+Jyh+B92RnvJTPXjvN8OFsKyjU7QQr59qOq6LVF84z0gmhEFYqbnfyByVsq+fpRoaUu7YXhPTUqk+Tve9UCXU1LgPxgQ/oJu/NWa9RF5n/NyBdRsDB0Dyt8lR3+sBKcjwlmCqoOdttFvHejU1B1ISHZi6/wzZ7TLOyrYDMeiuXlW6zF002/+yGCLaFrhph7rKoT+z1ibk9O5blhi1NSbfAh3en8Hnpxy4Q== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(3050300001)(339900001)(199003)(189002)(85426001)(19580395003)(50466002)(2950100001)(110136002)(5001830100001)(77096005)(5001960100002)(69596002)(189998001)(81156007)(86362001)(68736005)(46102003)(4001540100001)(86152002)(50226001)(229853001)(6806004)(48376002)(105606002)(19580405001)(92566002)(50986999)(77156002)(62966003)(5001860100001)(76176999)(2351001)(36756003)(97736004)(87936001)(104016003)(64706001)(5003940100001)(106466001)(47776003)(33646002)(41533002)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY2PR03MB490; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB490; 2:aHsyirXzVUIMmfh3+/9GDv4WOTKTrqe9KvCBxwCIKcwGZfiPW0ZNkluJa1bBOvLJSMFRcSyvwh34oTsUneWFoOS2XuO4T8Jk57or9iKAhGu84G1/+UP/jPCbfoqaouF/uyNOjUSl0zFe1dFFtcMwRQOyF8oXYmxw2FvF4fpxFQA=; 3:YcK/VCQGS2UJZJWd4i/QGvaPzR3gjx0iy1RTwXNw4NH/vHie6iLn+fHsi1noyN7pr1fJfilyboAAXHArpHwVV9u9OsdqksOiFbUAfpUJ72ZAZztcMuBIBDcjCVSIb6O6p/m5/wX4WUkw9P4hxpQstB0Vr2JGcwwnprfXGvXLFWCCa7P/Nu91ZXPJBiALCA81a1+yT3V5WI20qaVnUDgiZAvvKA3A/3WzeERgLfEnFxM=; 25:Ld2jWIUblcQhVJYUObwOlKjaS+XIQUgLMKQ+auCauwsZtRg82A+SWw3rNPa/Irv2aVShDdnYvwIifX1cX0xx3U20S3jZeYEPFe9cJKxpq/eguACbbDEo7gmzNp05zn42/8X1eQultLqJfc7wOmhXfwOnx45T/q4CCB/KDQXM8ugwAR+8HUHBOrBc73CZ1gEwkXUqv8eoqNKtD4bkcdHGa1JaoW9/+GV28tJyPVeZsQbIT4K05Vsid2idW4FE/z3VStIEZ1YEjvMnoSOt9lzUsw== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY2PR03MB490; X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB490; 20:1tOcOnLVpCnwD5ysF9WlDuzjocLKKvs1NS3Hhd5JeVM3zUF5QfoFsXlhGLMCo9Nb/Pg9ydOc+kAsKnunSxgs5Bc+qxjGZv9QeNNqxP7BOe1W5JFkFVa3u7zQJP2ra3TLDrQngQ+80epaR07/86Nes7E/YMYsncj4I1ieTOjM+qYLdHZ3WZxFCwKpeVuqKvVMBRA1EpfzYDj8MRy0PmFtPNDXAoeNS5L2LMWEfSIZqVVVQM50mDQ/Sl52oxa3HgMOLfVnnErl5CB64jkDYpOFCqNYCfjG4aYd+kTAWT+TC33ZBgKXilzlIyoka/vK10dGCb7w3ge9Q4JNcT7mRqkbyOcsB9vrysTxWHon0XalVXs=; 4:q/ZlH9c3b53OFmo/DIyjQ76rmIzOvYCMdUIBTIRaY8w5AsMH+iXwuqfVuZ6+2X4zsx1mBytY5eWmKYEhP7J6p9YZ6mDxHrArJowMRaaZhTnhZuOHjDvhLwOEyICAxDd3ng5wPNRgJlKmWQTcQBe/ArkyZ+54vCx4DptzynYH7dKLl6SX0sCms0CAeH19pQJl02YVTEMV7h1fRIf4BNJphxN+K7DQj667MgT28gvEGkXhrKcFnCgFQhzsFKplZ2hWb/V651I71T3Ikz7C3K9yl2L1O2jWwuM03pT7ZMIeUgI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5005006)(3002001); SRVR:BY2PR03MB490; BCL:0; PCL:0; RULEID:; SRVR:BY2PR03MB490; X-Forefront-PRVS: 066517B35B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY2PR03MB490; 23:xR637oX7/oGA6Yc/WRSoEybMjDgN/cZPYVVdiEMQqZ?= =?us-ascii?Q?2P1Hh/3N77XchZGgPduY7JCfYss7X23ngDZRh6sjGAF5jbKvdRxedRCyUjXw?= =?us-ascii?Q?BgoF+iavoTEA7WJvKN59Hwsw5Au2xtnMWP9TUGoKZXTM33+RFChAvUHDamA2?= =?us-ascii?Q?GYHm8gMfWHaUwttr9REBiivUA62tU86Z5nvmW5HAmqukv7ichj1qW2hFKEQb?= =?us-ascii?Q?cOuwyFoXJ7/EJ25ZsadqnxlR8DL00+IyDfyOEHvvdXxXiYxnMzp5r6cCn99m?= =?us-ascii?Q?X5A7La5MH9dFJ7N0JdBKWBhXLlKbM1XlsVQ6ZY+Jifn7SFYSsV+AdufRLjeX?= =?us-ascii?Q?jwhaUj9gRafQc0HtHZuxy/zUa4MigT6/4vwl9BDFe2VP30wJOTkNuRvdmBl8?= =?us-ascii?Q?xm2FAcCspD+9Vq3M1G+NIKi2ENUL2/f8tHONpLaRH+h23OsDLYQavB0mKUVn?= =?us-ascii?Q?CATVHjJ7mtfQvoSS17+fmk/NjiEHZ9XTv6Nw7HlpaQdC06M/CkJtXAcMfv1L?= =?us-ascii?Q?/9Ya1FpYBI84Ug5/mk2j/MCfjvy91kRZ/ffKDK6HC4u5VM0OroVdF7UWP/sH?= =?us-ascii?Q?dSYKYIoL16hawV5igX9EnjBqTOq2m4v3WHTNuxCmVf4fVGufB62Ue+vBJZB9?= =?us-ascii?Q?I63YHLU4uim6BbOAc4wztZdLj3dJDonSLbIHb9/SDN02RLTHqRDXmuc8KALM?= =?us-ascii?Q?Z7Q05jXMIPKSvDjjVspMPldwBgkW9hThmTdHASKUpMOMLZIYm+AIT2rv8uxI?= =?us-ascii?Q?YNP4zVp1re5NODSGRrzb0Qz5FcVYmAGdiW4JyM6dusqG85DJ+AXfE3Ma1V/l?= =?us-ascii?Q?8k3laJsISmqXVzp1pDOKbFzxIbqwDDN9LFvES1qjCv7nJdzOpn4hA4WJiR4r?= =?us-ascii?Q?M/K4XkWPMLF9xw0e7bsBWgZn7PBnPs0JR4H+687CZHJk7QRiiXsCaIGOKHlO?= =?us-ascii?Q?Hib/HmLWw/lNU7AUEI+nGKTAvzjwIrWGCnmwJ1l+Y91i6pE36yXQ9zvgq5Em?= =?us-ascii?Q?1vmc/4uAzIWTAEmSiPD3qhgw/Zuh0XlrRYR1QgL47c2HoMPWezvYQnT6c76x?= =?us-ascii?Q?mAlyiaCzIlAc2x7/SZgRXh+slv+35R5Ytz+zHfJm4yf9mzO1bmYeE9vR6ujn?= =?us-ascii?Q?0Rgq1K04D2JT7/1I+HwwqE7D3QaTdWMYiD6q1BrICvwfzYf3MaANA0gvVXUm?= =?us-ascii?Q?J3HvtE3c5WgDiPs4L6oh19256YedvtGoKzaXmI+Rk4/MZssasJzOe6/A=3D?= =?us-ascii?Q?=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY2PR03MB490; 5:7TA0+TKFTLRCJO0aXw74a8ysYwacuDEgsOtAgNZ1R9dDy+zZLrVRuGPxn4k/BewrRjcpmtfPyb+7nKW9tP9TGRwIxEiI16juIgaQgCT7V980jFIkqSUjwORAwSzuQLTCRWELsFYpRwVRzzP/KYkDRQ==; 24:Z8fe50ih7wpZBb4pAohqPs3Ld/sm/E9MBl64OkPYINOGQai0eno88Rt9rNJM11GHIBbybJXX5uLdJ/O+Ozya308yQGlzd0mHQyLwVnxGpY4=; 20:BqL5aQ1FuWEzaXqR4KEFIIWKtPmdl6BmSYs8Omav+XZxO7Q6PQBQxQihwtFXuOlCTtSHJRvOdNLKMtG8ycWdQA== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2015 07:52:56.4778 (UTC) X-MS-Exchange-CrossTenant-Id: 710a03f5-10f6-4d38-9ff4-a80b81da590d X-MS-Exchange-CrossTenant-OriginalAttributedTenantConnectingIp: TenantId=710a03f5-10f6-4d38-9ff4-a80b81da590d; Ip=[192.88.158.2]; Helo=[az84smr01.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BY2PR03MB490 X-Topics: patch Cc: stuart.haslam@arm.com, petri.savolainen@nokia.com Subject: [lng-odp] [API-NEXT PATCH v4 03/10] linux-generic: sysinfo: move CPU HZ API to cpu.h X-BeenThere: lng-odp@lists.linaro.org X-Mailman-Version: 2.1.16 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: , List-Help: , List-Subscribe: , Errors-To: lng-odp-bounces@lists.linaro.org Sender: "lng-odp" X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: patch@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.177 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 From: Hongbo Zhang This patch moves odp_sys_cpu_hz() to cpu.h and accordingly rename it to odp_cpu_hz(). All the calling functions are also updated. New CPU HZ APIs for AMP system will be added into this cpu.h too. Signed-off-by: Hongbo Zhang --- example/classifier/odp_classifier.c | 2 +- example/generator/odp_generator.c | 2 +- example/ipsec/odp_ipsec.c | 2 +- example/packet/odp_pktio.c | 2 +- example/timer/odp_timer_test.c | 4 ++-- include/odp/api/cpu.h | 7 +++++++ include/odp/api/system_info.h | 7 ------- platform/linux-generic/arch/linux/odp_time.c | 3 ++- platform/linux-generic/odp_system_info.c | 2 +- platform/linux-generic/odp_time.c | 5 +++-- test/api_test/odp_common.c | 2 +- test/performance/odp_atomic.c | 2 +- test/performance/odp_l2fwd.c | 2 +- test/performance/odp_scheduling.c | 2 +- test/validation/system/system.c | 6 +++--- test/validation/system/system.h | 2 +- 16 files changed, 27 insertions(+), 25 deletions(-) diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index b55a6f9..267b6a5 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -733,7 +733,7 @@ static void print_info(char *progname, appl_args_t *appl_args) "CPU count: %i\n" "\n", odp_version_api_str(), odp_sys_cpu_model_str(), - odp_sys_cpu_hz(), odp_sys_cache_line_size(), + odp_cpu_hz(), odp_sys_cache_line_size(), odp_cpu_count()); printf("Running ODP appl: \"%s\"\n" diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index bdee222..ffe462d 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -988,7 +988,7 @@ static void print_info(char *progname, appl_args_t *appl_args) "Cache line size: %i\n" "CPU count: %i\n" "\n", - odp_version_api_str(), odp_sys_cpu_model_str(), odp_sys_cpu_hz(), + odp_version_api_str(), odp_sys_cpu_model_str(), odp_cpu_hz(), odp_sys_cache_line_size(), odp_cpu_count()); printf("Running ODP appl: \"%s\"\n" diff --git a/example/ipsec/odp_ipsec.c b/example/ipsec/odp_ipsec.c index 91c7fad..54e3c98 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1516,7 +1516,7 @@ static void print_info(char *progname, appl_args_t *appl_args) "Cache line size: %i\n" "CPU count: %i\n" "\n", - odp_version_api_str(), odp_sys_cpu_model_str(), odp_sys_cpu_hz(), + odp_version_api_str(), odp_sys_cpu_model_str(), odp_cpu_hz(), odp_sys_cache_line_size(), odp_cpu_count()); printf("Running ODP appl: \"%s\"\n" diff --git a/example/packet/odp_pktio.c b/example/packet/odp_pktio.c index 0db5a60..a583302 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -628,7 +628,7 @@ static void print_info(char *progname, appl_args_t *appl_args) "Cache line size: %i\n" "CPU count: %i\n" "\n", - odp_version_api_str(), odp_sys_cpu_model_str(), odp_sys_cpu_hz(), + odp_version_api_str(), odp_sys_cpu_model_str(), odp_cpu_hz(), odp_sys_cache_line_size(), odp_cpu_count()); printf("Running ODP appl: \"%s\"\n" diff --git a/example/timer/odp_timer_test.c b/example/timer/odp_timer_test.c index 933dc3b..1528715 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -350,7 +350,7 @@ int main(int argc, char *argv[]) printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); printf("CPU model: %s\n", odp_sys_cpu_model_str()); - printf("CPU freq (hz): %"PRIu64"\n", odp_sys_cpu_hz()); + printf("CPU freq (hz): %"PRIu64"\n", odp_cpu_hz()); printf("Cache line size: %i\n", odp_sys_cache_line_size()); printf("Max CPU count: %i\n", odp_cpu_count()); @@ -445,7 +445,7 @@ int main(int argc, char *argv[]) return -1; } - printf("CPU freq %"PRIu64" Hz\n", odp_sys_cpu_hz()); + printf("CPU freq %"PRIu64" Hz\n", odp_cpu_hz()); printf("Cycles vs nanoseconds:\n"); ns = 0; cycles = odp_time_ns_to_cycles(ns); diff --git a/include/odp/api/cpu.h b/include/odp/api/cpu.h index c389093..8ba9c26 100644 --- a/include/odp/api/cpu.h +++ b/include/odp/api/cpu.h @@ -44,6 +44,13 @@ int odp_cpu_id(void); int odp_cpu_count(void); /** + * CPU frequency in Hz + * + * @return CPU frequency in Hz + */ +uint64_t odp_cpu_hz(void); + +/** * @} */ diff --git a/include/odp/api/system_info.h b/include/odp/api/system_info.h index e55ff6d..f188b54 100644 --- a/include/odp/api/system_info.h +++ b/include/odp/api/system_info.h @@ -24,13 +24,6 @@ extern "C" { */ /** - * CPU frequency in Hz - * - * @return CPU frequency in Hz - */ -uint64_t odp_sys_cpu_hz(void); - -/** * Huge page size in bytes * * @return Huge page size in bytes diff --git a/platform/linux-generic/arch/linux/odp_time.c b/platform/linux-generic/arch/linux/odp_time.c index 4dc0764..3309da0 100644 --- a/platform/linux-generic/arch/linux/odp_time.c +++ b/platform/linux-generic/arch/linux/odp_time.c @@ -11,6 +11,7 @@ #include #include +#include #include #include @@ -27,7 +28,7 @@ uint64_t odp_time_cycles(void) if (ret != 0) ODP_ABORT("clock_gettime failed\n"); - hz = odp_sys_cpu_hz(); + hz = odp_cpu_hz(); sec = (uint64_t) time.tv_sec; ns = (uint64_t) time.tv_nsec; diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index 83226f8..3284ae1 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -374,7 +374,7 @@ int odp_system_info_init(void) * Public access functions ************************* */ -uint64_t odp_sys_cpu_hz(void) +uint64_t odp_cpu_hz(void) { return odp_global_data.system_info.cpu_hz[0]; } diff --git a/platform/linux-generic/odp_time.c b/platform/linux-generic/odp_time.c index a08833d..a137a36 100644 --- a/platform/linux-generic/odp_time.c +++ b/platform/linux-generic/odp_time.c @@ -8,6 +8,7 @@ #include #include +#include #include #define GIGA 1000000000 @@ -22,7 +23,7 @@ uint64_t odp_time_diff_cycles(uint64_t t1, uint64_t t2) uint64_t odp_time_cycles_to_ns(uint64_t cycles) { - uint64_t hz = odp_sys_cpu_hz(); + uint64_t hz = odp_cpu_hz(); if (cycles > (UINT64_MAX / GIGA)) return (cycles/hz)*GIGA; @@ -33,7 +34,7 @@ uint64_t odp_time_cycles_to_ns(uint64_t cycles) uint64_t odp_time_ns_to_cycles(uint64_t ns) { - uint64_t hz = odp_sys_cpu_hz(); + uint64_t hz = odp_cpu_hz(); if (ns > (UINT64_MAX / hz)) return (ns/GIGA)*hz; diff --git a/test/api_test/odp_common.c b/test/api_test/odp_common.c index 0dbefa5..80ae581 100644 --- a/test/api_test/odp_common.c +++ b/test/api_test/odp_common.c @@ -42,7 +42,7 @@ void odp_print_system_info(void) printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); printf("CPU model: %s\n", odp_sys_cpu_model_str()); - printf("CPU freq (hz): %"PRIu64"\n", odp_sys_cpu_hz()); + printf("CPU freq (hz): %"PRIu64"\n", odp_cpu_hz()); printf("Cache line size: %i\n", odp_sys_cache_line_size()); printf("CPU count: %i\n", odp_cpu_count()); printf("CPU mask: %s\n", str); diff --git a/test/performance/odp_atomic.c b/test/performance/odp_atomic.c index eefce06..c2fdc8b 100644 --- a/test/performance/odp_atomic.c +++ b/test/performance/odp_atomic.c @@ -338,7 +338,7 @@ void odp_print_system_info(void) printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); printf("CPU model: %s\n", odp_sys_cpu_model_str()); - printf("CPU freq (hz): %"PRIu64"\n", odp_sys_cpu_hz()); + printf("CPU freq (hz): %"PRIu64"\n", odp_cpu_hz()); printf("Cache line size: %i\n", odp_sys_cache_line_size()); printf("CPU count: %i\n", odp_cpu_count()); printf("CPU mask: %s\n", str); diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index 157df3b..0336dc0 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -641,7 +641,7 @@ static void print_info(char *progname, appl_args_t *appl_args) "Cache line size: %i\n" "CPU count: %i\n" "\n", - odp_version_api_str(), odp_sys_cpu_model_str(), odp_sys_cpu_hz(), + odp_version_api_str(), odp_sys_cpu_model_str(), odp_cpu_hz(), odp_sys_cache_line_size(), odp_cpu_count()); printf("Running ODP appl: \"%s\"\n" diff --git a/test/performance/odp_scheduling.c b/test/performance/odp_scheduling.c index 8d388ff..9f8535c 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -881,7 +881,7 @@ int main(int argc, char *argv[]) printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); printf("CPU model: %s\n", odp_sys_cpu_model_str()); - printf("CPU freq (hz): %"PRIu64"\n", odp_sys_cpu_hz()); + printf("CPU freq (hz): %"PRIu64"\n", odp_cpu_hz()); printf("Cache line size: %i\n", odp_sys_cache_line_size()); printf("Max CPU count: %i\n", odp_cpu_count()); diff --git a/test/validation/system/system.c b/test/validation/system/system.c index 7687f20..f29e310 100644 --- a/test/validation/system/system.c +++ b/test/validation/system/system.c @@ -75,11 +75,11 @@ void system_test_odp_sys_huge_page_size(void) CU_ASSERT(0 < page); } -void system_test_odp_sys_cpu_hz(void) +void system_test_odp_cpu_hz(void) { uint64_t hz; - hz = odp_sys_cpu_hz(); + hz = odp_cpu_hz(); CU_ASSERT(0 < hz); } @@ -90,7 +90,7 @@ CU_TestInfo system_suite[] = { {"odp_sys_cpu_model_str", system_test_odp_sys_cpu_model_str}, {"odp_sys_page_size", system_test_odp_sys_page_size}, {"odp_sys_huge_page_size", system_test_odp_sys_huge_page_size}, - {"odp_sys_cpu_hz", system_test_odp_sys_cpu_hz}, + {"odp_cpu_hz", system_test_odp_cpu_hz}, CU_TEST_INFO_NULL, }; diff --git a/test/validation/system/system.h b/test/validation/system/system.h index c8bd2d4..9790181 100644 --- a/test/validation/system/system.h +++ b/test/validation/system/system.h @@ -16,7 +16,7 @@ void system_test_odp_sys_cache_line_size(void); void system_test_odp_sys_cpu_model_str(void); void system_test_odp_sys_page_size(void); void system_test_odp_sys_huge_page_size(void); -void system_test_odp_sys_cpu_hz(void); +void system_test_odp_cpu_hz(void); /* test arrays: */ extern CU_TestInfo system_suite[];