[API-NEXT,06/10] test: remove reference of odp_cpu_hz_max()

Message ID 1450349234-26340-7-git-send-email-hongbo.zhang@freescale.com
State New
Headers show

Commit Message

hongbo.zhang@freescale.com Dec. 17, 2015, 10:47 a.m.
From: Hongbo Zhang <hongbo.zhang@linaro.org>

All CPU frequency APIs will be moved as linux-generic internal interfaces,
so they should not be referenced here.

Signed-off-by: Hongbo Zhang <hongbo.zhang@linaro.org>
---
 test/api_test/odp_common.c        | 1 -
 test/performance/odp_atomic.c     | 1 -
 test/performance/odp_l2fwd.c      | 3 +--
 test/performance/odp_scheduling.c | 8 --------
 4 files changed, 1 insertion(+), 12 deletions(-)

Patch

diff --git a/test/api_test/odp_common.c b/test/api_test/odp_common.c
index 5e6d542..62e1119 100644
--- a/test/api_test/odp_common.c
+++ b/test/api_test/odp_common.c
@@ -42,7 +42,6 @@  void odp_print_system_info(void)
 	printf("---------------\n");
 	printf("ODP API version: %s\n",        odp_version_api_str());
 	printf("CPU model:       %s\n",        odp_cpu_model_str());
-	printf("CPU freq (hz):   %"PRIu64"\n", odp_cpu_hz_max());
 	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 56fa6ed..6c3a84c 100644
--- a/test/performance/odp_atomic.c
+++ b/test/performance/odp_atomic.c
@@ -338,7 +338,6 @@  void odp_print_system_info(void)
 	printf("---------------\n");
 	printf("ODP API version: %s\n",        odp_version_api_str());
 	printf("CPU model:       %s\n",        odp_cpu_model_str());
-	printf("CPU freq (hz):   %"PRIu64"\n", odp_cpu_hz_max());
 	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 67a23ed..66f77f4 100644
--- a/test/performance/odp_l2fwd.c
+++ b/test/performance/odp_l2fwd.c
@@ -1114,11 +1114,10 @@  static void print_info(char *progname, appl_args_t *appl_args)
 	       "---------------\n"
 	       "ODP API version: %s\n"
 	       "CPU model:       %s\n"
-	       "CPU freq (hz):   %"PRIu64"\n"
 	       "Cache line size: %i\n"
 	       "CPU count:       %i\n"
 	       "\n",
-	       odp_version_api_str(), odp_cpu_model_str(), odp_cpu_hz_max(),
+	       odp_version_api_str(), odp_cpu_model_str(),
 	       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 2c5262f..8ba790b 100644
--- a/test/performance/odp_scheduling.c
+++ b/test/performance/odp_scheduling.c
@@ -705,7 +705,6 @@  static void test_cpu_freq(void)
 	odp_time_t cur_time, test_time, start_time, end_time;
 	uint64_t c1, c2, cycles;
 	uint64_t nsec;
-	double diff_max_hz, max_cycles;
 
 	printf("\nCPU cycle count frequency test (runs about %i sec)\n",
 	       TEST_SEC);
@@ -727,15 +726,9 @@  static void test_cpu_freq(void)
 	nsec = odp_time_to_ns(test_time);
 
 	cycles     = odp_cpu_cycles_diff(c2, c1);
-	max_cycles = (nsec * odp_cpu_hz_max()) / 1000000000.0;
-
-	/* Compare measured CPU cycles to maximum theoretical CPU cycle count */
-	diff_max_hz = ((double)(cycles) - max_cycles) / max_cycles;
 
 	printf("odp_time               %" PRIu64 " ns\n", nsec);
 	printf("odp_cpu_cycles         %" PRIu64 " CPU cycles\n", cycles);
-	printf("odp_sys_cpu_hz         %" PRIu64 " hz\n", odp_cpu_hz_max());
-	printf("Diff from max CPU freq %f%%\n", diff_max_hz * 100.0);
 
 	printf("\n");
 }
@@ -849,7 +842,6 @@  int main(int argc, char *argv[])
 	printf("---------------\n");
 	printf("ODP API version: %s\n",        odp_version_api_str());
 	printf("CPU model:       %s\n",        odp_cpu_model_str());
-	printf("CPU freq (hz):   %" PRIu64 "\n", odp_cpu_hz_max());
 	printf("Cache line size: %i\n",        odp_sys_cache_line_size());
 	printf("Max CPU count:   %i\n",        odp_cpu_count());