2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com>

* tm01/task1.c, tm02/task1.c, tm03/task1.c, tm04/task1.c, tm05/task1.c, tm06/task1.c, tm07/task1.c, tm08/task1.c, tm09/task1.c, tm10/task1.c, tm11/task1.c, tm12/task1.c, tm13/task1.c, tm14/task1.c, tm15/task1.c, tm16/task1.c, tm17/task1.c, tm18/task1.c, tm19/task1.c, tm20/task1.c, tm21/task1.c, tm22/task1.c, tm23/task1.c, tm24/task1.c, tm25/task1.c, tm26/task1.c, tm27/task1.c, tm28/task1.c, tm29/task1.c, tmck/task1.c, tmoverhd/testtask.c: Rename timer driver methods to follow RTEMS programming conventions.
author: Joel Sherrill <joel.sherrill@OARcorp.com> 2008-08-31 16:47:18 +0000
committer: Joel Sherrill <joel.sherrill@OARcorp.com> 2008-08-31 16:47:18 +0000
commit: 4074e70b0390d25b184b1187b8a8c59cf7ead79b (patch)
tree: 59fb0f95377c8e1b71234c5059a76c138deae15c
parent: 2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
download: rtems-4074e70b0390d25b184b1187b8a8c59cf7ead79b.tar.bz2
32 files changed, 528 insertions, 517 deletions
diff --git a/testsuites/tmtests/ChangeLog b/testsuites/tmtests/ChangeLog
index 41e594c2d3..c1f451ceb6 100644
--- a/testsuites/tmtests/ChangeLog
+++ b/testsuites/tmtests/ChangeLog
@@ -1,3 +1,14 @@
+2008-08-31	Joel Sherrill <joel.sherrill@oarcorp.com>
+
+	* tm01/task1.c, tm02/task1.c, tm03/task1.c, tm04/task1.c, tm05/task1.c,
+	tm06/task1.c, tm07/task1.c, tm08/task1.c, tm09/task1.c, tm10/task1.c,
+	tm11/task1.c, tm12/task1.c, tm13/task1.c, tm14/task1.c, tm15/task1.c,
+	tm16/task1.c, tm17/task1.c, tm18/task1.c, tm19/task1.c, tm20/task1.c,
+	tm21/task1.c, tm22/task1.c, tm23/task1.c, tm24/task1.c, tm25/task1.c,
+	tm26/task1.c, tm27/task1.c, tm28/task1.c, tm29/task1.c, tmck/task1.c,
+	tmoverhd/testtask.c: Rename timer driver methods to follow RTEMS
+	programming conventions.
+
 2008-06-05	Joel Sherrill <joel.sherrill@OARcorp.com>
 
 	* tm02/system.h, tm10/system.h: Make configurations more accurate.
