From patchwork Thu Sep 17 13:10:00 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: 53801 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 3F1D822E57 for ; Thu, 17 Sep 2015 13:26:15 +0000 (UTC) Received: by wisv5 with SMTP id v5sf7564511wis.0 for ; Thu, 17 Sep 2015 06:26:14 -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=k/jNiF6chv/o++a09aj7G60F+kpPvJdayL+gacea85o=; b=FiZK0ixk81ojGQx2neh2MxpY6HnkuRE3LNuopqbDWLXFFVR6DArqwZjUU9dRvYmaS7 bv/jmHxKAHz9/zmIaLIOY9137hM8LiLYqhjbGlHbC0oiZE/zsO914NNzAwiuApV0n6nd RyB4mQpYVifort5P/6XY0flWGdLAxmoW2vIynwaodWzhAJSHgNtrc9xf1yRKa3r9I12b bQPutVkVJTi3Q03r+kA8OkI5Tm0e9iWfodLPGNPUrh79syi9s5UqFjiZrAObNDD1cbWV diLkjHPlN5jKyLuaYEM7zS6P5Em31BvahUrMeEGwqdNvj9KFZDHbHs3jVsn6ZA2/C9aC 7FsA== X-Gm-Message-State: ALoCoQlre/ddl4kZevii1nkWTp1NlbeAhefkVPSJ1TjkBUAcIqhQ37yfM3YU1zXNfn6pELtNmYO/ X-Received: by 10.152.26.5 with SMTP id h5mr2887331lag.5.1442496374522; Thu, 17 Sep 2015 06:26:14 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.153.4.11 with SMTP id ca11ls80233lad.38.gmail; Thu, 17 Sep 2015 06:26:14 -0700 (PDT) X-Received: by 10.112.133.42 with SMTP id oz10mr16522575lbb.62.1442496374391; Thu, 17 Sep 2015 06:26:14 -0700 (PDT) Received: from mail-la0-f47.google.com (mail-la0-f47.google.com. [209.85.215.47]) by mx.google.com with ESMTPS id n8si2153021lbs.50.2015.09.17.06.26.14 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 17 Sep 2015 06:26:14 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.47 as permitted sender) client-ip=209.85.215.47; Received: by lanb10 with SMTP id b10so11053750lan.3 for ; Thu, 17 Sep 2015 06:26:14 -0700 (PDT) X-Received: by 10.152.28.9 with SMTP id x9mr27567820lag.73.1442496374287; Thu, 17 Sep 2015 06:26:14 -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 w3csp3070769lbq; Thu, 17 Sep 2015 06:26:13 -0700 (PDT) X-Received: by 10.140.148.204 with SMTP id 195mr2979231qhu.6.1442496373040; Thu, 17 Sep 2015 06:26:13 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id s18si2573162qgd.74.2015.09.17.06.26.12; Thu, 17 Sep 2015 06:26:13 -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 8B71E62D7B; Thu, 17 Sep 2015 13:26:12 +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 D132E62006; Thu, 17 Sep 2015 13:25:11 +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 C360D62D63; Thu, 17 Sep 2015 13:25:05 +0000 (UTC) Received: from na01-by2-obe.outbound.protection.outlook.com (mail-by2on0144.outbound.protection.outlook.com [207.46.100.144]) by lists.linaro.org (Postfix) with ESMTPS id 1D25361D15 for ; Thu, 17 Sep 2015 13:24:31 +0000 (UTC) Received: from DM2PR03CA0039.namprd03.prod.outlook.com (10.141.96.38) by BY1PR0301MB1270.namprd03.prod.outlook.com (10.161.205.144) with Microsoft SMTP Server (TLS) id 15.1.268.17; Thu, 17 Sep 2015 13:24:29 +0000 Received: from BL2FFO11FD032.protection.gbl (2a01:111:f400:7c09::148) by DM2PR03CA0039.outlook.office365.com (2a01:111:e400:2428::38) with Microsoft SMTP Server (TLS) id 15.1.274.16 via Frontend Transport; Thu, 17 Sep 2015 13:24:28 +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 BL2FFO11FD032.mail.protection.outlook.com (10.173.160.73) with Microsoft SMTP Server (TLS) id 15.1.274.4 via Frontend Transport; Thu, 17 Sep 2015 13:24:28 +0000 Received: from hongbo.ap.freescale.net (hongbo.ap.freescale.net [10.193.20.3]) by az84smr01.freescale.net (8.14.3/8.14.0) with ESMTP id t8HDOGbg005200; Thu, 17 Sep 2015 06:24:25 -0700 From: To: Date: Thu, 17 Sep 2015 21:10:00 +0800 Message-ID: <1442495411-12362-4-git-send-email-hongbo.zhang@freescale.com> X-Mailer: git-send-email 1.9.1 In-Reply-To: <1442495411-12362-1-git-send-email-hongbo.zhang@freescale.com> References: <1442495411-12362-1-git-send-email-hongbo.zhang@freescale.com> X-EOPAttributedMessage: 0 X-Microsoft-Exchange-Diagnostics: 1; BL2FFO11FD032; 1:NZOLb+8k6F6tmTsAIUpKrQnQi9w95JJXdq9lHqLAjAta4k0qTX01iEfVktRdrm3J55n3lnCa0Y/s0xovPUcxpXGcx1aCkwaIW0js4cdfohyUyReR4SgGBas+qmgNz1nK/FIoQgDK+SjJQXMhfSJm5Q6f3pKTiliOq+Ukwu15ncSkvhDkuJei9cx2C78GtbOeEX7tC/inXQQLiP91ye6yji8PhhRp5nyGkH23lSu4V5X/Tr/CZQ+9Gs5YYOe9PetF1PkthRkBIvvBaY2s/zKmj0pMkbtGpIWSNuZxdiXk2RqqK6yWWfYbaBpxlP7twpuomFslaTG2qmhZUwpZfhoey2KXN+T5QH15M6Z6pMotJJ7nERD4Ym+8Qi4KG8RJ0vrnB2BeC8idRtHia3oA+J4Oog== X-Forefront-Antispam-Report: CIP:192.88.158.2; CTRY:US; IPV:NLI; EFV:NLI; SFV:NSPM; SFS:(10019020)(6009001)(2980300002)(1110001)(1109001)(339900001)(189002)(199003)(5001960100002)(50226001)(5007970100001)(36756003)(92566002)(47776003)(5001860100001)(575784001)(19580395003)(48376002)(50466002)(68736005)(2950100001)(189998001)(6806004)(4001540100001)(110136002)(19580405001)(62966003)(85426001)(81156007)(77096005)(77156002)(46102003)(5001830100001)(11100500001)(97736004)(2351001)(76176999)(105606002)(86362001)(33646002)(229853001)(69596002)(104016003)(86152002)(87936001)(5003940100001)(64706001)(50986999)(106466001)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:BY1PR0301MB1270; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; MX:1; A:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1270; 2:zvsB6EiMNK6c83Cd1Dq9yyNZVGYxfViSiTyfXwfkMu8d3nlJggBsQ72g8aZneEOIovibBct62YBbHT4FDPEkhgplYjPrImwgswIyHtgHPnglNXHF4sV7DEyfExaQPvXEXnk51JwNBlKXZNIipm8Nbgu5ki29Rw3cTCh6MMbqYrA=; 3:I74osHS9MW92+7jqpuNIJU4vTbsyBL2uRu1amI3CmmepJ/XryuCbNXBGBXoAnaZZKDtGyf08y+f1Pkadhs5XOLrwTjfFusyEu7vTtf9SAtJls6JUqVs9Es3r/p3ldrxMuHx0ihB9xdNYMUVaW6g2nSWCOrt1mwBOKghr2yY04dhDUK/HLpTOrOmPaG1TGBJFkRP/ix8JVGE3nQ+Cg/NW8W+CRo77C2rC4Ewjn8rkVsM=; 25:Ymdo+bS1npzHvhl6D/7X8c1Yp6RHdRFJGi3MJCz9Xb2QKira/wtQK9sZ/CFPLdpvZ7ZyKFrqO6+lwWYxUo78ESbledGMQKU7ttoYWw5HD8BJ//XLdx7uBfamgghj73K635Jc3Ha4JBtUGIhjPpB+KLBz86hcBbwwsSAofzJCq6t3YJoHo0yEYhAyVAUeXJ9p+5GUDn+Klzjhbq4aRs0DzrkM/1CFKO/3MF823Ue8t6PkluL/Mqv5O2gurbiKv78K X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:BY1PR0301MB1270; X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1270; 20:EPx+qk4/3JtogeXv29UuSkIPUC1jRM2eotxiVITckR/WwLwPWS/HiW1OrYw5Kw4KFd0ONuym9mwyJ8WfziLjZ1DqzAkLSNGDXy5Qs9KsJK7tm1RDZVkzgbKZBv7qGrJ6NLci12DerIuMbSEliCG201j5bhCKW93zX9Uznf6gYVBMpfcuD0CV0ZwTzgOmuMvRuWisfNDUlO4juR2wOuGcobT6X7HYlFLX1DtJQRiuj/NeVCqUmiHocyHzRskdEUPqz9Ai8tAxd2LO/Pw3fR8ncoyR3R3HAidF3B+7bf/t1lOT9zjdTzktugalFarpupsNkfZaKYXQIbtnkR6MicceChm8GJy4z1eQf5/gy4CGcTY=; 4:hd392BWcKvdI2b4WiI3CVah204vQTGLmwGv9BmL9Fmdh8LC5eL5O76ZZqewexFE30KPe0lvVDGqzLWQAOq5ukHE5HG4Mg/JKGwjrxXC8yANoTLTzYlwqSjI7M/nIbvaKOPnUuH0J5wAYaFk4ir3jtR42mZi2yGArpIXJY/QQLego1YsVyDEKegIrTlJBIOIhafHlQ3ItKxuincfrSHQjaRK8wiY16sWOVtvP2iFnlxUkE+ANaV7fuAu3cykfs+CxCOF/F0EkTBh0aEBAF28TUoQQlyLB99cu19ZK/Lr/15K8TgiLul9eLagN6IZZDahvHE0faxjOzgSLjrwcad/DkMTyXSTMaBEQF+csc053rc/HnxNOA2b3xQOHJr0aDgwE X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(8121501046)(520058)(520078)(5005006)(520075)(3002001); SRVR:BY1PR0301MB1270; BCL:0; PCL:0; RULEID:; SRVR:BY1PR0301MB1270; X-Forefront-PRVS: 07025866F6 X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; BY1PR0301MB1270; 23:YAMWSbj2v+r0/qYokwm2YQVdLhwza+iZUB6zHF3?= =?us-ascii?Q?Dg/WSA3KRIWfiZ1q/6j45QXI6PCz/pYR37In/dPgF8wpMf92+X1vj2Eu1YDz?= =?us-ascii?Q?b6fzIEXnue5qaqIms1C+WdWRPhPJPDk3WIWmDgG/qb+SOcREyY3iNa9yJ0bI?= =?us-ascii?Q?jHJyFgB+5X0ufplqtwZLzkSuhPo8CV7tqTl4SIQZt3P7JI+HfNtK28kIDZ1p?= =?us-ascii?Q?Z155fTNiYsPQ2eg3wz/jNDGUNuZMMyEwPXcEa6kHYwF0UBA7deiX4TfgBnJ0?= =?us-ascii?Q?2TEQVt+K7zjateudd7Ih8fXMpp3Y1QN4N2xQ+s3AMSM6OsHoKgwUVLGK5A2f?= =?us-ascii?Q?TaHboCDlhbmts19GaqmrzUvTx8WhwNHaJI4p5IywvVav9UMc2Cbv16HWgD0O?= =?us-ascii?Q?lZ58pEcnaXV0bc4mNj7hscO1X+bLnma9Py4YFYiFMkinizX+W+7fVPHCDFgq?= =?us-ascii?Q?JPll/k5eFE70UqKYaiowlJ941GnU2XBZV3B8oSXV3RX/dHbEIHJFmGMqXHOe?= =?us-ascii?Q?Tq9FftYMNYY4FD2/XMEzTnNHE9NxH0jj/Km1JA3YohjGE7qYh/Bq5REy8c5+?= =?us-ascii?Q?1PFiNSe9SbxKC9JeCC/+qRnRS2mQgj+K9iZv4X35KWpql9AYv6PJ70FHxCHd?= =?us-ascii?Q?XghUb8r4dQkIYPRHXGXeqLSq6sxt57gKaAZbSAjrpKNgU1m3nKbX64oLMO3g?= =?us-ascii?Q?DzRAicEUPFZJuLakbl3Z+Ur2PHS7wJTsNNfWXvhqhwz7Noik/0M4xk8AJ2Da?= =?us-ascii?Q?hxRiO+fINegTEOoIAQqdwMB3GO6O7ovea3oE+kQ/dMcPvqiIt//jgcUdW9Yo?= =?us-ascii?Q?16eOfLcyQIn2TTWTnsBjeqLa2k8rAY2qP5lG3xcHZnz0ZNxq+yQvdkwV77dI?= =?us-ascii?Q?73fXbSf2laeF8++UtFKbTImEM7J8IlrSLL865L2l7B2IQ6YMNKjaSvtTTovI?= =?us-ascii?Q?Cm8ClpkTHCxBzbnH38ucDxdproET7GlHN9o8HKKjFOr1FFY/EdYrQncReRhm?= =?us-ascii?Q?HSpLXwjsnEIe2gdLjQfa80TmVD3B1sOtVuzYXnyr41fvb702aOKH+W5nM0Ez?= =?us-ascii?Q?C8S7NtYVL3NYWi4zWlr2G85MSMGCz3yrwq7PMScPJ2LHIkMXCpV67Vnjf1gk?= =?us-ascii?Q?Ypf4PGi22jlMf6sFEXmzJJFM5ZKPGi4sXxISeQOepGStYAiwPp6IAyAak9cO?= =?us-ascii?Q?CiQpzD+/Abfm1KYNvyYe5a+NlF2bj1Q4KH4ydpPubF/wH/Xv3Y4a7KldZSl4?= =?us-ascii?Q?YxaKewgnKw/VWrBfVhc7jcehUFi+raO56TEYzTXoo77ubYtQ6Aj8MZ7rn+D6?= =?us-ascii?Q?afQ=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; BY1PR0301MB1270; 5:8CLUca6WCKXkSXhgqBEgMnjENCa+GjGNRFS53hbe2obQcknGs1qLKjKYcCuhBn4CR98k+50jo2NKrGc3VJdmpcBfoFAiUIi4IVZ9SNPslufO/3Z2jTcBqvel4+J9t4mt+x5yehSy6sFE2ItxTxu+gw==; 24:A+pVdZtX+/ue9ytJaCODy1ErNet++fIx17mIv+qBQ1IWx4nvSB0EG4thOtcFSQfQAYLvUnG8ogEUTm1xVEtWeYyXlZyb44t0VZb35Qpz04s=; 20:4/wNeKTTeR0CLHx0vwEg8V8TmPTSBjvRlVsrnOk97FKjgvt6O6iisIURUBnRpy6HinHKWWgAh9esX4/7ZBqECA== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 17 Sep 2015 13:24:28.3490 (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: BY1PR0301MB1270 X-Topics: patch Cc: petri.savolainen@nokia.com, stuart.haslam@arm.com Subject: [lng-odp] [API NEXT PATCH v6 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.215.47 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 685f335..021d4dc 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -745,7 +745,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 f7aed76..9f9511f 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 96effe2..ee43c3f 100644 --- a/example/ipsec/odp_ipsec.c +++ b/example/ipsec/odp_ipsec.c @@ -1534,7 +1534,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 df53ea2..92bb243 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 49630b0..bee4be7 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 c389093..78c3ffc 100644 --- a/include/odp/api/cpu.h +++ b/include/odp/api/cpu.h @@ -44,6 +44,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); + +/** * @} */ 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 0dbefa5..f927ea6 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 eefce06..29efd1b 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 64fc1b2..7621948 100644 --- a/test/performance/odp_l2fwd.c +++ b/test/performance/odp_l2fwd.c @@ -669,7 +669,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 2a7e531..c93dd44 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -878,7 +878,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);