From patchwork Tue Oct 13 11:13:07 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: 54834 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-lb0-f198.google.com (mail-lb0-f198.google.com [209.85.217.198]) by patches.linaro.org (Postfix) with ESMTPS id 0936120490 for ; Tue, 13 Oct 2015 11:34:24 +0000 (UTC) Received: by lbbpc3 with SMTP id pc3sf7869005lbb.2 for ; Tue, 13 Oct 2015 04:34:23 -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=vKOSzAaPiTvOpKG+Q3UHwqacL6AOtHOVDtbZHGOe+4M=; b=SawngpqqLJIylVx4hrtGGeMKTbmCV+FAdakefNzUQTl5qfHC06snfdd3v8rUfg/B0D aJc/gG3cnmivEYzf0MVQKiBXTN1ZynnfN7B3fnDYZntB7t74pDSULruYhx21iQFydQqm B4Bod51iBPnAd7qQ3EVhUUtT/1U647y5f1tkdcl5LeNBsYgXmKgrIoaqKjxLhsv8sqKm sEVumrPr429xnfCzZ7TkbiEUvMhR7NNO8djxkHDzAgLQnn+YLH30UIL66AAyXLA5CkKO OD4QPypYEEKi426dbaxXT4M6ND/zSll1rb2STwW1GTOT0Z4NnIYL5OFDOZaZ/ZGLRxeA 7dUQ== X-Gm-Message-State: ALoCoQkNu+GJy7odBK/GplpwqGDOpskG+KVALXsRDO9Nt+djJh9Z59mERYAVNGXobLGKPRaoj8F6 X-Received: by 10.180.210.212 with SMTP id mw20mr4105271wic.3.1444736062930; Tue, 13 Oct 2015 04:34:22 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.25.211.1 with SMTP id k1ls79286lfg.53.gmail; Tue, 13 Oct 2015 04:34:22 -0700 (PDT) X-Received: by 10.112.14.9 with SMTP id l9mr14873309lbc.91.1444736062519; Tue, 13 Oct 2015 04:34:22 -0700 (PDT) Received: from mail-lb0-f182.google.com (mail-lb0-f182.google.com. [209.85.217.182]) by mx.google.com with ESMTPS id a133si1866733lfe.143.2015.10.13.04.34.22 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 13 Oct 2015 04:34:22 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.182 as permitted sender) client-ip=209.85.217.182; Received: by lbbk10 with SMTP id k10so16253077lbb.0 for ; Tue, 13 Oct 2015 04:34:22 -0700 (PDT) X-Received: by 10.25.86.213 with SMTP id k204mr9677802lfb.36.1444736062311; Tue, 13 Oct 2015 04:34:22 -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.59.35 with SMTP id w3csp2074397lbq; Tue, 13 Oct 2015 04:34:21 -0700 (PDT) X-Received: by 10.107.154.211 with SMTP id c202mr32249302ioe.53.1444736061031; Tue, 13 Oct 2015 04:34:21 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id g19si2513651igt.75.2015.10.13.04.34.20; Tue, 13 Oct 2015 04:34:20 -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 5617D61B7F; Tue, 13 Oct 2015 11:34:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on ip-10-142-244-252 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 [127.0.0.1] (localhost [127.0.0.1]) by lists.linaro.org (Postfix) with ESMTP id BAB0561A10; Tue, 13 Oct 2015 11:32:22 +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 B845261A47; Tue, 13 Oct 2015 11:32:17 +0000 (UTC) Received: from na01-bl2-obe.outbound.protection.outlook.com (mail-bl2on0146.outbound.protection.outlook.com [65.55.169.146]) by lists.linaro.org (Postfix) with ESMTPS id 8843861971 for ; Tue, 13 Oct 2015 11:31:39 +0000 (UTC) Received: from BLUPR0301CA0007.namprd03.prod.outlook.com (10.162.113.145) by BLUPR03MB487.namprd03.prod.outlook.com (10.141.79.27) with Microsoft SMTP Server (TLS) id 15.1.293.16; Tue, 13 Oct 2015 11:31:37 +0000 Received: from BY2FFO11OLC009.protection.gbl (2a01:111:f400:7c0c::150) by BLUPR0301CA0007.outlook.office365.com (2a01:111:e400:5259::17) with Microsoft SMTP Server (TLS) id 15.1.293.16 via Frontend Transport; Tue, 13 Oct 2015 11:31:36 +0000 Received-SPF: Fail (protection.outlook.com: domain of freescale.com does not designate 192.88.168.50 as permitted sender) receiver=protection.outlook.com; client-ip=192.88.168.50; helo=tx30smr01.am.freescale.net; Received: from tx30smr01.am.freescale.net (192.88.168.50) by BY2FFO11OLC009.mail.protection.outlook.com (10.1.15.0) with Microsoft SMTP Server (TLS) id 15.1.293.9 via Frontend Transport; Tue, 13 Oct 2015 11:31:36 +0000 Received: from hongbo.ap.freescale.net (hongbo.ap.freescale.net [10.193.20.96]) by tx30smr01.am.freescale.net (8.14.3/8.14.0) with ESMTP id t9DBVOFl009638; Tue, 13 Oct 2015 04:31:33 -0700 From: To: Date: Tue, 13 Oct 2015 19:13:07 +0800 Message-ID: <1444734798-29063-4-git-send-email-hongbo.zhang@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1444734798-29063-1-git-send-email-hongbo.zhang@freescale.com> References: <1444734798-29063-1-git-send-email-hongbo.zhang@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BY2FFO11OLC009; 1:PXX0D/TxK+oeSuM7FshPMZseup/asNgtlRdGsge8ReTbULDcvshxvcUdTlCMyfzgwh/nL2JCLYXoziTpmN07Jy0Xy3x1FrjMAfC2bhOxr8WKIe5l/fQm4V6DRoLTsVMDS1wQ6rwW5xSEV7hmXtWvGAoJe3hrmOR9q3t4O54WMtdVsJ3o6ElKfG1WGufzO8Bt9QRS/Qak3tlKBsWVm0ue+sYbIMlusIq/ozM4qLLOWBzOal6ruX3RF8ofzgEUBWoPEQeUFuxxwkBB/yiePs4dvl1cgLByJZXpLcWjmWdjafjSdBKEcLDGZUehvEAVuktgGUwGljKXF5DcHFT4aPj1HjVlhOvncydgfD/1UoW4sQgKEFfj5HRXIzaax+IYoKDi3dsbvCbnhF2cXEJun5aerw== X-Forefront-Antispam-Report: CIP:192.88.168.50; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1109001)(1110001)(339900001)(199003)(189002)(86362001)(11100500001)(575784001)(5008740100001)(46102003)(6806005)(50466002)(106466001)(229853001)(64706001)(2351001)(47776003)(76176999)(105606002)(5003940100001)(86152002)(50986999)(2950100001)(50226001)(48376002)(19580405001)(77096005)(19580395003)(5007970100001)(110136002)(189998001)(5001960100002)(36756003)(33646002)(92566002)(81156007)(5001920100001)(97736004)(104016004)(85426001)(87936001)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:BLUPR03MB487; H:tx30smr01.am.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB487; 2:dy8s6VH9Rl2DM9rY2QS2DvRDs5UpV19TETA4YCKOfv6j5dabegYif7MCcl8+1+qSe9XVlJyHvoN/JIetivFtVaT1ngGaP3zU1y3YgEUmei2plNmRhRsNYPqJ9HjO/LapD2FRaZx/ujQnsODBKBygjQXgSgfbYzMPRJJTEDpjq/o=; 3:LzI8kiYCfuEyAbbXiTPNTsDR31AbOpnrVUP5hB/Kkl2JxhhA3HXEL7xoyjBnTzFgtifvPpNzc5Mq3YyJRDupQVBkR+qePPgYek83t7CYUATCeGk1Q2Zm5SDfWtufMdoMuHqtc0H1DOsTk5z+gwzIXM+BrZUSSl7SvBvMYOjFoMuLB/ggywfeFIMCzY4xN0CddXzw8jHTuK4gxZBL2Ai5w6XRlwnyw89phiBQLzw58PI=; 25:6mFGaQN0smkLWyudFg8cVBHQrnBsrHGJ25SV4F+VjTLl5mhb2ctDv+nyqp9NT+xkOVStiDQI+tJTtgdaSXO72fgp/LBJBZzVzen76aJw/RoEFuaNZFEsdfP/pXCU8wsfhqTrcop4cJ8T/euzgcgiuW1DqP8qPcrNFH417GgpokNqR6bROgRBKaWiyuih/JdV8WQe7ltQC8qMHikN+EOrU5b4dIc01HV0Rn6cVo9OpuGaizsRvu+tGKPqpijaYLtz X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BLUPR03MB487; X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB487; 20:5Ci2JJb99cx6E+npRDV8CxusJgu0I17/zBbeBvYG6qQZAfDu6uh/zpzWJDli3UHE4y05C8DWEEboFjVGsvkw+rlJyqIRqATKp2iKTgVvDEBCphQq5X6fOTtBU0C6fz/UiNUokmWAvsx6wwxfPQcgacfdnZ9aPy0fryIr03/dy1ASRdT+YSoQxK5PyeTkuVxPeSZE6zgoCt5PX6vaUfFCUyNfK1ZdsxOaxbBF7lUprfJDpm9MXc/CWkEQoPq6K3vkosOIhA6QVYfaxzfXCAboSpKyGfr9W19OVP6GKZy09ebBzzWsEmFyH2bjRLfDo7UrZhQqvEbaB0dYJWvrly0zIp2GLQAKyrgpFVpAOG4sFug=; 4:tcYqgIqda/CYw8g35HSWI7lyGW1wOeZs47Fvkvu+f2DcVOlXPXUnwsyfNXgJa6KfIZVVR8tkmd+mQHCwGbVvtPUvEk3SQk08KdSt7mZS0zxDYZ399anzPF+mdI6IoUc4q9vb62b08XF/ipYc6DZGWZLS6RbdHbmGf5ZMCgl8RxIWOTEjql0NWkCenJsX+YiEW70C2pGXFXPnNPMToS7F+K8yi9FFU9cMR3yXcGH7Stl6CJ0m6KxLGjScxd+604S2KR0X3kl6eEXS+rHkbH7LQG3eoCbAEZFn2coKraji36gTKSiKc2ywYsTdP7YWD5FnwN2OcNsIfTS5OWfz4nsFQ30XLHhUJnuxK9VQYgBqUGI= X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(520078)(8121501046)(3002001); SRVR:BLUPR03MB487; BCL:0; PCL:0; RULEID:; SRVR:BLUPR03MB487; X-Forefront-PRVS: 07283408BE X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BLUPR03MB487; 23:b2EnuFrNGSHRpYam/r6tcubVy2FdyL51AUVK3mDFq8?= =?us-ascii?Q?T14ICmLlfCGwP2WABsINQ5re3/3MysHzplInZ0M57kDIOTG+FX6vHdNpWR+6?= =?us-ascii?Q?pmG2wAQSBCNqvZWThEx+MZhV8A+fMkTX5a7jHy/6T9tRu5vN8SckO+DJI+dZ?= =?us-ascii?Q?W+ugnodqTZyPT71ftASAJ1dV3GjmVimQIG4qAqawfuG2jNgHB6yH8wdnDdZu?= =?us-ascii?Q?oSgWF2BvWsyuVt0w1VWMuSbh5No6t3ywN1PhOHjlWYgU2lz7rw5rBLFVR8Hv?= =?us-ascii?Q?G4ruNmVYMfm7rAVEtAmZpfFji3/d26E1GKOFe7RNyouLlGmajh/ksnR8YgRY?= =?us-ascii?Q?bKgsQLu5mkyg6x4LXUmv2LVZjivmlrX0sacIkU48ssF/YUJAfQ45bbjUYJZw?= =?us-ascii?Q?6FCdxfcOGZg6M6T6F46IbWUViSzxE26w1PKUtjya6u0xAmgzlYvhexo/lSNm?= =?us-ascii?Q?YtT9Abpe/XnEDMiFhKOz34JQznReSEuPRQYUHgvGgnAZLd2/NSaq+6pPAUoX?= =?us-ascii?Q?NN558HlLd10CkgYgUXW2SY0VQKrGb9n/I15ba4xMWlREyzWkiXQWSxAlSoL3?= =?us-ascii?Q?acHG1frJNgUGWhkVfoqZbtJe4zRa6AjefELwExf9vcrIZLApI9W1YSHT/lNg?= =?us-ascii?Q?NOy8TbJib3C6DTZRDVb1ph0OVrNAT4cYydjkGkvslX5tyDks0yPP8P3kTbGK?= =?us-ascii?Q?018yFwDOu/9FXhujXlFudlCSP/Ujo7V7Fn5J0aq/4ti9fFjw3UUrM4jh0sqW?= =?us-ascii?Q?yjMT2jD1apApqcu8VIHeem747uyNBJaBvnhhepd56iOYHdycLUOtHf0FsIBw?= =?us-ascii?Q?0vitiEFnwlE0HxhKNX6Ta/316hGPNV5X0D8u804mK3A6K1cYSgWBSEKN04bF?= =?us-ascii?Q?mg+/a4AtWqz2tXFUoi3rQTN8SC7NlB5gt1mMrv0SWd0v7T+xaR0CyLDdKMse?= =?us-ascii?Q?Flyc235ucxIJMhWQp+PYT59O3/pG7MhBvISiOXu8TtZr/oKoz8qOxiqg50CE?= =?us-ascii?Q?uL2OiyFM42ccLDYrhhmOaKQjnqZ7wG3Aat1YK6WNz2vrUjOpBRGxFPuA4knj?= =?us-ascii?Q?RVA4nE1cng2Bgn5qeGrDzxUqE4gLIt12INOw9e0u4i+qLELoNMBPod46xqd6?= =?us-ascii?Q?fWbUkyLb8RSrjl7sk8/1vHZ8IfF3n2swx9rimqQsp10sNQs/HPyslLAzcA+i?= =?us-ascii?Q?QEOrLuVQE6E/c=3D?= X-Microsoft-Exchange-Diagnostics: 1; BLUPR03MB487; 5:IxmRoN23nS/xw/OgDSYhrXtT4vD5HE6UPXA61UmJ6ZJ4J8/h/MaceJv5u7udjvv72Mktg8aCtiS1nx8m4i0bQeP7CbfvLIrvF6kBXRzmNhVHY0iBhoypvNDhbMHJ6WfvcRR/QYeyyJmIYpSYDj9KFA==; 24:tXLHAi9iPi8UPurnH2ayW8427oTo41+oOQLN9pvjH+ZSgR4nWU10EITYqVE9TYXnjdpJu21Z19DKw2dOfKQa+z5VUSJzOIlNYj7IS+jPZjM=; 20:enzv0d4035lpiMVDN7e3sxLFbHFCeTN4K4Q/lS6dwiqcRTsS3+jRk7mS1BnvgZcqdMxE9RWsJthAgxmwFX9kuA== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Oct 2015 11:31:36.7860 (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.168.50]; Helo=[tx30smr01.am.freescale.net] X-MS-Exchange-CrossTenant-FromEntityHeader: HybridOnPrem X-MS-Exchange-Transport-CrossTenantHeadersStamped: BLUPR03MB487 X-Topics: patch Cc: petri.savolainen@nokia.com, stuart.haslam@arm.com Subject: [lng-odp] [API NEXT PATCH v7 03/14] api: sysinfo: move CPU model 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.182 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 The legacy odp_sys_cpu_model_str() is moved to cpu.h then accordingly renamed to odp_cpu_model_str(), and all the calling functions are also updated at same time. 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 | 2 +- include/odp/api/cpu.h | 9 +++++++++ include/odp/api/system_info.h | 7 ------- platform/linux-generic/odp_system_info.c | 2 +- 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 +- 14 files changed, 23 insertions(+), 21 deletions(-) diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 7790313..b98bd46 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -759,7 +759,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_version_api_str(), odp_cpu_model_str(), odp_sys_cpu_hz(), odp_sys_cache_line_size(), odp_cpu_count()); diff --git a/example/generator/odp_generator.c b/example/generator/odp_generator.c index 3bb6c4f..6dd43d6 100644 --- a/example/generator/odp_generator.c +++ b/example/generator/odp_generator.c @@ -1063,7 +1063,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_cpu_model_str(), odp_sys_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 6286b0a..5a191ee 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1517,7 +1517,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_cpu_model_str(), odp_sys_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 ce53ee3..824b755 100644 --- a/example/packet/odp_pktio.c +++ b/example/packet/odp_pktio.c @@ -650,7 +650,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_cpu_model_str(), odp_sys_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 94619e4..2a44862 100644 --- a/example/timer/odp_timer_test.c +++ b/example/timer/odp_timer_test.c @@ -349,7 +349,7 @@ int main(int argc, char *argv[]) printf("ODP system info\n"); printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); - printf("CPU model: %s\n", odp_sys_cpu_model_str()); + printf("CPU model: %s\n", odp_cpu_model_str()); printf("CPU freq (hz): %"PRIu64"\n", odp_sys_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/include/odp/api/cpu.h b/include/odp/api/cpu.h index 50a7e3d..554e503 100644 --- a/include/odp/api/cpu.h +++ b/include/odp/api/cpu.h @@ -46,6 +46,15 @@ int odp_cpu_id(void); int odp_cpu_count(void); /** + * CPU model name of this CPU + * + * Returns the CPU model name of this CPU. + * + * @return Pointer to CPU model name string + */ +const char *odp_cpu_model_str(void); + +/** * Current CPU cycle count * * Return current CPU cycle count. Cycle count may not be reset at ODP init diff --git a/include/odp/api/system_info.h b/include/odp/api/system_info.h index e55ff6d..1cd883f 100644 --- a/include/odp/api/system_info.h +++ b/include/odp/api/system_info.h @@ -45,13 +45,6 @@ uint64_t odp_sys_huge_page_size(void); uint64_t odp_sys_page_size(void); /** - * CPU model name - * - * @return Pointer to CPU model name string - */ -const char *odp_sys_cpu_model_str(void); - -/** * Cache line size in bytes * * @return CPU cache line size in bytes diff --git a/platform/linux-generic/odp_system_info.c b/platform/linux-generic/odp_system_info.c index 83226f8..ed6b515 100644 --- a/platform/linux-generic/odp_system_info.c +++ b/platform/linux-generic/odp_system_info.c @@ -389,7 +389,7 @@ uint64_t odp_sys_page_size(void) return odp_global_data.system_info.page_size; } -const char *odp_sys_cpu_model_str(void) +const char *odp_cpu_model_str(void) { return odp_global_data.system_info.model_str[0]; } diff --git a/test/api_test/odp_common.c b/test/api_test/odp_common.c index 681d915..2f1f96f 100644 --- a/test/api_test/odp_common.c +++ b/test/api_test/odp_common.c @@ -41,7 +41,7 @@ void odp_print_system_info(void) printf("ODP system info\n"); printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); - printf("CPU model: %s\n", odp_sys_cpu_model_str()); + printf("CPU model: %s\n", odp_cpu_model_str()); printf("CPU freq (hz): %"PRIu64"\n", odp_sys_cpu_hz()); printf("Cache line size: %i\n", odp_sys_cache_line_size()); printf("CPU count: %i\n", odp_cpu_count()); diff --git a/test/performance/odp_atomic.c b/test/performance/odp_atomic.c index 1402a0c..8ba795e 100644 --- a/test/performance/odp_atomic.c +++ b/test/performance/odp_atomic.c @@ -337,7 +337,7 @@ void odp_print_system_info(void) printf("ODP system info\n"); printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); - printf("CPU model: %s\n", odp_sys_cpu_model_str()); + printf("CPU model: %s\n", odp_cpu_model_str()); printf("CPU freq (hz): %"PRIu64"\n", odp_sys_cpu_hz()); printf("Cache line size: %i\n", odp_sys_cache_line_size()); printf("CPU count: %i\n", odp_cpu_count()); diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c index e1bd9a8..b7da6e8 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -713,7 +713,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_cpu_model_str(), odp_sys_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 73eeb72..8a45f3b 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -867,7 +867,7 @@ int main(int argc, char *argv[]) printf("ODP system info\n"); printf("---------------\n"); printf("ODP API version: %s\n", odp_version_api_str()); - printf("CPU model: %s\n", odp_sys_cpu_model_str()); + printf("CPU model: %s\n", odp_cpu_model_str()); printf("CPU freq (hz): %" PRIu64 "\n", odp_sys_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 15f3ac4..0a0aa00 100644 --- a/test/validation/system/system.c +++ b/test/validation/system/system.c @@ -49,11 +49,11 @@ void system_test_odp_sys_cache_line_size(void) CU_ASSERT(ODP_CACHE_LINE_SIZE == cache_size); } -void system_test_odp_sys_cpu_model_str(void) +void system_test_odp_cpu_model_str(void) { char model[128]; - snprintf(model, 128, "%s", odp_sys_cpu_model_str()); + snprintf(model, 128, "%s", odp_cpu_model_str()); CU_ASSERT(strlen(model) > 0); CU_ASSERT(strlen(model) < 127); } @@ -87,7 +87,7 @@ CU_TestInfo system_suite[] = { _CU_TEST_INFO(system_test_odp_version_numbers), _CU_TEST_INFO(system_test_odp_cpu_count), _CU_TEST_INFO(system_test_odp_sys_cache_line_size), - _CU_TEST_INFO(system_test_odp_sys_cpu_model_str), + _CU_TEST_INFO(system_test_odp_cpu_model_str), _CU_TEST_INFO(system_test_odp_sys_page_size), _CU_TEST_INFO(system_test_odp_sys_huge_page_size), _CU_TEST_INFO(system_test_odp_sys_cpu_hz), diff --git a/test/validation/system/system.h b/test/validation/system/system.h index c8bd2d4..2043a54 100644 --- a/test/validation/system/system.h +++ b/test/validation/system/system.h @@ -13,7 +13,7 @@ void system_test_odp_version_numbers(void); void system_test_odp_cpu_count(void); void system_test_odp_sys_cache_line_size(void); -void system_test_odp_sys_cpu_model_str(void); +void system_test_odp_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);