From: Hongbo Zhang <hongbo.zh...@linaro.org>
This patch moves all CPU realted APIs to the cpu.h, they are:
odp_sys_cpu_hz() and odp_sys_cpu_model_str(), and accordingly rename
them to odp_cpu_hz() and odp_cpu_model_str(),
All the calling functions are updated too.
New APIs for AMP system will be added into this cpu.h too.
Signed-off-by: Hongbo Zhang <hongbo.zh...@linaro.org>
---
example/classifier/odp_classifier.c | 4 ++--
example/generator/odp_generator.c | 2 +-
example/ipsec/odp_ipsec.c | 2 +-
example/packet/odp_pktio.c | 2 +-
example/timer/odp_timer_test.c | 6 +++---
include/odp/api/cpu.h | 14 ++++++++++++++
include/odp/api/system_info.h | 14 --------------
platform/linux-generic/arch/linux/odp_time.c | 3 ++-
platform/linux-generic/odp_system_info.c | 4 ++--
platform/linux-generic/odp_time.c | 5 +++--
test/api_test/odp_common.c | 4 ++--
test/performance/odp_atomic.c | 4 ++--
test/performance/odp_l2fwd.c | 2 +-
test/performance/odp_scheduling.c | 4 ++--
test/validation/ver_abt_log_dbg/odp_system.c | 12 ++++++------
15 files changed, 42 insertions(+), 40 deletions(-)
diff --git a/example/classifier/odp_classifier.c
b/example/classifier/odp_classifier.c
index 643e16c..c695741 100644
--- a/example/classifier/odp_classifier.c
+++ b/example/classifier/odp_classifier.c
@@ -727,8 +727,8 @@ 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_sys_cache_line_size(),
+ 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/generator/odp_generator.c
b/example/generator/odp_generator.c
index 0ff264c..8920146 100644
--- a/example/generator/odp_generator.c
+++ b/example/generator/odp_generator.c
@@ -978,7 +978,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_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 4928985..5fcc9dd 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_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 0b4a8f1..d0b6e7c 100644
--- a/example/packet/odp_pktio.c
+++ b/example/packet/odp_pktio.c
@@ -626,7 +626,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_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 f4af0e2..01abe04 100644
--- a/example/timer/odp_timer_test.c
+++ b/example/timer/odp_timer_test.c
@@ -364,8 +364,8 @@ 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 freq (hz): %"PRIu64"\n", odp_sys_cpu_hz());
+ 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());
@@ -463,7 +463,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..7b548ce 100644
--- a/include/odp/api/cpu.h
+++ b/include/odp/api/cpu.h
@@ -44,6 +44,20 @@ 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);
+
+/**
+ * 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 1f3294b..7c1d4a7 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
@@ -45,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/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 <odp/time.h>
#include <odp/hints.h>
+#include <odp/cpu.h>
#include <odp/system_info.h>
#include <odp_debug_internal.h>
@@ -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 ab741eb..26fe2c8 100644
--- a/platform/linux-generic/odp_system_info.c
+++ b/platform/linux-generic/odp_system_info.c
@@ -373,7 +373,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];
}
@@ -388,7 +388,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/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 <odp/time.h>
#include <odp/hints.h>
+#include <odp/cpu.h>
#include <odp/system_info.h>
#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 0677f9b..0a2b184 100644
--- a/test/api_test/odp_common.c
+++ b/test/api_test/odp_common.c
@@ -41,8 +41,8 @@ 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 freq (hz): %"PRIu64"\n", odp_sys_cpu_hz());
+ 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());
printf("CPU mask: %s\n", str);
diff --git a/test/performance/odp_atomic.c b/test/performance/odp_atomic.c
index 861ab83..7fcd0b0 100644
--- a/test/performance/odp_atomic.c
+++ b/test/performance/odp_atomic.c
@@ -337,8 +337,8 @@ 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 freq (hz): %"PRIu64"\n", odp_sys_cpu_hz());
+ 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());
printf("CPU mask: %s\n", str);
diff --git a/test/performance/odp_l2fwd.c b/test/performance/odp_l2fwd.c
index dd0b4b1..877be14 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -639,7 +639,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_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 99f0f9b..69e74f4 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
@@ -869,8 +869,8 @@ 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 freq (hz): %"PRIu64"\n", odp_sys_cpu_hz());
+ 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/ver_abt_log_dbg/odp_system.c
b/test/validation/ver_abt_log_dbg/odp_system.c
index 5185a71..22e8db3 100644
--- a/test/validation/ver_abt_log_dbg/odp_system.c
+++ b/test/validation/ver_abt_log_dbg/odp_system.c
@@ -48,11 +48,11 @@ static void test_odp_sys_cache_line_size(void)
CU_ASSERT(ODP_CACHE_LINE_SIZE == cache_size);
}
-static void test_odp_sys_cpu_model_str(void)
+static void 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);
}
@@ -74,21 +74,21 @@ static void test_odp_sys_huge_page_size(void)
CU_ASSERT(0 < page);
}
-static void test_odp_sys_cpu_hz(void)
+static void test_odp_cpu_hz(void)
{
uint64_t hz;
- hz = odp_sys_cpu_hz();
+ hz = odp_cpu_hz();
CU_ASSERT(0 < hz);
}
CU_TestInfo test_odp_system[] = {
{"odp version", test_odp_version_numbers},
{"odp_cpu_count", test_odp_cpu_count},
+ {"odp_cpu_hz", test_odp_cpu_hz},
+ {"odp_cpu_model_str", test_odp_cpu_model_str},
{"odp_sys_cache_line_size", test_odp_sys_cache_line_size},
- {"odp_sys_cpu_model_str", test_odp_sys_cpu_model_str},
{"odp_sys_page_size", test_odp_sys_page_size},
{"odp_sys_huge_page_size", test_odp_sys_huge_page_size},
- {"odp_sys_cpu_hz", test_odp_sys_cpu_hz},
CU_TEST_INFO_NULL,
};
--
1.9.1
_______________________________________________
lng-odp mailing list
lng-odp@lists.linaro.org
https://lists.linaro.org/mailman/listinfo/lng-odp
