devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Correct new memcpy/memset functionality in test_mem plugin. Use appropriate clobber list for arm asm.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26255 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Andree Buschmann 2010-05-24 17:13:48 +00:00
parent 1f5b9434da
commit d76a9316fb
1 changed files with 19 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

34
apps/plugins/test_mem.c
View file

@ -43,15 +43,16 @@ void memset_test(volatile int *buf, int buf_size, int loop_cnt,
int last_tick = *rb->current_tick; int last_tick = *rb->current_tick;
for(i=0; i < loop_cnt; i++) for(i=0; i < loop_cnt; i++)
memset((void *)buf, 0xff, buf_size); {
memset((void *)buf, 0xff, buf_size*sizeof(int));
}
delta = *rb->current_tick - last_tick; delta = *rb->current_tick - last_tick;
delta = delta>0 ? delta : delta+1; delta = delta>0 ? delta : delta+1;
dMB = dMB_PER_SEC(loop_cnt, delta); dMB = dMB_PER_SEC(loop_cnt, delta);
rb->screens[0]->putsf(0, line, "%s st: %3d.%d MB/s (%2d ticks for %d MB)", rb->screens[0]->putsf(0, line, "%s st: %3d.%d MB/s (%3d ticks for %d MB)",
ramtype, dMB/10, dMB%10, delta, ramtype, dMB/10, dMB%10, delta,
(loop_cnt*BUF_SIZE*4)>>20); (loop_cnt*BUF_SIZE*4)>>20);
} }
void memcpy_test(volatile int *buf, int buf_size, int loop_cnt, void memcpy_test(volatile int *buf, int buf_size, int loop_cnt,
@ -60,16 +61,19 @@ void memcpy_test(volatile int *buf, int buf_size, int loop_cnt,
int delta, dMB, i; int delta, dMB, i;
int last_tick = *rb->current_tick; int last_tick = *rb->current_tick;
for(i=0; i < loop_cnt; i++) /* double loop count to compensate for half size memcpy */
memcpy((void *)buf+(buf_size/2), (void *)buf, buf_size/2); for(i=0; i < loop_cnt*2; i++)
{
memcpy((void *)buf+(buf_size*sizeof(int)/2),
(void *)buf, buf_size*sizeof(int)/2);
}
delta = *rb->current_tick - last_tick; delta = *rb->current_tick - last_tick;
delta = delta>0 ? delta : delta+1; delta = delta>0 ? delta : delta+1;
dMB = dMB_PER_SEC(loop_cnt, delta); dMB = dMB_PER_SEC(loop_cnt, delta);
rb->screens[0]->putsf(0, line, "%s cp: %3d.%d MB/s (%2d ticks for %d MB)", rb->screens[0]->putsf(0, line, "%s cp: %3d.%d MB/s (%3d ticks for %d MB)",
ramtype, dMB/10, dMB%10, delta, ramtype, dMB/10, dMB%10, delta,
(loop_cnt*BUF_SIZE*4)>>21); (loop_cnt*BUF_SIZE*4)>>21);
} }
void write_test(volatile int *buf, int buf_size, int loop_cnt, void write_test(volatile int *buf, int buf_size, int loop_cnt,
@ -97,7 +101,7 @@ void write_test(volatile int *buf, int buf_size, int loop_cnt,
"bgt .outer_loop_read \n" "bgt .outer_loop_read \n"
: :
: [loops] "r" (loop_cnt), [size] "r" (buf_size), [buf_p] "r" (buf) : [loops] "r" (loop_cnt), [size] "r" (buf_size), [buf_p] "r" (buf)
: "r0", "r1", "r2", "r3", "r4", "r5", "r6" : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "memory", "cc"
); );
#else #else
int i, j; int i, j;
@ -115,7 +119,7 @@ void write_test(volatile int *buf, int buf_size, int loop_cnt,
delta = *rb->current_tick - last_tick; delta = *rb->current_tick - last_tick;
delta = delta>0 ? delta : delta+1; delta = delta>0 ? delta : delta+1;
dMB = dMB_PER_SEC(loop_cnt, delta); dMB = dMB_PER_SEC(loop_cnt, delta);
rb->screens[0]->putsf(0, line, "%s wr: %3d.%d MB/s (%2d ticks for %d MB)", rb->screens[0]->putsf(0, line, "%s wr: %3d.%d MB/s (%3d ticks for %d MB)",
ramtype, dMB/10, dMB%10, delta, ramtype, dMB/10, dMB%10, delta,
(loop_cnt*BUF_SIZE*4)>>20); (loop_cnt*BUF_SIZE*4)>>20);
} }
@ -141,7 +145,7 @@ void read_test(volatile int *buf, int buf_size, int loop_cnt,
"bgt .outer_loop_write \n" "bgt .outer_loop_write \n"
: :
: [loops] "r" (loop_cnt), [size] "r" (buf_size), [buf_p] "r" (buf) : [loops] "r" (loop_cnt), [size] "r" (buf_size), [buf_p] "r" (buf)
: "r0", "r1", "r2", "r3", "r4", "r5", "r6" : "r0", "r1", "r2", "r3", "r4", "r5", "r6", "memory", "cc"
); );
#else #else
int i, j, x; int i, j, x;
@ -159,7 +163,7 @@ void read_test(volatile int *buf, int buf_size, int loop_cnt,
delta = *rb->current_tick - last_tick; delta = *rb->current_tick - last_tick;
delta = delta>0 ? delta : delta+1; delta = delta>0 ? delta : delta+1;
dMB = dMB_PER_SEC(loop_cnt, delta); dMB = dMB_PER_SEC(loop_cnt, delta);
rb->screens[0]->putsf(0, line, "%s rd: %3d.%d MB/s (%2d ticks for %d MB)", rb->screens[0]->putsf(0, line, "%s rd: %3d.%d MB/s (%3d ticks for %d MB)",
ramtype, dMB/10, dMB%10, delta, ramtype, dMB/10, dMB%10, delta,
(loop_cnt*BUF_SIZE*4)>>20); (loop_cnt*BUF_SIZE*4)>>20);
} }
@ -189,13 +193,13 @@ enum plugin_status plugin_start(const void* parameter)
#endif #endif
rb->screens[0]->putsf(0, line++, "loop#: %d", ++count); rb->screens[0]->putsf(0, line++, "loop#: %d", ++count);
read_test (buf_dram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "DRAM"); read_test (buf_dram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "DRAM");
write_test(buf_dram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "DRAM"); write_test (buf_dram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "DRAM");
memset_test(buf_dram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "DRAM"); memset_test(buf_dram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "DRAM");
memcpy_test(buf_dram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "DRAM"); memcpy_test(buf_dram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "DRAM");
#if defined(PLUGIN_USE_IRAM) #if defined(PLUGIN_USE_IRAM)
read_test (buf_iram, BUF_SIZE, LOOP_REPEAT_IRAM, line++, "IRAM"); read_test (buf_iram, BUF_SIZE, LOOP_REPEAT_IRAM, line++, "IRAM");
write_test(buf_iram, BUF_SIZE, LOOP_REPEAT_IRAM, line++, "IRAM"); write_test (buf_iram, BUF_SIZE, LOOP_REPEAT_IRAM, line++, "IRAM");
memset_test(buf_iram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "IRAM"); memset_test(buf_iram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "IRAM");
memcpy_test(buf_iram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "IRAM"); memcpy_test(buf_iram, BUF_SIZE, LOOP_REPEAT_DRAM, line++, "IRAM");
#endif #endif