git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
timer: prefer TSC to HPET
[dpdk.git]
/
app
/
test
/
test_cycles.c
diff --git
a/app/test/test_cycles.c
b/app/test/test_cycles.c
index
f480402
..
92d302b
100644
(file)
--- a/
app/test/test_cycles.c
+++ b/
app/test/test_cycles.c
@@
-1,7
+1,7
@@
/*-
* BSD LICENSE
*
/*-
* BSD LICENSE
*
- * Copyright(c) 2010-201
2
Intel Corporation. All rights reserved.
+ * Copyright(c) 2010-201
3
Intel Corporation. All rights reserved.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
@@
-30,7
+30,6
@@
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*
- * version: DPDK.L.1.2.3-3
*/
#include <stdio.h>
*/
#include <stdio.h>
@@
-49,7
+48,7
@@
* Cycles test
* ===========
*
* Cycles test
* ===========
*
- * - Loop N times and check that the timer alway increments and
+ * - Loop N times and check that the timer alway
s
increments and
* never decrements during this loop.
*
* - Wait one second using rte_usleep() and check that the increment
* never decrements during this loop.
*
* - Wait one second using rte_usleep() and check that the increment
@@
-61,14
+60,14
@@
test_cycles(void)
{
unsigned i;
uint64_t start_cycles, cycles, prev_cycles;
{
unsigned i;
uint64_t start_cycles, cycles, prev_cycles;
- uint64_t hz = rte_get_
hpet
_hz();
+ uint64_t hz = rte_get_
timer
_hz();
uint64_t max_inc = (hz / 100); /* 10 ms max between 2 reads */
/* check that the timer is always incrementing */
uint64_t max_inc = (hz / 100); /* 10 ms max between 2 reads */
/* check that the timer is always incrementing */
- start_cycles = rte_get_
hpet
_cycles();
+ start_cycles = rte_get_
timer
_cycles();
prev_cycles = start_cycles;
for (i=0; i<N; i++) {
prev_cycles = start_cycles;
for (i=0; i<N; i++) {
- cycles = rte_get_
hpet
_cycles();
+ cycles = rte_get_
timer
_cycles();
if ((uint64_t)(cycles - prev_cycles) > max_inc) {
printf("increment too high or going backwards\n");
return -1;
if ((uint64_t)(cycles - prev_cycles) > max_inc) {
printf("increment too high or going backwards\n");
return -1;
@@
-77,16
+76,16
@@
test_cycles(void)
}
/* check that waiting 1 second is precise */
}
/* check that waiting 1 second is precise */
- prev_cycles = rte_get_
hpet
_cycles();
+ prev_cycles = rte_get_
timer
_cycles();
rte_delay_us(1000000);
rte_delay_us(1000000);
- cycles = rte_get_hpet_cycles();
+ cycles = rte_get_timer_cycles();
+
if ((uint64_t)(cycles - prev_cycles) > (hz + max_inc)) {
if ((uint64_t)(cycles - prev_cycles) > (hz + max_inc)) {
- printf("delay_us is not accurate\n");
+ printf("delay_us is not accurate
: too long
\n");
return -1;
}
return -1;
}
- cycles = rte_get_hpet_cycles();
- if ((uint64_t)(cycles - prev_cycles) < (hz)) {
- printf("delay_us is not accurate\n");
+ if ((uint64_t)(cycles - prev_cycles) < (hz - max_inc)) {
+ printf("delay_us is not accurate: too short\n");
return -1;
}
return -1;
}