From patchwork Tue Aug 11 07:33:54 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: 52289 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 395DC22919 for ; Tue, 11 Aug 2015 07:56:43 +0000 (UTC) Received: by wijp15 with SMTP id p15sf46476716wij.3 for ; Tue, 11 Aug 2015 00:56:42 -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=sgQi/+jfKt1F23tkOnTZJXoQXgtxICP+Jp11tfDeObw=; b=E6OO6u5sQlmOQhrgNFRzE09YcPecDddv3hFXDWVxXzyvHgnwmb6uUZq5hBeARWOYfy l1sH/TmFiHEGwrsOlAUd3iXy3qknaU+1T3Gko6hZKYzcoICGSmx2QAXvq/f6UOKHfPTn OYxxgNkyVBIWZbY1tpL242ZwwTMlX8Ti+ht+JFTA08oYFxdytu+vozLw1YK3AbJxhchu g80ph8FTQEleIbeUgZZBo7J6OYPtyzKMz3NkYiNsUtCaQskopuzB2sdFBpFksL9dlyLM GDF28rQIj9mdj/5gSyui6FAizP0moi5JLP5mMVzIa47zZMa0Bzz/gpS8CLPdVcqCaSol 3T+w== X-Gm-Message-State: ALoCoQmXk/xhPSethkqfcO9AXmKacXPB0YQW1o5+yileCGc4kbdPSDTzEUr6S2WksYpSqAG/cZUk X-Received: by 10.112.189.105 with SMTP id gh9mr2309730lbc.16.1439279802551; Tue, 11 Aug 2015 00:56:42 -0700 (PDT) X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.29.100 with SMTP id j4ls879525lah.9.gmail; Tue, 11 Aug 2015 00:56:42 -0700 (PDT) X-Received: by 10.112.162.2 with SMTP id xw2mr24665674lbb.98.1439279802407; Tue, 11 Aug 2015 00:56:42 -0700 (PDT) Received: from mail-lb0-f174.google.com (mail-lb0-f174.google.com. [209.85.217.174]) by mx.google.com with ESMTPS id ks1si750918lac.76.2015.08.11.00.56.42 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 11 Aug 2015 00:56:42 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.174 as permitted sender) client-ip=209.85.217.174; Received: by lbbtg9 with SMTP id tg9so1453182lbb.1 for ; Tue, 11 Aug 2015 00:56:42 -0700 (PDT) X-Received: by 10.112.160.42 with SMTP id xh10mr24949071lbb.88.1439279802237; Tue, 11 Aug 2015 00:56:42 -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 l6csp2354744lba; Tue, 11 Aug 2015 00:56:41 -0700 (PDT) X-Received: by 10.55.17.66 with SMTP id b63mr17581374qkh.0.1439279800806; Tue, 11 Aug 2015 00:56:40 -0700 (PDT) Received: from lists.linaro.org (lists.linaro.org. [54.225.227.206]) by mx.google.com with ESMTP id o40si1937789qkh.58.2015.08.11.00.56.40; Tue, 11 Aug 2015 00:56:40 -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 ED4D062058; Tue, 11 Aug 2015 07:56:39 +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 A2F6762072; Tue, 11 Aug 2015 07:53:45 +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 05E5C62059; Tue, 11 Aug 2015 07:53:33 +0000 (UTC) Received: from na01-bn1-obe.outbound.protection.outlook.com (mail-bn1on0143.outbound.protection.outlook.com [157.56.110.143]) by lists.linaro.org (Postfix) with ESMTPS id B289662038 for ; Tue, 11 Aug 2015 07:53:00 +0000 (UTC) Received: from BY2PR03CA010.namprd03.prod.outlook.com (10.255.93.27) by DM2PR0301MB1279.namprd03.prod.outlook.com (10.160.221.148) with Microsoft SMTP Server (TLS) id 15.1.225.19; Tue, 11 Aug 2015 07:52:59 +0000 Received: from BN1AFFO11FD035.protection.gbl (10.255.93.4) by BY2PR03CA010.outlook.office365.com (10.255.93.27) with Microsoft SMTP Server (TLS) id 15.1.225.19 via Frontend Transport; Tue, 11 Aug 2015 07:52:59 +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 BN1AFFO11FD035.mail.protection.outlook.com (10.58.52.159) with Microsoft SMTP Server (TLS) id 15.1.243.9 via Frontend Transport; Tue, 11 Aug 2015 07:52:58 +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 t7B7qjK5024123; Tue, 11 Aug 2015 00:52:56 -0700 From: To: Date: Tue, 11 Aug 2015 15:33:54 +0800 Message-ID: <1439278439-11386-5-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; BN1AFFO11FD035; 1:vUMnThUITkXab5ykGG/BSFt0TdkjZplq5XSFN6YeMSmqVFjVMtKS6Ae2W6nrEndlR70o7Nq2eMG0Dz137BxtKJYPpuh+vRJzV2wfxQ/wY1tNdx7J7PqmiYHgjvluGSxhKFXGhFB/ZphrniQXVGWnn+SE4LdUqAMRnZHIpQroPMnR+iaHWuCuA1Em9S49PKqixNWfqyktTypQ7R7CORGCVuvoMNxZr2PsnDyiCx3oFyxRjtomiiSYuQvs031cqDGdt3HNiXp22L+RwUxOKygLaVOJvQHWhqgtWE9t9VxZLxM2KMQZHnGaccnbIjnocZtCCD8k2CyeaJJZ6i6BoyPzkSpYgVd21r413O0zK30wQEct0ySoET7048JdHmHRhnqx7FWRVfkSHldU4HxOBud9Jw== 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)(5003940100001)(92566002)(4001540100001)(76176999)(110136002)(5001830100001)(5001960100002)(19580405001)(81156007)(36756003)(48376002)(50986999)(50466002)(106466001)(105606002)(6806004)(97736004)(2950100001)(104016003)(85426001)(5001920100001)(86152002)(5001860100001)(87936001)(86362001)(69596002)(189998001)(50226001)(46102003)(47776003)(64706001)(2351001)(68736005)(77096005)(33646002)(77156002)(229853001)(62966003)(19580395003)(41533002)(217873001); DIR:OUT; SFP:1102; SCL:1; SRVR:DM2PR0301MB1279; H:az84smr01.freescale.net; FPR:; SPF:Fail; PTR:InfoDomainNonexistent; A:1; MX:1; LANG:en; MIME-Version: 1.0 X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1279; 2:IykjyXoPqHVpqJCtIGG9SsaLaSdDEslpJlREhJ2osLqPzhxsycSxOpbRMxmpINnS+AqdjPnlqHBaRLqynuKcbm+ks5iBB9ntZUZqvspdtN//DAFQI0LWvY6wQ2/k30GcyeuuFlTCCMc+hmlSRb0AlW2WSderVs/+UZYG+00IQzs=; 3:kvCzLQ9Of2MvUvXO16/vY4i/VWmdyYfO1anf6lmbFMI5viL+DjNUsIYo1GFBVmSZxZSAjayVmg+3110tSwxNWsii3/U2wHKg5uuXwhFpcZLRSgE1hY+1U0rVc+ANL0w5Qht9Rkb/HEWWMDLsP6UmxqU7qRPe29e0YObY2U5O12x9bjbIsPcKR7Zmtd4Fi2N6UQq+3+wYPsTCsO+Kuaa0H8zcvT9d79QBFp+ZcmsGDC0=; 25:7pb25WdWiC8p7zbP6IiOARczvCjE/vgvGHv4uNAwOIlh3ipHQgA8gpwJ7lra7gBeff8GY3VZNvqDrIASOS423An61frj+W8rpdXl9noI3mHVecmkGSfD+pu1r5xKzeWH5mza4Mze81qLA+b9N5Q1dcj+M+64Td6mrgg4trDeB7mkezuGLtBxxZhLcO7qgQGq3as5zYYJg99iGOeYwbCz6NGhkDVwupRN7c08GQwY8t1KnSmL2GNizo3CLN2/ts0aIGcXprmadiF/LajZzMbT6A== X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:DM2PR0301MB1279; X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1279; 20:kS8vXiOR5rxkONMGSTFKLlgv982L/e6YaFewl/LIlWSMhyUicHv9t4ws9/VB4i1Zesov62eMdIq5reR08eQuvpU53dPPepuz0BLw155IgPDQBK830QbVPUneLn+uzMLyRnnPLDMLy8+aCp2E92gr6SHymY1A6nlK4zuhbazgc2+Uk6e3UG0j0hWFFkhoW2tkTfhXHBWTohrkc+vB1S8a3zRHFasuFDoCxR6iNIfla/fyJ3hRuClbAImeV0zB9Pg9UHEtutl8UPAmoxfXM0ppb4Y0+CuFzKNPGSKwlvE7EkxeK4OQDZNiLTac8U9FJPixB1obK/L1bhQYxTVfWUDFpZy4wZHgZ7yjysdjqRHLnuE=; 4:c/188YkmURNhy6SsQGz0O/q9tbouP2nANwkjYoQF3ozolUQQOPoc48PPCuvNk0WDvvV9GE1+F4JGq+77BmJM+Q51IBRl18sQ9Ct0ojeUOeCdBiIpjG1twUyACAeHUpZhKOUnamkiHse4rWmgu3leiXx0233EEmqfEpgPxf6s0h9WF3LbmPt9tivIcGqIh6szt16nZxv4LauTSFYdw6zkHPB0nMXi7cHDZNxDmRW5+XEyBHDUMyFoRaEFWKuUsEBet6KU7FU335DwKRz7So6W5DaYZPX9ImDHq53XQusVbB4= 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:DM2PR0301MB1279; BCL:0; PCL:0; RULEID:; SRVR:DM2PR0301MB1279; X-Forefront-PRVS: 066517B35B X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; DM2PR0301MB1279; 23:zw/HU7Fu6Wyd3oQ7IArJL6NGEosKJ15xFH/SBPo?= =?us-ascii?Q?klMJEkpMoUzK6ADUBZtEYLa4dK7wxAoZQlZlb7mzFO1DNE0U2s8Jgt9cy+64?= =?us-ascii?Q?rZ2hrhNg0QJQZLgYdi2V9/uvGKQZ/KWJGvM8h5IfAFYVoz4J3AKDeQAV/ZPC?= =?us-ascii?Q?LLYbAWiOtlv6gQeJrZUjIIP2XZvznjowAJfUhG/lZFiu+lVet/ttUpZQNWz4?= =?us-ascii?Q?dS9/7enF+vcpf44l/0yO1c657OlhGYT0wE9a6XEpTFYnDmbRcuz/0xqpUg1L?= =?us-ascii?Q?5PnWWm/M/Ug3w5hUUIw6PoGfnuIQr2kC4tX+1HkYyF2nHkHhSRRLPvOgo+Hy?= =?us-ascii?Q?uCp2LpME7MOLA3rz4AVqgIxqdFSh57TZ1fPK//QCYds1XGNzlS8TOJOhsRMJ?= =?us-ascii?Q?afFYcg8vFfwr/CAl1fjNVVPbphD2nwkYk4+fRydlR1odR0UJw2oHhYMpcl2I?= =?us-ascii?Q?y/NBW+8PqCE6xiNQrjd1WiZwuFONcwZqLNwFp3Bu1rxwkBiV+HM0DIWwDDGB?= =?us-ascii?Q?GJB9B93HI28PeatNa6Tb2OxcnPsseAfYsp3yhWrNqQNNfPuwdN5RgvJypQMp?= =?us-ascii?Q?An8SS0PzpD6FVgk0TRHm8bCDPFjdliYQ8Tl+rr2pDDW+Y0FdCeefSWp/z7rE?= =?us-ascii?Q?+OnWJW5/LMmH6CzsudurY1X+t0jSPd4yguFurlKsBgPeL0G2+7heRp4x2PZa?= =?us-ascii?Q?/NnaWPH4ArJ5MtMMb8Xf57gBHT2WRZu/MJO2dvqU8Qcy2TU7wcJmmXkJRAxS?= =?us-ascii?Q?+UYJHtdN+DAPYt4Ftk3mdBMhGUN4weJw4ADh0CYyxIyimTpBHakIWp31zMNw?= =?us-ascii?Q?WpKclT4cWaws+dQTooOBKz2kd+/mw5kLzWFIenklypXncN4vGXdqGi7u3ixd?= =?us-ascii?Q?Zj0xyZXR3g1wqp5nnLJuTK9O8srpnfUvbDwwVCNcJKdM+d9GYr1+WpKY1c/6?= =?us-ascii?Q?FFHRV0rrmdszDKAtlfHt5BDydqb85LT6HcBm1+tHJhT1+KMWl1KCUAbqgtKp?= =?us-ascii?Q?hvUuSGXzgE3VojHSirJPYmersfQsIK4gW8hijpyoqNjNwR5nTBzy+tNxbkVY?= =?us-ascii?Q?udLeDxjhH373fnfCSw8WxRYHvY6K5V2XKoEYw17lvVi/wFToR0WYxcNut1dP?= =?us-ascii?Q?33IoXzGAb5AtAJm2XafsH6Xio8hInj3N/q2llLt4MZ2LRcQtOZLYlV+O0HPU?= =?us-ascii?Q?/LUzjtmFKnKdrt6XbPV2Yu0T7n0VZZygjcs7z4E0tG8E2WCMuFQOPNl4m2Q?= =?us-ascii?Q?=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; DM2PR0301MB1279; 5:CHwBsSx6bNT5IGXOauKzxhSBw4J964jkEg3Y/OiO1qWepQ9De8KpshNkm0h0En3Zg/7DMuGeXHQu+aOhsux/sYrSCqsk0RCGom8C2T7QYe+WNPlxqNeifiQo6kaZLyLXXcqQ+f5osAHE0Y/plKN6Yg==; 24:jnO1Kdkh9yUV9m/fzVqYs1Lc5+HDDu4fknzbZgvnpMIUZbqDrIVFBzl9vj9D097hX/A1O7PNF5COcGqY1rEsmQGEkqIakpwct939XABBPDo=; 20:4IbKvThugU561UvF9tiWViQWfCfww96rMMe43q4Yz3Okxwc70ctrEcNJvDnZLl4J9Af8rnJUaTGhvipCUlSUsQ== SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: freescale.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 11 Aug 2015 07:52:58.8167 (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: DM2PR0301MB1279 X-Topics: patch Cc: stuart.haslam@arm.com, petri.savolainen@nokia.com Subject: [lng-odp] [API-NEXT PATCH v4 04/10] linux-generic: 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.174 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_model_str() to cpu.h and accordingly rename it to odp_cpu_model_str(). All the calling functions are also updated. New CPU model 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 | 2 +- include/odp/api/cpu.h | 7 +++++++ 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, 21 insertions(+), 21 deletions(-) diff --git a/example/classifier/odp_classifier.c b/example/classifier/odp_classifier.c index 267b6a5..8b68ce0 100644 --- a/example/classifier/odp_classifier.c +++ b/example/classifier/odp_classifier.c @@ -732,7 +732,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_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 ffe462d..2ed4ea2 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_cpu_hz(), + odp_version_api_str(), odp_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 54e3c98..32a91e4 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_cpu_hz(), + odp_version_api_str(), odp_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 a583302..75de6b8 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_cpu_hz(), + odp_version_api_str(), odp_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 1528715..b7d3dcd 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_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 8ba9c26..7b548ce 100644 --- a/include/odp/api/cpu.h +++ b/include/odp/api/cpu.h @@ -51,6 +51,13 @@ int odp_cpu_count(void); uint64_t odp_cpu_hz(void); /** + * CPU model name + * + * @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 f188b54..bde3a60 100644 --- a/include/odp/api/system_info.h +++ b/include/odp/api/system_info.h @@ -38,13 +38,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 3284ae1..8e903b0 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 80ae581..8d05efe 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_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 c2fdc8b..74d4f3a 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_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 0336dc0..6951837 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_cpu_hz(), + odp_version_api_str(), odp_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 9f8535c..a73f013 100644 --- a/test/performance/odp_scheduling.c +++ b/test/performance/odp_scheduling.c @@ -880,7 +880,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_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 f29e310..54cb7c5 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[] = { {"odp version", system_test_odp_version_numbers}, {"odp_cpu_count", system_test_odp_cpu_count}, {"odp_sys_cache_line_size", system_test_odp_sys_cache_line_size}, - {"odp_sys_cpu_model_str", system_test_odp_sys_cpu_model_str}, + {"odp_cpu_model_str", system_test_odp_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_cpu_hz", system_test_odp_cpu_hz}, diff --git a/test/validation/system/system.h b/test/validation/system/system.h index 9790181..d05f104 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_cpu_hz(void);