diff --git a/testsuites/tmtests/tm01/task1.c b/testsuites/tmtests/tm01/task1.c
index 63b5d70c83..fda50d531e 100644
--- a/testsuites/tmtests/tm01/task1.c
+++ b/testsuites/tmtests/tm01/task1.c
@@ -75,7 +75,7 @@ rtems_task Test_task(
 
   /* Time one invocation of rtems_semaphore_create */
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_semaphore_create(
       name,
       OPERATION_COUNT,
@@ -83,7 +83,7 @@ rtems_task Test_task(
       RTEMS_NO_PRIORITY,
       &smid
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
   put_time(
     "rtems_semaphore_create",
     end_time,
@@ -94,9 +94,9 @@ rtems_task Test_task(
 
   /* Time one invocation of rtems_semaphore_delete */
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_semaphore_delete( smid );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
   put_time(
     "rtems_semaphore_delete",
     end_time,
@@ -115,46 +115,46 @@ rtems_task Test_task(
 
   for ( iterations=OPERATION_COUNT ; iterations ; iterations-- ) {
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
-        (void) Empty_function();
-    end_time = Read_timer();
+        (void) benchmark_timerempty_function();
+    end_time = benchmark_timerread();
 
     semaphore_obtain_loop_time  += end_time;
     semaphore_release_loop_time += end_time;
 
     /* rtems_semaphore_obtain (available) */
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
         (void) rtems_semaphore_obtain(
           smid,
           RTEMS_DEFAULT_OPTIONS,
           RTEMS_NO_TIMEOUT
         );
-    end_time = Read_timer();
+    end_time = benchmark_timerread();
 
     semaphore_obtain_time += end_time;
 
     /* rtems_semaphore_release */
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
         (void) rtems_semaphore_release( smid );
-    end_time = Read_timer();
+    end_time = benchmark_timerread();
 
     semaphore_release_time += end_time;
 
     /* semaphore obtain (RTEMS_NO_WAIT) */
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
         rtems_semaphore_obtain( smid, RTEMS_NO_WAIT, RTEMS_NO_TIMEOUT );
-    semaphore_obtain_no_wait_time += Read_timer();
+    semaphore_obtain_no_wait_time += benchmark_timerread();
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index = 1 ; index<=OPERATION_COUNT ; index++ )
         rtems_semaphore_release( smid );
-    end_time = Read_timer();
+    end_time = benchmark_timerread();
 
     semaphore_release_time += end_time;
   }
diff --git a/testsuites/tmtests/tm02/task1.c b/testsuites/tmtests/tm02/task1.c
index a3c4898d10..55c4374d54 100644
--- a/testsuites/tmtests/tm02/task1.c
+++ b/testsuites/tmtests/tm02/task1.c
@@ -117,7 +117,7 @@ rtems_task High_task(
 {
   rtems_status_code status;
 
-  Timer_initialize();           /* start blocking rtems_semaphore_obtain time */
+  benchmark_timerinitialize();           /* start blocking rtems_semaphore_obtain time */
   status = rtems_semaphore_obtain(
     Semaphore_id,
     RTEMS_DEFAULT_OPTIONS,
@@ -142,7 +142,7 @@ rtems_task Low_task(
   rtems_task_argument argument
 )
 {
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_semaphore_obtain: not available -- caller blocks",
diff --git a/testsuites/tmtests/tm03/task1.c b/testsuites/tmtests/tm03/task1.c
index b17bce8e83..948d9a5d1e 100644
--- a/testsuites/tmtests/tm03/task1.c
+++ b/testsuites/tmtests/tm03/task1.c
@@ -104,7 +104,7 @@ rtems_task test_init(
   status = rtems_task_start( task_id, High_task, 0 );
   directive_failed( status, "rtems_task_start of high task" );
 
-  Timer_initialize();                          /* start the timer */
+  benchmark_timerinitialize();                          /* start the timer */
   status = rtems_semaphore_release( Semaphore_id );
 }
 
@@ -135,7 +135,7 @@ rtems_task High_task(
     RTEMS_NO_TIMEOUT
   );
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_semaphore_release: task readied -- preempts caller",
diff --git a/testsuites/tmtests/tm04/task1.c b/testsuites/tmtests/tm04/task1.c
index 60031710c4..1910374048 100644
--- a/testsuites/tmtests/tm04/task1.c
+++ b/testsuites/tmtests/tm04/task1.c
@@ -90,7 +90,7 @@ rtems_task Highest_task(
 
   if ( argument == 1 ) {
 
-    end_time = Read_timer();
+    end_time = benchmark_timerread();
 
     put_time(
       "rtems_task_restart: blocked task -- preempts caller",
@@ -109,7 +109,7 @@ rtems_task Highest_task(
 
  } else if ( argument == 2 ) {
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
     put_time(
       "rtems_task_restart: ready task -- preempts caller",
@@ -140,23 +140,23 @@ rtems_task High_task(
   rtems_name          name;
   rtems_task_priority old_priority;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_task_restart( Highest_id, 1 );
   /* preempted by Higher_task */
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_task_restart( Highest_id, 2 );
   /* preempted by Higher_task */
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       rtems_semaphore_release( Semaphore_id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_semaphore_release: task readied -- returns to caller",
@@ -173,7 +173,7 @@ rtems_task High_task(
     directive_failed( status, "rtems_task_delete" );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
      rtems_task_create(
         name,
@@ -183,7 +183,7 @@ rtems_task High_task(
         RTEMS_DEFAULT_ATTRIBUTES,
         &Task_id[ index ]
       );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_create",
@@ -193,11 +193,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TASK_CREATE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       rtems_task_start( Task_id[ index ], Low_tasks, 0 );
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_start",
@@ -230,10 +230,10 @@ rtems_task High_task(
     directive_failed( status, "rtems_task_suspend LOOP" );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_restart( Task_id[ index ], 0 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_restart: suspended task -- returns to caller",
@@ -246,10 +246,10 @@ rtems_task High_task(
   for ( index=1 ; index <= OPERATION_COUNT ; index++ )
     (void) rtems_task_suspend( Task_id[ index ] );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_delete( Task_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_delete: suspended task",
@@ -274,10 +274,10 @@ rtems_task High_task(
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_restart( Task_id[ index ], 1 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_restart: ready task -- returns to caller",
@@ -296,10 +296,10 @@ rtems_task High_task(
   status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
   directive_failed( status, "rtems_task_wake_after" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_restart( Task_id[ index ], 1 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_restart: blocked task -- returns to caller",
@@ -313,10 +313,10 @@ rtems_task High_task(
   status = rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
   directive_failed( status, "rtems_task_wake_after" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_delete( Task_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_delete: blocked task",
diff --git a/testsuites/tmtests/tm05/task1.c b/testsuites/tmtests/tm05/task1.c
index fc95ef8b29..4e7640a134 100644
--- a/testsuites/tmtests/tm05/task1.c
+++ b/testsuites/tmtests/tm05/task1.c
@@ -82,11 +82,11 @@ rtems_task High_task(
   rtems_task_argument argument
 )
 {
-  Timer_initialize();
+  benchmark_timerinitialize();
 
   (void) rtems_task_suspend( RTEMS_SELF );
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_resume: task readied -- preempts caller",
@@ -115,7 +115,7 @@ rtems_task Low_task(
 )
 {
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_suspend: calling task",
@@ -126,6 +126,6 @@ rtems_task Low_task(
   );
 
   Task_index = 1;
-  Timer_initialize();
+  benchmark_timerinitialize();
   (void) rtems_task_resume( Task_id[ Task_index ] );
 }
diff --git a/testsuites/tmtests/tm06/task1.c b/testsuites/tmtests/tm06/task1.c
index e68c6caa02..1004e380a7 100644
--- a/testsuites/tmtests/tm06/task1.c
+++ b/testsuites/tmtests/tm06/task1.c
@@ -72,19 +72,19 @@ rtems_task Task_1(
   uint32_t    index;
 
   if ( Task_restarted == OPERATION_COUNT )
-     Timer_initialize();
+     benchmark_timerinitialize();
 
   Task_restarted--;
 
   if ( Task_restarted != 0 )
     (void) rtems_task_restart( RTEMS_SELF, 0 );
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
   put_time(
     "rtems_task_restart: calling task",
@@ -109,10 +109,10 @@ rtems_task Task_1(
     directive_failed( status, "rtems_task_start loop" );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_suspend( Task_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_suspend: returns to caller",
@@ -122,10 +122,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_TASK_SUSPEND
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_resume( Task_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_resume: task readied -- returns to caller",
@@ -135,10 +135,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_TASK_RESUME
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_delete( Task_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_delete: ready task",
diff --git a/testsuites/tmtests/tm07/task1.c b/testsuites/tmtests/tm07/task1.c
index d918c46b3f..4aed10ea68 100644
--- a/testsuites/tmtests/tm07/task1.c
+++ b/testsuites/tmtests/tm07/task1.c
@@ -80,7 +80,7 @@ rtems_task High_task(
 )
 {
   if ( argument != 0 ) {
-    end_time = Read_timer();
+    end_time = benchmark_timerread();
 
     put_time(
       "rtems_task_restart: suspended task -- preempts caller",
@@ -114,6 +114,6 @@ rtems_task Low_task(
 {
   task_index = 1;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
   (void) rtems_task_restart( Task_id[ task_index ], 0xffffffff );
 }
diff --git a/testsuites/tmtests/tm08/task1.c b/testsuites/tmtests/tm08/task1.c
index 4bd3770ad9..f5dbe383a9 100644
--- a/testsuites/tmtests/tm08/task1.c
+++ b/testsuites/tmtests/tm08/task1.c
@@ -81,19 +81,19 @@ rtems_task test_task(
   uint32_t      old_note;
   uint32_t      old_mode;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_set_priority(
                Test_task_id,
                RTEMS_CURRENT_PRIORITY,
                &old_priority
              );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_set_priority: obtain current priority",
@@ -103,10 +103,10 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_SET_PRIORITY
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_set_priority( Test_task_id, 253, &old_priority );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_set_priority: returns to caller",
@@ -116,14 +116,14 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_SET_PRIORITY
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_mode(
         RTEMS_CURRENT_MODE,
         RTEMS_CURRENT_MODE,
         &old_mode
       );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_mode: obtain current mode",
@@ -133,7 +133,7 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_MODE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
       (void) rtems_task_mode(
         RTEMS_INTERRUPT_LEVEL(1),
@@ -146,7 +146,7 @@ rtems_task test_task(
         &old_mode
       );
     }
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_mode: no reschedule",
@@ -156,9 +156,9 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_MODE
   );
 
-  Timer_initialize();                 /* must be one host */
+  benchmark_timerinitialize();                 /* must be one host */
     (void) rtems_task_mode( RTEMS_NO_ASR, RTEMS_ASR_MASK, &old_mode );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_mode: reschedule -- returns to caller",
@@ -175,13 +175,13 @@ rtems_task test_task(
   directive_failed( status, "rtems_task_set_priority" );
 
   /* preempted by test_task1 */
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void)  rtems_task_mode( RTEMS_PREEMPT, RTEMS_PREEMPT_MASK, &old_mode );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_set_note( Test_task_id, 8, 10 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_set_note",
@@ -191,10 +191,10 @@ rtems_task test_task(
     CALLING_OVERHEAD_TASK_SET_NOTE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_get_note( Test_task_id, 8, &old_note );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_get_note",
@@ -206,10 +206,10 @@ rtems_task test_task(
 
   build_time( &time, 1, 1, 1988, 0, 0, 0, 0 );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_clock_set( &time );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_clock_set",
@@ -219,10 +219,10 @@ rtems_task test_task(
     CALLING_OVERHEAD_CLOCK_SET
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_clock_get( RTEMS_CLOCK_GET_TOD, &time );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_clock_get",
@@ -240,7 +240,7 @@ rtems_task test_task1(
   rtems_task_argument argument
 )
 {
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_mode: reschedule -- preempts caller",
diff --git a/testsuites/tmtests/tm09/task1.c b/testsuites/tmtests/tm09/task1.c
index 96d78510f2..f7eb661702 100644
--- a/testsuites/tmtests/tm09/task1.c
+++ b/testsuites/tmtests/tm09/task1.c
@@ -53,7 +53,7 @@ rtems_task Test_task (
   rtems_task_argument argument
 )
 {
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_message_queue_create(
       1,
       OPERATION_COUNT,
@@ -61,7 +61,7 @@ rtems_task Test_task (
       RTEMS_DEFAULT_ATTRIBUTES,
       &Queue_id
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_create",
@@ -73,9 +73,9 @@ rtems_task Test_task (
 
   queue_test();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_message_queue_delete( Queue_id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_delete",
@@ -120,27 +120,27 @@ void queue_test()
 
   for ( iterations = 1 ; iterations <= OPERATION_COUNT ; iterations++ ) {
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) Empty_function();
-    send_loop_time += Read_timer();
+        (void) benchmark_timerempty_function();
+    send_loop_time += benchmark_timerread();
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) Empty_function();
-    urgent_loop_time += Read_timer();
+        (void) benchmark_timerempty_function();
+    urgent_loop_time += benchmark_timerread();
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-        (void) Empty_function();
-    receive_loop_time += Read_timer();
+        (void) benchmark_timerempty_function();
+    receive_loop_time += benchmark_timerread();
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
         (void) rtems_message_queue_send( Queue_id, buffer, MESSAGE_SIZE );
-    send_time += Read_timer();
+    send_time += benchmark_timerread();
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
         (void) rtems_message_queue_receive(
                  Queue_id,
@@ -149,14 +149,14 @@ void queue_test()
                  RTEMS_DEFAULT_OPTIONS,
                  RTEMS_NO_TIMEOUT
                );
-    receive_time += Read_timer();
+    receive_time += benchmark_timerread();
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
         (void) rtems_message_queue_urgent( Queue_id, buffer, MESSAGE_SIZE );
-    urgent_time += Read_timer();
+    urgent_time += benchmark_timerread();
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       for ( index=1 ; index <= OPERATION_COUNT ; index++ )
         (void) rtems_message_queue_receive(
                  Queue_id,
@@ -165,11 +165,11 @@ void queue_test()
                  RTEMS_DEFAULT_OPTIONS,
                  RTEMS_NO_TIMEOUT
                );
-    receive_time += Read_timer();
+    receive_time += benchmark_timerread();
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       rtems_message_queue_flush( Queue_id, &empty_flush_count );
-    empty_flush_time += Read_timer();
+    empty_flush_time += benchmark_timerread();
 
     /* send one message to flush */
     status = rtems_message_queue_send(
@@ -179,9 +179,9 @@ void queue_test()
     );
     directive_failed( status, "rtems_message_queue_send" );
 
-    Timer_initialize();
+    benchmark_timerinitialize();
       rtems_message_queue_flush( Queue_id, &flush_count );
-    flush_time += Read_timer();
+    flush_time += benchmark_timerread();
   }
 
   put_time(
diff --git a/testsuites/tmtests/tm10/task1.c b/testsuites/tmtests/tm10/task1.c
index ba9a2f4019..709f99bf26 100644
--- a/testsuites/tmtests/tm10/task1.c
+++ b/testsuites/tmtests/tm10/task1.c
@@ -87,12 +87,12 @@ void test_init()
   );
   directive_failed( status, "rtems_message_queue_create" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_message_queue_receive(
                Queue_id,
@@ -101,7 +101,7 @@ void test_init()
                RTEMS_NO_WAIT,
                RTEMS_NO_TIMEOUT
              );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_receive: not available -- NO_WAIT",
@@ -119,7 +119,7 @@ rtems_task High_task(
 {
   size_t  size;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
      (void) rtems_message_queue_receive(
               Queue_id,
               (long (*)[4]) Buffer,
@@ -149,7 +149,7 @@ rtems_task Low_task(
   rtems_task_argument argument
 )
 {
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_receive: not available -- caller blocks",
diff --git a/testsuites/tmtests/tm11/task1.c b/testsuites/tmtests/tm11/task1.c
index 8fda2224a0..86029010a4 100644
--- a/testsuites/tmtests/tm11/task1.c
+++ b/testsuites/tmtests/tm11/task1.c
@@ -106,7 +106,7 @@ rtems_task test_init(
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_message_queue_send( Queue_id, Buffer, MESSAGE_SIZE );
 }
 
@@ -141,7 +141,7 @@ rtems_task High_task(
            RTEMS_NO_TIMEOUT
          );
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_send: task readied -- preempts caller",
diff --git a/testsuites/tmtests/tm12/task1.c b/testsuites/tmtests/tm12/task1.c
index 60a74647e9..ddf5584e04 100644
--- a/testsuites/tmtests/tm12/task1.c
+++ b/testsuites/tmtests/tm12/task1.c
@@ -108,15 +108,15 @@ rtems_task High_task(
 {
   uint32_t    index;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_message_queue_send( Queue_id, Buffer, MESSAGE_SIZE );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_send: task readied -- returns to caller",
diff --git a/testsuites/tmtests/tm13/task1.c b/testsuites/tmtests/tm13/task1.c
index 8bad5814c2..95fea4fb32 100644
--- a/testsuites/tmtests/tm13/task1.c
+++ b/testsuites/tmtests/tm13/task1.c
@@ -105,7 +105,7 @@ rtems_task test_init(
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_message_queue_urgent( Queue_id, Buffer, MESSAGE_SIZE );
 }
 
@@ -140,7 +140,7 @@ rtems_task High_task(
            RTEMS_NO_TIMEOUT
          );
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_urgent: task readied -- preempts caller",
diff --git a/testsuites/tmtests/tm14/task1.c b/testsuites/tmtests/tm14/task1.c
index 6596ddb8e2..606d674c39 100644
--- a/testsuites/tmtests/tm14/task1.c
+++ b/testsuites/tmtests/tm14/task1.c
@@ -108,15 +108,15 @@ rtems_task High_task(
 {
   uint32_t    index;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_message_queue_urgent( Queue_id, Buffer, MESSAGE_SIZE );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_urgent: task readied -- returns to caller",
diff --git a/testsuites/tmtests/tm15/task1.c b/testsuites/tmtests/tm15/task1.c
index f80f12e7da..e4693271c9 100644
--- a/testsuites/tmtests/tm15/task1.c
+++ b/testsuites/tmtests/tm15/task1.c
@@ -78,12 +78,12 @@ void test_init()
     directive_failed( status, "rtems_task_start LOOP" );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
     {
         (void) rtems_event_receive(
@@ -94,7 +94,7 @@ void test_init()
                );
     }
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_receive: obtain current events",
@@ -105,7 +105,7 @@ void test_init()
   );
 
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
     {
       (void) rtems_event_receive(
@@ -115,7 +115,7 @@ void test_init()
                &event_out
              );
     }
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_receive: not available -- NO_WAIT",
@@ -133,7 +133,7 @@ rtems_task Low_task(
   uint32_t    index;
   rtems_event_set   event_out;
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_receive: not available -- caller blocks",
@@ -143,15 +143,15 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_RECEIVE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_event_send( RTEMS_SELF, RTEMS_EVENT_16 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_send: no task readied",
@@ -161,14 +161,14 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_SEND
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_event_receive(
              RTEMS_EVENT_16,
              RTEMS_DEFAULT_OPTIONS,
              RTEMS_NO_TIMEOUT,
              &event_out
            );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_receive: available",
@@ -178,10 +178,10 @@ rtems_task Low_task(
     CALLING_OVERHEAD_EVENT_RECEIVE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_event_send( Task_id[ index ], RTEMS_EVENT_16 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_send: task readied -- returns to caller",
@@ -210,7 +210,7 @@ rtems_task High_tasks(
     );
   else {
     time_set = 1;
-    Timer_initialize();            /* start blocking rtems_event_receive time */
+    benchmark_timerinitialize();            /* start blocking rtems_event_receive time */
     status = rtems_event_receive(
       RTEMS_EVENT_16,
       RTEMS_DEFAULT_OPTIONS,
diff --git a/testsuites/tmtests/tm16/task1.c b/testsuites/tmtests/tm16/task1.c
index dff43c6417..a840b8cd97 100644
--- a/testsuites/tmtests/tm16/task1.c
+++ b/testsuites/tmtests/tm16/task1.c
@@ -93,7 +93,7 @@ rtems_task test_init(
 
   Task_count = 0;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_event_send( Task_id[ Task_count ], RTEMS_EVENT_16 );
   /* preempts task */
 }
@@ -132,7 +132,7 @@ rtems_task High_task(
             &event_out
           );
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_event_send: task readied -- preempts caller",
diff --git a/testsuites/tmtests/tm17/task1.c b/testsuites/tmtests/tm17/task1.c
index ed8f4e9b79..fbfb6b241d 100644
--- a/testsuites/tmtests/tm17/task1.c
+++ b/testsuites/tmtests/tm17/task1.c
@@ -72,7 +72,7 @@ rtems_task First_task(
 {
   rtems_task_priority previous_priority;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
 
   Task_priority--;
   Task_count++;
@@ -106,12 +106,12 @@ rtems_task Last_task(
 {
   uint32_t   index;
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
   put_time(
     "rtems_task_set_priority: preempts caller",
diff --git a/testsuites/tmtests/tm18/task1.c b/testsuites/tmtests/tm18/task1.c
index b41c2f03ec..03948f4958 100644
--- a/testsuites/tmtests/tm18/task1.c
+++ b/testsuites/tmtests/tm18/task1.c
@@ -80,7 +80,7 @@ rtems_task First_task(
   rtems_task_argument argument
 )
 {
-  Timer_initialize();
+  benchmark_timerinitialize();
 
   (void) rtems_task_delete( RTEMS_SELF );
 }
@@ -96,7 +96,7 @@ rtems_task Last_task(
   rtems_task_argument argument
 )
 {
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_delete: calling task",
diff --git a/testsuites/tmtests/tm19/task1.c b/testsuites/tmtests/tm19/task1.c
index b035b92ec8..6cacb28f07 100644
--- a/testsuites/tmtests/tm19/task1.c
+++ b/testsuites/tmtests/tm19/task1.c
@@ -90,7 +90,7 @@ rtems_asr Process_asr_for_pass_1(
   rtems_signal_set signals
 )
 {
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_signal_send: signal to self",
@@ -100,7 +100,7 @@ rtems_asr Process_asr_for_pass_1(
     CALLING_OVERHEAD_SIGNAL_SEND
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
 }
 
 rtems_asr Process_asr_for_pass_2(
@@ -112,7 +112,7 @@ rtems_asr Process_asr_for_pass_2(
   status = rtems_task_resume( Task_id[ 3 ] );
   directive_failed( status, "rtems_task_resume" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
 }
 
 rtems_task Task_1(
@@ -121,9 +121,9 @@ rtems_task Task_1(
 {
   rtems_status_code status;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_signal_catch( Process_asr_for_pass_1, RTEMS_DEFAULT_MODES );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_signal_catch",
@@ -133,9 +133,9 @@ rtems_task Task_1(
     CALLING_OVERHEAD_SIGNAL_CATCH
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_signal_send( Task_id[ 2 ], 1 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_signal_send: returns to caller",
@@ -145,12 +145,12 @@ rtems_task Task_1(
     CALLING_OVERHEAD_SIGNAL_SEND
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_1 );
 
   /* end time is done is RTEMS_ASR */
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "exit ASR overhead: returns to calling task",
@@ -163,7 +163,7 @@ rtems_task Task_1(
   status = rtems_signal_catch( Process_asr_for_pass_2, RTEMS_NO_PREEMPT );
   directive_failed( status, "rtems_signal_catch" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_signal_send( RTEMS_SELF, RTEMS_SIGNAL_1 );
 }
 
@@ -192,7 +192,7 @@ rtems_task Task_3(
 {
   (void) rtems_task_suspend( RTEMS_SELF );
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "exit ASR overhead: returns to preempting task",
diff --git a/testsuites/tmtests/tm20/task1.c b/testsuites/tmtests/tm20/task1.c
index 63a5f9ce94..1a33032d66 100644
--- a/testsuites/tmtests/tm20/task1.c
+++ b/testsuites/tmtests/tm20/task1.c
@@ -97,7 +97,7 @@ rtems_task Task_1(
 
   Partition_name = rtems_build_name( 'P', 'A', 'R', 'T' );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_partition_create(
       Partition_name,
       Partition_area,
@@ -106,7 +106,7 @@ rtems_task Task_1(
       RTEMS_DEFAULT_ATTRIBUTES,
       &Partition_id
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_create",
@@ -118,7 +118,7 @@ rtems_task Task_1(
 
   Region_name = rtems_build_name( 'R', 'E', 'G', 'N' );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_region_create(
       Region_name,
       Region_area,
@@ -127,7 +127,7 @@ rtems_task Task_1(
       RTEMS_DEFAULT_ATTRIBUTES,
       &Region_id
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_create",
@@ -137,9 +137,9 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_CREATE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_partition_get_buffer( Partition_id, &Buffer_address_1 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_get_buffer: available",
@@ -164,9 +164,9 @@ rtems_task Task_1(
     assert( buffer_count < PARTITION_BUFFER_POINTERS );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_partition_get_buffer( Partition_id, &Buffer_address_2 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_get_buffer: not available",
@@ -176,9 +176,9 @@ rtems_task Task_1(
     CALLING_OVERHEAD_PARTITION_GET_BUFFER
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_partition_return_buffer( Partition_id, Buffer_address_1 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_return_buffer",
@@ -198,9 +198,9 @@ rtems_task Task_1(
 
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_partition_delete( Partition_id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_delete",
@@ -219,7 +219,7 @@ rtems_task Task_1(
            );
   directive_failed( status, "region_get_segment" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_get_segment(
       Region_id,
       400,
@@ -227,7 +227,7 @@ rtems_task Task_1(
       RTEMS_NO_TIMEOUT,
       &Buffer_address_3
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_get_segment: available",
@@ -237,7 +237,7 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_GET_SEGMENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_get_segment(
       Region_id,
       1998,
@@ -245,7 +245,7 @@ rtems_task Task_1(
       RTEMS_NO_TIMEOUT,
       &Buffer_address_4
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_get_segment: not available -- NO_WAIT",
@@ -258,9 +258,9 @@ rtems_task Task_1(
   status = rtems_region_return_segment( Region_id, Buffer_address_3 );
   directive_failed( status, "rtems_region_return_segment" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_return_segment( Region_id, Buffer_address_2 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_return_segment: no waiting tasks",
@@ -279,7 +279,7 @@ rtems_task Task_1(
   );
   directive_failed( status, "rtems_region_get_segment" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_get_segment(
       Region_id,
       1998,
@@ -290,7 +290,7 @@ rtems_task Task_1(
 
   /* execute Task_2 */
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_return_segment: task readied -- preempts caller",
@@ -336,9 +336,9 @@ rtems_task Task_1(
   status = rtems_region_return_segment( Region_id, Buffer_address_2 );
   directive_failed( status, "rtems_region_return_segment" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_delete( Region_id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_delete",
@@ -348,15 +348,15 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_DELETE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_initialize( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_initialize",
@@ -366,10 +366,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_INITIALIZE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_open( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_open",
@@ -379,10 +379,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_OPEN
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_close( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_close",
@@ -392,10 +392,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_CLOSE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_read( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_read",
@@ -405,10 +405,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_READ
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_write( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_write",
@@ -418,10 +418,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_IO_WRITE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_io_control( _STUB_major, 0, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_io_control",
@@ -441,7 +441,7 @@ rtems_task Task_2(
 {
   rtems_status_code status;
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_get_segment: not available -- caller blocks",
@@ -451,14 +451,14 @@ rtems_task Task_2(
     CALLING_OVERHEAD_REGION_GET_SEGMENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_return_segment( Region_id, Buffer_address_1 );
 
   /* preempt back to Task_1 */
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_region_return_segment( Region_id, Buffer_address_1 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_return_segment: task readied -- returns to caller",
diff --git a/testsuites/tmtests/tm21/task1.c b/testsuites/tmtests/tm21/task1.c
index 606984bd02..59cb16ad4a 100644
--- a/testsuites/tmtests/tm21/task1.c
+++ b/testsuites/tmtests/tm21/task1.c
@@ -123,15 +123,15 @@ rtems_task Task_1(
     directive_failed( status, "rtems_rate_monotonic_create" );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_ident",
@@ -141,10 +141,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_TASK_IDENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_message_queue_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_ident",
@@ -154,10 +154,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_MESSAGE_QUEUE_IDENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_semaphore_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_semaphore_ident",
@@ -167,10 +167,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_SEMAPHORE_IDENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_partition_ident( index, RTEMS_SEARCH_ALL_NODES, &id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_partition_ident",
@@ -180,10 +180,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_PARTITION_IDENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_region_ident( index, &id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_region_ident",
@@ -193,10 +193,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_REGION_IDENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_port_ident( index, &id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_port_ident",
@@ -206,10 +206,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_PORT_IDENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_ident( index, &id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_ident",
@@ -219,10 +219,10 @@ rtems_task Task_1(
     CALLING_OVERHEAD_TIMER_IDENT
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_rate_monotonic_ident( index, &id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_rate_monotonic_ident",
diff --git a/testsuites/tmtests/tm22/task1.c b/testsuites/tmtests/tm22/task1.c
index 16816a2ebf..1796d5b239 100644
--- a/testsuites/tmtests/tm22/task1.c
+++ b/testsuites/tmtests/tm22/task1.c
@@ -88,14 +88,14 @@ rtems_task High_task(
   uint32_t    count;
   rtems_status_code status;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_message_queue_broadcast(
              Queue_id,
              Buffer,
              MESSAGE_SIZE,
              &count
            );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_broadcast: task readied -- returns to caller",
@@ -141,7 +141,7 @@ rtems_task Low_task(
   );
   directive_failed( status, "message_queu_receive" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_message_queue_broadcast(
                Queue_id,
@@ -149,7 +149,7 @@ rtems_task Low_task(
                MESSAGE_SIZE,
                &count
              );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_broadcast: no waiting tasks",
@@ -169,7 +169,7 @@ rtems_task Low_task(
 
   /* should go to Preempt_task here */
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_message_queue_broadcast: task readied -- preempts caller",
@@ -189,7 +189,7 @@ rtems_task Preempt_task(
 {
   uint32_t    count;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_message_queue_broadcast(
              Queue_id,
              Buffer,
diff --git a/testsuites/tmtests/tm23/task1.c b/testsuites/tmtests/tm23/task1.c
index 182c2319f6..b33769d175 100644
--- a/testsuites/tmtests/tm23/task1.c
+++ b/testsuites/tmtests/tm23/task1.c
@@ -50,10 +50,10 @@ rtems_task Init(
 
   puts( "\n\n*** TIME TEST 23 ***" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
   priority = 5;
 
@@ -97,15 +97,15 @@ rtems_task High_task(
   rtems_status_code status;
   int i;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_create( index, &Timer_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_create",
@@ -115,10 +115,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_CREATE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_after( Timer_id[ index ], 500, null_delay, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_fire_after: inactive",
@@ -128,10 +128,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_AFTER
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_after( Timer_id[ index ], 500, null_delay, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_fire_after: active",
@@ -141,10 +141,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_AFTER
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_cancel( Timer_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_cancel: active",
@@ -154,11 +154,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_CANCEL
   );
 
-  for ( Timer_initialize(), i=0 ; i<OPERATION_COUNT ; i++ )
-  Timer_initialize();
+  for ( benchmark_timerinitialize(), i=0 ; i<OPERATION_COUNT ; i++ )
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_cancel( Timer_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_cancel: inactive",
@@ -168,11 +168,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_CANCEL
   );
 
-  for ( Timer_initialize(), i=0 ; i<OPERATION_COUNT ; i++ )
-  Timer_initialize();
+  for ( benchmark_timerinitialize(), i=0 ; i<OPERATION_COUNT ; i++ )
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_reset( Timer_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_reset: inactive",
@@ -182,10 +182,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_RESET
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_reset( Timer_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_reset: active",
@@ -205,11 +205,11 @@ rtems_task High_task(
 
   time_of_day.year = 1989;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_when(
          Timer_id[ index ], &time_of_day, null_delay, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_fire_when: inactive",
@@ -219,11 +219,11 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_WHEN
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_fire_when(
          Timer_id[ index ], &time_of_day, null_delay, NULL );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_fire_when: active",
@@ -233,10 +233,10 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_FIRE_WHEN
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_delete( Timer_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_delete: active",
@@ -246,7 +246,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_DELETE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
   for ( index=1 ; index <= OPERATION_COUNT ; index++ ) {
     status = rtems_timer_create( index, &Timer_id[ index ] );
     directive_failed( status, "rtems_timer_create" );
@@ -258,10 +258,10 @@ rtems_task High_task(
     directive_failed( status, "rtems_timer_cancel" );
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_timer_delete( Timer_id[ index ] );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_timer_delete: inactive",
@@ -271,7 +271,7 @@ rtems_task High_task(
     CALLING_OVERHEAD_TIMER_DELETE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_task_wake_when( &time_of_day );
 }
 
@@ -286,7 +286,7 @@ rtems_task Low_task(
   rtems_task_argument argument
 )
 {
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_wake_when",
diff --git a/testsuites/tmtests/tm24/task1.c b/testsuites/tmtests/tm24/task1.c
index fd5dcd0438..90279cbfe8 100644
--- a/testsuites/tmtests/tm24/task1.c
+++ b/testsuites/tmtests/tm24/task1.c
@@ -73,15 +73,15 @@ rtems_task High_task(
   rtems_status_code status;
   uint32_t    index;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_task_wake_after( RTEMS_YIELD_PROCESSOR );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_task_wake_after: yield -- returns to caller",
@@ -104,9 +104,9 @@ rtems_task Tasks(
   Task_count++;
 
   if ( Task_count == 1 )
-    Timer_initialize();
+    benchmark_timerinitialize();
   else if ( Task_count == OPERATION_COUNT ) {
-    end_time = Read_timer();
+    end_time = benchmark_timerread();
 
     put_time(
       "rtems_task_wake_after: yields -- preempts caller",
diff --git a/testsuites/tmtests/tm25/task1.c b/testsuites/tmtests/tm25/task1.c
index 6702a701ae..e9340adf16 100644
--- a/testsuites/tmtests/tm25/task1.c
+++ b/testsuites/tmtests/tm25/task1.c
@@ -91,9 +91,9 @@ rtems_task Low_task(
   rtems_task_argument argument
 )
 {
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_clock_tick();
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_clock_tick",
diff --git a/testsuites/tmtests/tm26/task1.c b/testsuites/tmtests/tm26/task1.c
index ee7c44f6c6..f67cf46fbb 100644
--- a/testsuites/tmtests/tm26/task1.c
+++ b/testsuites/tmtests/tm26/task1.c
@@ -194,33 +194,33 @@ rtems_task High_task(
 {
   rtems_interrupt_level level;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_interrupt_disable( level );
-  isr_disable_time = Read_timer();
+  isr_disable_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_interrupt_flash( level );
-  isr_flash_time = Read_timer();
+  isr_flash_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_interrupt_enable( level );
-  isr_enable_time = Read_timer();
+  isr_enable_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     _Thread_Disable_dispatch();
-  thread_disable_dispatch_time = Read_timer();
+  thread_disable_dispatch_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     _Thread_Enable_dispatch();
-  thread_enable_dispatch_time = Read_timer();
+  thread_enable_dispatch_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     _Thread_Set_state( _Thread_Executing, STATES_SUSPENDED );
-  thread_set_state_time = Read_timer();
+  thread_set_state_time = benchmark_timerread();
 
   _Context_Switch_necessary = TRUE;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     _Thread_Dispatch();           /* dispatches Middle_task */
 }
 
@@ -228,7 +228,7 @@ rtems_task Middle_task(
   rtems_task_argument argument
 )
 {
-  thread_dispatch_no_fp_time = Read_timer();
+  thread_dispatch_no_fp_time = benchmark_timerread();
 
   _Thread_Set_state( _Thread_Executing, STATES_SUSPENDED );
 
@@ -243,10 +243,10 @@ rtems_task Middle_task(
 
   _Thread_Disable_dispatch();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     _Context_Switch( &Middle_tcb->Registers, &_Thread_Executing->Registers );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     _Context_Switch(&Middle_tcb->Registers, &Low_tcb->Registers);
 }
 
@@ -256,20 +256,20 @@ rtems_task Low_task(
 {
   Thread_Control *executing;
 
-  context_switch_no_fp_time = Read_timer();
+  context_switch_no_fp_time = benchmark_timerread();
 
   executing    = _Thread_Executing;
 
   Low_tcb = executing;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     _Context_Switch( &executing->Registers, &executing->Registers );
 
-  context_switch_self_time = Read_timer();
+  context_switch_self_time = benchmark_timerread();
 
   _Context_Switch(&executing->Registers, &Middle_tcb->Registers);
 
-  context_switch_another_task_time = Read_timer();
+  context_switch_another_task_time = benchmark_timerread();
 
   _Thread_Executing =
         (Thread_Control *) _Thread_Ready_chain[201].first;
@@ -280,7 +280,7 @@ rtems_task Low_task(
 
   _Thread_Disable_dispatch();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
 #if (CPU_HARDWARE_FP == 1) || (CPU_SOFTWARE_FP == 1)
     _Context_Restore_fp( &_Thread_Executing->fp_context );
 #endif
@@ -294,7 +294,7 @@ rtems_task Floating_point_task_1(
   Thread_Control *executing;
   FP_DECLARE;
 
-  context_switch_restore_1st_fp_time = Read_timer();
+  context_switch_restore_1st_fp_time = benchmark_timerread();
 
   executing = _Thread_Executing;
 
@@ -307,7 +307,7 @@ rtems_task Floating_point_task_1(
 
   _Thread_Disable_dispatch();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
 #if (CPU_HARDWARE_FP == 1) || (CPU_SOFTWARE_FP == 1)
     _Context_Save_fp( &executing->fp_context );
     _Context_Restore_fp( &_Thread_Executing->fp_context );
@@ -315,7 +315,7 @@ rtems_task Floating_point_task_1(
     _Context_Switch( &executing->Registers, &_Thread_Executing->Registers );
   /* switch to Floating_point_task_2 */
 
-  context_switch_save_idle_restore_initted_time = Read_timer();
+  context_switch_save_idle_restore_initted_time = benchmark_timerread();
 
   FP_LOAD( 1.0 );
 
@@ -330,7 +330,7 @@ rtems_task Floating_point_task_1(
 
   _Thread_Disable_dispatch();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
 #if (CPU_HARDWARE_FP == 1) || (CPU_SOFTWARE_FP == 1)
     _Context_Save_fp( &executing->fp_context );
     _Context_Restore_fp( &_Thread_Executing->fp_context );
@@ -346,7 +346,7 @@ rtems_task Floating_point_task_2(
   Thread_Control *executing;
   FP_DECLARE;
 
-  context_switch_save_restore_idle_time = Read_timer();
+  context_switch_save_restore_idle_time = benchmark_timerread();
 
   executing = _Thread_Executing;
 
@@ -361,7 +361,7 @@ rtems_task Floating_point_task_2(
 
   _Thread_Disable_dispatch();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
 #if (CPU_HARDWARE_FP == 1) || (CPU_SOFTWARE_FP == 1)
     _Context_Save_fp( &executing->fp_context );
     _Context_Restore_fp( &_Thread_Executing->fp_context );
@@ -369,7 +369,7 @@ rtems_task Floating_point_task_2(
     _Context_Switch( &executing->Registers, &_Thread_Executing->Registers );
   /* switch to Floating_point_task_1 */
 
-  context_switch_save_restore_initted_time = Read_timer();
+  context_switch_save_restore_initted_time = benchmark_timerread();
 
   complete_test();
 }
@@ -379,43 +379,43 @@ void complete_test( void )
   uint32_t    index;
   rtems_id          task_id;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     _Thread_Resume( Middle_tcb, TRUE );
-  thread_resume_time = Read_timer();
+  thread_resume_time = benchmark_timerread();
 
   _Thread_Set_state( Middle_tcb, STATES_WAITING_FOR_MESSAGE );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     _Thread_Unblock( Middle_tcb );
-  thread_unblock_time = Read_timer();
+  thread_unblock_time = benchmark_timerread();
 
   _Thread_Set_state( Middle_tcb, STATES_WAITING_FOR_MESSAGE );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     _Thread_Ready( Middle_tcb );
-  thread_ready_time = Read_timer();
+  thread_ready_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
   task_id = Middle_tcb->Object.id;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) _Thread_Get( task_id, &location );
-  thread_get_time = Read_timer();
+  thread_get_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) _Semaphore_Get( Semaphore_id, &location );
-  semaphore_get_time = Read_timer();
+  semaphore_get_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) _Thread_Get( 0x3, &location );
-  thread_get_invalid_time = Read_timer();
+  thread_get_invalid_time = benchmark_timerread();
 
   /*
    *  This is the running task and we have tricked RTEMS out enough where
diff --git a/testsuites/tmtests/tm27/task1.c b/testsuites/tmtests/tm27/task1.c
index ff55da6273..108fc5364a 100644
--- a/testsuites/tmtests/tm27/task1.c
+++ b/testsuites/tmtests/tm27/task1.c
@@ -78,10 +78,10 @@ rtems_task Init(
   status = rtems_task_start( Task_id[ 2 ], Task_2, 0 );
   directive_failed( status, "rtems_task_start of Task_2" );
 
-  Timer_initialize();
-  Read_timer();
-  Timer_initialize();
-  timer_overhead = Read_timer();
+  benchmark_timerinitialize();
+  benchmark_timerread();
+  benchmark_timerinitialize();
+  timer_overhead = benchmark_timerread();
 
   status = rtems_task_delete( RTEMS_SELF );
   directive_failed( status, "rtems_task_delete of RTEMS_SELF" );
@@ -103,14 +103,14 @@ rtems_task Task_1(
 
   Interrupt_occurred = 0;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
   Cause_tm27_intr();
   /* goes to Isr_handler */
 
 #if (MUST_WAIT_FOR_INTERRUPT == 1)
   while ( Interrupt_occurred == 0 );
 #endif
-  Interrupt_return_time = Read_timer();
+  Interrupt_return_time = benchmark_timerread();
 
   put_time(
     "interrupt entry overhead: returns to interrupted task",
@@ -137,14 +137,14 @@ rtems_task Task_1(
   Interrupt_nest = 1;
 
   Interrupt_occurred = 0;
-  Timer_initialize();
+  benchmark_timerinitialize();
   Cause_tm27_intr();
   /* goes to Isr_handler */
 
 #if (MUST_WAIT_FOR_INTERRUPT == 1)
   while ( Interrupt_occurred == 0 );
 #endif
-  Interrupt_return_time = Read_timer();
+  Interrupt_return_time = benchmark_timerread();
 
   _Thread_Dispatch_disable_level = 0;
 
@@ -175,7 +175,7 @@ rtems_task Task_1(
   _Context_Switch_necessary = 1;
 
   Interrupt_occurred = 0;
-  Timer_initialize();
+  benchmark_timerinitialize();
   Cause_tm27_intr();
 
   /*
@@ -201,7 +201,7 @@ rtems_task Task_2(
 #if (MUST_WAIT_FOR_INTERRUPT == 1)
   while ( Interrupt_occurred == 0 );
 #endif
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "interrupt entry overhead: returns to preempting task",
@@ -246,7 +246,7 @@ rtems_isr Isr_handler(
   rtems_vector_number vector
 )
 {
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   Interrupt_occurred = 1;
   Isr_handler_inner();
@@ -266,18 +266,18 @@ void Isr_handler_inner( void )
       Interrupt_nest = 2;
       Interrupt_occurred = 0;
       Lower_tm27_intr();
-      Timer_initialize();
+      benchmark_timerinitialize();
       Cause_tm27_intr();
       /* goes to a nested copy of Isr_handler */
 #if (MUST_WAIT_FOR_INTERRUPT == 1)
        while ( Interrupt_occurred == 0 );
 #endif
-      Interrupt_return_nested_time = Read_timer();
+      Interrupt_return_nested_time = benchmark_timerread();
       break;
     case 2:
       Interrupt_enter_nested_time = end_time;
       break;
   }
 
-  Timer_initialize();
+  benchmark_timerinitialize();
 }
diff --git a/testsuites/tmtests/tm28/task1.c b/testsuites/tmtests/tm28/task1.c
index 4469751354..6675d0a3d5 100644
--- a/testsuites/tmtests/tm28/task1.c
+++ b/testsuites/tmtests/tm28/task1.c
@@ -57,14 +57,14 @@ rtems_task Test_task (
   uint32_t     index;
   void              *converted;
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
   name = rtems_build_name( 'P', 'O', 'R', 'T' ),
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_port_create(
       name,
       Internal_area,
@@ -72,7 +72,7 @@ rtems_task Test_task (
       0xff,
       &Port_id
     );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_port_create",
@@ -82,14 +82,14 @@ rtems_task Test_task (
     CALLING_OVERHEAD_PORT_CREATE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_port_external_to_internal(
                Port_id,
                &External_area[ 0xf ],
                &converted
              );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_port_external_to_internal",
@@ -99,14 +99,14 @@ rtems_task Test_task (
     CALLING_OVERHEAD_PORT_EXTERNAL_TO_INTERNAL
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_port_internal_to_external(
                Port_id,
                &Internal_area[ 0xf ],
                &converted
              );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_port_internal_to_external",
@@ -116,9 +116,9 @@ rtems_task Test_task (
     CALLING_OVERHEAD_PORT_INTERNAL_TO_EXTERNAL
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_port_delete( Port_id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_port_delete",
diff --git a/testsuites/tmtests/tm29/task1.c b/testsuites/tmtests/tm29/task1.c
index 8c078d668f..e916aa213b 100644
--- a/testsuites/tmtests/tm29/task1.c
+++ b/testsuites/tmtests/tm29/task1.c
@@ -39,9 +39,9 @@ rtems_task Init(
 
   Period_name = rtems_build_name( 'P', 'R', 'D', ' ' );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_rate_monotonic_create( Period_name, &id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_rate_monotonic_create",
@@ -51,9 +51,9 @@ rtems_task Init(
     CALLING_OVERHEAD_RATE_MONOTONIC_CREATE
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_rate_monotonic_period( id, 10 );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_rate_monotonic_period: initiate period -- returns to caller",
@@ -63,9 +63,9 @@ rtems_task Init(
     CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_rate_monotonic_period( id, RTEMS_PERIOD_STATUS );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_rate_monotonic_period: obtain status",
@@ -75,9 +75,9 @@ rtems_task Init(
     CALLING_OVERHEAD_RATE_MONOTONIC_PERIOD
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_rate_monotonic_cancel( id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_rate_monotonic_cancel",
@@ -87,9 +87,9 @@ rtems_task Init(
     CALLING_OVERHEAD_RATE_MONOTONIC_CANCEL
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     (void) rtems_rate_monotonic_delete( id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_rate_monotonic_delete: inactive",
@@ -105,9 +105,9 @@ rtems_task Init(
   status = rtems_rate_monotonic_period( id, 10 );
   directive_failed( status, "rtems_rate_monotonic_period" );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     rtems_rate_monotonic_delete( id );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_rate_monotonic_delete: active",
@@ -175,7 +175,7 @@ rtems_task Tasks(
   Task_count++;
 
   if ( Task_count == 1 )
-    Timer_initialize();
+    benchmark_timerinitialize();
 
   (void) rtems_rate_monotonic_period( id, 100 );
 }
@@ -186,12 +186,12 @@ rtems_task Low_task(
 {
   uint32_t   index;
 
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
-      (void) Empty_function();
-  overhead = Read_timer();
+      (void) benchmark_timerempty_function();
+  overhead = benchmark_timerread();
 
   put_time(
     "rtems_rate_monotonic_period: conclude periods -- caller blocks",
diff --git a/testsuites/tmtests/tmck/task1.c b/testsuites/tmtests/tmck/task1.c
index 9876d80f87..4457c264de 100644
--- a/testsuites/tmtests/tmck/task1.c
+++ b/testsuites/tmtests/tmck/task1.c
@@ -38,7 +38,7 @@ rtems_task Init(
    *  Tell the Timer Driver what we are doing
    */
 
-  Set_find_average_overhead( 1 );
+  benchmark_timerdisable_subtracting_average_overhead( 1 );
 
   Print_Warning();
 
@@ -72,8 +72,8 @@ rtems_task Task_1(
   check_read_timer();
 rtems_test_pause();
 
-  Timer_initialize();
-  end_time = Read_timer();
+  benchmark_timerinitialize();
+  end_time = benchmark_timerread();
 
   put_time(
     "NULL timer stopped at",
@@ -83,10 +83,10 @@ rtems_test_pause();
     0
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
   for ( index = 1 ; index <= 1000 ; index++ )
-    (void) Empty_function();
-  end_time = Read_timer();
+    (void) benchmark_timerempty_function();
+  end_time = benchmark_timerread();
 
   put_time(
     "LOOP (1000) timer stopped at",
@@ -96,10 +96,10 @@ rtems_test_pause();
     0
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
   for ( index = 1 ; index <= 10000 ; index++ )
-    (void) Empty_function();
-  end_time = Read_timer();
+    (void) benchmark_timerempty_function();
+  end_time = benchmark_timerread();
 
   put_time(
     "LOOP (10000) timer stopped at",
@@ -109,10 +109,10 @@ rtems_test_pause();
     0
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
   for ( index = 1 ; index <= 50000 ; index++ )
-    (void) Empty_function();
-  end_time = Read_timer();
+    (void) benchmark_timerempty_function();
+  end_time = benchmark_timerread();
 
   put_time(
     "LOOP (50000) timer stopped at",
@@ -122,10 +122,10 @@ rtems_test_pause();
     0
   );
 
-  Timer_initialize();
+  benchmark_timerinitialize();
   for ( index = 1 ; index <= 100000 ; index++ )
-    (void) Empty_function();
-  end_time = Read_timer();
+    (void) benchmark_timerempty_function();
+  end_time = benchmark_timerread();
 
   put_time(
     "LOOP (100000) timer stopped at",
@@ -148,8 +148,8 @@ void check_read_timer()
     Distribution[ index ] = 0;
 
   for ( index = 1 ; index <= OPERATION_COUNT ; index++ ) {
-    Timer_initialize();
-    end_time = Read_timer();
+    benchmark_timerinitialize();
+    end_time = benchmark_timerread();
     if ( end_time > MAXIMUM_DISTRIBUTION ) {
       /*
        *  Under UNIX a simple process swap takes longer than we
diff --git a/testsuites/tmtests/tmoverhd/testtask.c b/testsuites/tmtests/tmoverhd/testtask.c
index e9360cdcb6..9676ae62d8 100644
--- a/testsuites/tmtests/tmoverhd/testtask.c
+++ b/testsuites/tmtests/tmoverhd/testtask.c
@@ -27,7 +27,7 @@ rtems_task Init(
 { rtems_id id;
   rtems_status_code status;
 
-  Set_find_average_overhead( TRUE );
+  benchmark_timerdisable_subtracting_average_overhead( TRUE );
 
   Print_Warning();
 
@@ -93,10 +93,10 @@ rtems_task Task_1(
 
 /* rtems_shutdown_executive */
 
-  Timer_initialize();
+  benchmark_timerinitialize();
     for ( index=1 ; index <= OPERATION_COUNT ; index++ )
       (void) rtems_shutdown_executive( error );
-  end_time = Read_timer();
+  end_time = benchmark_timerread();
 
   put_time(
     "rtems_shutdown_executive",
@@ -108,7 +108,7 @@ rtems_task Task_1(
 
 /* rtems_task_create */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_create(
                name,
@@ -118,7 +118,7 @@ rtems_task Task_1(
                RTEMS_DEFAULT_ATTRIBUTES,
                &id
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_create",
@@ -130,10 +130,10 @@ rtems_task Task_1(
 
 /* rtems_task_ident */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_ident( name, RTEMS_SEARCH_ALL_NODES, id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_ident",
@@ -145,10 +145,10 @@ rtems_task Task_1(
 
 /* rtems_task_start */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_start( id, Task_1, 0 );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_start",
@@ -160,10 +160,10 @@ rtems_task Task_1(
 
 /* rtems_task_restart */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_restart( id, 0 );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_restart",
@@ -175,10 +175,10 @@ rtems_task Task_1(
 
 /* rtems_task_delete */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_delete( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_delete",
@@ -190,10 +190,10 @@ rtems_task Task_1(
 
 /* rtems_task_suspend */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_suspend( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_suspend",
@@ -205,10 +205,10 @@ rtems_task Task_1(
 
 /* rtems_task_resume */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_resume( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_resume",
@@ -220,10 +220,10 @@ rtems_task Task_1(
 
 /* rtems_task_set_priority */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_set_priority( id, in_priority, &out_priority );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_set_priority",
@@ -235,10 +235,10 @@ rtems_task Task_1(
 
 /* rtems_task_mode */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_mode( in_mode, mask, &out_mode );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_mode",
@@ -250,10 +250,10 @@ rtems_task Task_1(
 
 /* rtems_task_get_note */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_get_note( id, 1, note );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_get_note",
@@ -265,10 +265,10 @@ rtems_task Task_1(
 
 /* rtems_task_set_note */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_set_note( id, 1, note );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_set_note",
@@ -280,10 +280,10 @@ rtems_task Task_1(
 
 /* rtems_task_wake_when */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_wake_when( time );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_wake_when",
@@ -295,10 +295,10 @@ rtems_task Task_1(
 
 /* rtems_task_wake_after */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_task_wake_after( timeout );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_task_wake_after",
@@ -310,10 +310,10 @@ rtems_task Task_1(
 
 /* rtems_interrupt_catch */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_interrupt_catch( Isr_handler, 5, address_1 );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_interrupt_catch",
@@ -325,10 +325,10 @@ rtems_task Task_1(
 
 /* rtems_clock_get */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_clock_get( options, time );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_clock_get",
@@ -340,10 +340,10 @@ rtems_task Task_1(
 
 /* rtems_clock_set */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_clock_set( time );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_clock_set",
@@ -355,10 +355,10 @@ rtems_task Task_1(
 
 /* rtems_clock_tick */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
            (void) rtems_clock_tick();
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_clock_tick",
@@ -372,10 +372,10 @@ rtems_test_pause();
 
 /* rtems_timer_create */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_timer_create( name, &id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_timer_create",
@@ -387,10 +387,10 @@ rtems_test_pause();
 
 /* rtems_timer_delete */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_timer_delete( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_timer_delete",
@@ -402,10 +402,10 @@ rtems_test_pause();
 
 /* rtems_timer_ident */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_timer_ident( name, id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_timer_ident",
@@ -417,7 +417,7 @@ rtems_test_pause();
 
 /* rtems_timer_fire_after */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_timer_fire_after(
                id,
@@ -425,7 +425,7 @@ rtems_test_pause();
                Timer_handler,
                NULL
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_timer_fire_after",
@@ -437,7 +437,7 @@ rtems_test_pause();
 
 /* rtems_timer_fire_when */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_timer_fire_when(
                id,
@@ -445,7 +445,7 @@ rtems_test_pause();
                Timer_handler,
                NULL
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_timer_fire_when",
@@ -457,10 +457,10 @@ rtems_test_pause();
 
 /* rtems_timer_reset */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_timer_reset( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_timer_reset",
@@ -472,10 +472,10 @@ rtems_test_pause();
 
 /* rtems_timer_cancel */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_timer_cancel( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_timer_cancel",
@@ -487,7 +487,7 @@ rtems_test_pause();
 
 /* rtems_semaphore_create */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_semaphore_create(
                name,
@@ -496,7 +496,7 @@ rtems_test_pause();
                RTEMS_NO_PRIORITY,
                &id
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_semaphore_create",
@@ -508,10 +508,10 @@ rtems_test_pause();
 
 /* rtems_semaphore_delete */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_semaphore_delete( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_semaphore_delete",
@@ -523,10 +523,10 @@ rtems_test_pause();
 
 /* rtems_semaphore_ident */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_semaphore_ident( name, RTEMS_SEARCH_ALL_NODES, id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_semaphore_ident",
@@ -538,10 +538,10 @@ rtems_test_pause();
 
 /* rtems_semaphore_obtain */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_semaphore_obtain( id, RTEMS_DEFAULT_OPTIONS, timeout );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_semaphore_obtain",
@@ -553,10 +553,10 @@ rtems_test_pause();
 
 /* rtems_semaphore_release */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_semaphore_release( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_semaphore_release",
@@ -568,7 +568,7 @@ rtems_test_pause();
 
 /* rtems_message_queue_create */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_message_queue_create(
                name,
@@ -576,7 +576,7 @@ rtems_test_pause();
                RTEMS_DEFAULT_ATTRIBUTES,
                &id
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_message_queue_create",
@@ -588,14 +588,14 @@ rtems_test_pause();
 
 /* rtems_message_queue_ident */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_message_queue_ident(
               name,
               RTEMS_SEARCH_ALL_NODES,
               id
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_message_queue_ident",
@@ -607,10 +607,10 @@ rtems_test_pause();
 
 /* rtems_message_queue_delete */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_message_queue_delete( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_message_queue_delete",
@@ -622,10 +622,10 @@ rtems_test_pause();
 
 /* rtems_message_queue_send */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_message_queue_send( id, (long (*)[4])buffer );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_message_queue_send",
@@ -637,10 +637,10 @@ rtems_test_pause();
 
 /* rtems_message_queue_urgent */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_message_queue_urgent( id, (long (*)[4])buffer );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_message_queue_urgent",
@@ -652,14 +652,14 @@ rtems_test_pause();
 
 /* rtems_message_queue_broadcast */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_message_queue_broadcast(
                id,
                (long (*)[4])buffer,
                &count
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_message_queue_broadcast",
@@ -671,7 +671,7 @@ rtems_test_pause();
 
 /* rtems_message_queue_receive */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_message_queue_receive(
                id,
@@ -679,7 +679,7 @@ rtems_test_pause();
                RTEMS_DEFAULT_OPTIONS,
                timeout
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_message_queue_receive",
@@ -691,10 +691,10 @@ rtems_test_pause();
 
 /* rtems_message_queue_flush */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_message_queue_flush( id, &count );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_message_queue_flush",
@@ -708,10 +708,10 @@ rtems_test_pause();
 
 /* rtems_event_send */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_event_send( id, events );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_event_send",
@@ -723,7 +723,7 @@ rtems_test_pause();
 
 /* rtems_event_receive */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_event_receive(
                RTEMS_EVENT_16,
@@ -731,7 +731,7 @@ rtems_test_pause();
                timeout,
                &events
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_event_receive",
@@ -743,10 +743,10 @@ rtems_test_pause();
 
 /* rtems_signal_catch */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_signal_catch( Asr_handler, RTEMS_DEFAULT_MODES );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_signal_catch",
@@ -758,10 +758,10 @@ rtems_test_pause();
 
 /* rtems_signal_send */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_signal_send( id, signals );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_signal_send",
@@ -773,7 +773,7 @@ rtems_test_pause();
 
 /* rtems_partition_create */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_partition_create(
                name,
@@ -783,7 +783,7 @@ rtems_test_pause();
                RTEMS_DEFAULT_ATTRIBUTES,
                &id
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_partition_create",
@@ -795,10 +795,10 @@ rtems_test_pause();
 
 /* rtems_partition_ident */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_partition_ident( name, RTEMS_SEARCH_ALL_NODES, id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_partition_ident",
@@ -810,10 +810,10 @@ rtems_test_pause();
 
 /* rtems_partition_delete */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_partition_delete( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_partition_delete",
@@ -825,10 +825,10 @@ rtems_test_pause();
 
 /* rtems_partition_get_buffer */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_partition_get_buffer( id, address_1 );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_partition_get_buffer",
@@ -840,10 +840,10 @@ rtems_test_pause();
 
 /* rtems_partition_return_buffer */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_partition_return_buffer( id, address_1 );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_partition_return_buffer",
@@ -855,7 +855,7 @@ rtems_test_pause();
 
 /* rtems_region_create */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_region_create(
                name,
@@ -865,7 +865,7 @@ rtems_test_pause();
                RTEMS_DEFAULT_ATTRIBUTES,
                &id
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_region_create",
@@ -877,10 +877,10 @@ rtems_test_pause();
 
 /* rtems_region_ident */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_region_ident( name, id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_region_ident",
@@ -892,10 +892,10 @@ rtems_test_pause();
 
 /* rtems_region_delete */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_region_delete( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_region_delete",
@@ -907,7 +907,7 @@ rtems_test_pause();
 
 /* rtems_region_get_segment */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_region_get_segment(
                id,
@@ -916,7 +916,7 @@ rtems_test_pause();
                timeout,
                &address_1
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_region_get_segment",
@@ -928,10 +928,10 @@ rtems_test_pause();
 
 /* rtems_region_return_segment */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_region_return_segment( id, address_1 );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_region_return_segment",
@@ -943,7 +943,7 @@ rtems_test_pause();
 
 /* rtems_port_create */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_port_create(
                name,
@@ -952,7 +952,7 @@ rtems_test_pause();
                0xff,
                &id
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_port_create",
@@ -964,10 +964,10 @@ rtems_test_pause();
 
 /* rtems_port_ident */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_port_ident( name, id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_port_ident",
@@ -979,10 +979,10 @@ rtems_test_pause();
 
 /* rtems_port_delete */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_port_delete( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_port_delete",
@@ -994,14 +994,14 @@ rtems_test_pause();
 
 /* rtems_port_external_to_internal */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_port_external_to_internal(
                id,
                &External_port_area[ 7 ],
                address_1
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_port_external_to_internal",
@@ -1013,14 +1013,14 @@ rtems_test_pause();
 
 /* rtems_port_internal_to_external */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_port_internal_to_external(
                id,
                &Internal_port_area[ 7 ],
                address_1
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_port_internal_to_external",
@@ -1034,7 +1034,7 @@ rtems_test_pause();
 
 /* rtems_io_initialize */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_io_initialize(
                major,
@@ -1042,7 +1042,7 @@ rtems_test_pause();
                address_1,
                &io_result
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_io_initialize",
@@ -1054,7 +1054,7 @@ rtems_test_pause();
 
 /* rtems_io_open */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_io_open(
                major,
@@ -1062,7 +1062,7 @@ rtems_test_pause();
                address_1,
                &io_result
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_io_open",
@@ -1074,7 +1074,7 @@ rtems_test_pause();
 
 /* rtems_io_close */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_io_close(
                major,
@@ -1082,7 +1082,7 @@ rtems_test_pause();
                address_1,
                &io_result
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_io_close",
@@ -1094,7 +1094,7 @@ rtems_test_pause();
 
 /* rtems_io_read */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_io_read(
                major,
@@ -1102,7 +1102,7 @@ rtems_test_pause();
                address_1,
                &io_result
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_io_read",
@@ -1114,7 +1114,7 @@ rtems_test_pause();
 
 /* rtems_io_write */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_io_write(
                major,
@@ -1122,7 +1122,7 @@ rtems_test_pause();
                address_1,
                &io_result
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_io_write",
@@ -1134,7 +1134,7 @@ rtems_test_pause();
 
 /* rtems_io_control */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_io_control(
                major,
@@ -1142,7 +1142,7 @@ rtems_test_pause();
                address_1,
                &io_result
             );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_io_control",
@@ -1154,10 +1154,10 @@ rtems_test_pause();
 
 /* rtems_fatal_error_occurred */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_fatal_error_occurred( error );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_fatal_error_occurred",
@@ -1169,10 +1169,10 @@ rtems_test_pause();
 
 /* rtems_rate_monotonic_create */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_rate_monotonic_create( name, &id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_rate_monotonic_create",
@@ -1184,10 +1184,10 @@ rtems_test_pause();
 
 /* rtems_rate_monotonic_ident */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_rate_monotonic_ident( name, id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_rate_monotonic_ident",
@@ -1199,10 +1199,10 @@ rtems_test_pause();
 
 /* rtems_rate_monotonic_delete */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_rate_monotonic_delete( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_rate_monotonic_delete",
@@ -1214,10 +1214,10 @@ rtems_test_pause();
 
 /* rtems_rate_monotonic_cancel */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_rate_monotonic_cancel( id );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_rate_monotonic_cancel",
@@ -1229,10 +1229,10 @@ rtems_test_pause();
 
 /* rtems_rate_monotonic_period */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_rate_monotonic_period( id, timeout );
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_rate_monotonic_period",
@@ -1244,10 +1244,10 @@ rtems_test_pause();
 
 /* rtems_multiprocessing_announce */
 
-      Timer_initialize();
+      benchmark_timerinitialize();
          for ( index = 1 ; index <= OPERATION_COUNT ; index ++ )
             (void) rtems_multiprocessing_announce();
-      end_time = Read_timer();
+      end_time = benchmark_timerread();
 
       put_time(
          "rtems_multiprocessing_announce",
author	Joel Sherrill <joel.sherrill@OARcorp.com>	2008-08-31 16:47:18 +0000
committer	Joel Sherrill <joel.sherrill@OARcorp.com>	2008-08-31 16:47:18 +0000
commit	4074e70b0390d25b184b1187b8a8c59cf7ead79b (patch)
tree	59fb0f95377c8e1b71234c5059a76c138deae15c
parent	2008-08-31 Joel Sherrill <joel.sherrill@oarcorp.com> (diff)
download	rtems-4074e70b0390d25b184b1187b8a8c59cf7ead79b.tar.bz2