flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2026-08-21 13:23:02 +00:00
Code Issues Releases Wiki Activity

tests: use drmtest_skip() in caching ioctl helpers

Browse Source 
This way we can rip out all the skip handling from the test control flow,
and additionally (by using drmtest_retval()) even get correct exit codes.

The only tricky part is that when we only want ot skip parts of a test
(like for gem_pread and gem_pwrite) we need to split out those parts as
subtests. But no addition of control-flow is required, the set/longjmp
magic in the helpers all makes it happen.

Also we make extensive use of the behaviour of drmtest_skip to skip
all subsequent subtests if it is called outside of a subtest. This allows
us to re-flatten the control flow a lot.

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter
2013-08-12 10:43:59 +02:00
parent a4038d3853
commit 7553ad6e10
9 changed files with 177 additions and 170 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/gem_pwrite_pread.c
+96 -96
View File
@@ -398,114 +398,114 @@ int main(int argc, char **argv)
src = gem_create(fd, object_size);
tmp = malloc(object_size);
if (gem_set_caching(fd, src, 0) == 0 &&
gem_set_caching(fd, dst, 0) == 0) {
drmtest_subtest_block("uncached-copy-correctness")
test_copy(fd, src, dst, tmp, object_size);
drmtest_subtest_block("uncached-copy-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
gem_set_caching(fd, src, 0);
gem_set_caching(fd, dst, 0);
gettimeofday(&start, NULL);
copy(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("Time to uncached copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
}
drmtest_subtest_block("uncached-copy-correctness")
test_copy(fd, src, dst, tmp, object_size);
drmtest_subtest_block("uncached-copy-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
drmtest_subtest_block("uncached-pwrite-blt-gtt_mmap-correctness")
test_as_gtt_mmap(fd, src, dst, object_size);
drmtest_subtest_block("uncached-pwrite-blt-gtt_mmap-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
gettimeofday(&start, NULL);
as_gtt_mmap(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("** mmap uncached copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
gettimeofday(&start, NULL);
copy(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("Time to uncached copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
}
if (gem_set_caching(fd, src, 1) == 0 &&
gem_set_caching(fd, dst, 1) == 0) {
drmtest_subtest_block("snooped-copy-correctness")
test_copy(fd, src, dst, tmp, object_size);
drmtest_subtest_block("snooped-copy-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
drmtest_subtest_block("uncached-pwrite-blt-gtt_mmap-correctness")
test_as_gtt_mmap(fd, src, dst, object_size);
drmtest_subtest_block("uncached-pwrite-blt-gtt_mmap-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
gettimeofday(&start, NULL);
copy(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("Time to snooped copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
}
drmtest_subtest_block("snooped-pwrite-blt-cpu_mmap-correctness")
test_as_cpu_mmap(fd, src, dst, object_size);
drmtest_subtest_block("snooped-pwrite-blt-cpu_mmap-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
gettimeofday(&start, NULL);
as_cpu_mmap(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("** mmap snooped copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
gettimeofday(&start, NULL);
as_gtt_mmap(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("** mmap uncached copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
}
if (gem_set_caching(fd, src, 2) == 0 &&
gem_set_caching(fd, dst, 2) == 0) {
drmtest_subtest_block("display-copy-correctness")
test_copy(fd, src, dst, tmp, object_size);
drmtest_subtest_block("display-copy-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
gem_set_caching(fd, src, 1);
gem_set_caching(fd, dst, 1);
gettimeofday(&start, NULL);
copy(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("Time to display copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
drmtest_subtest_block("snooped-copy-correctness")
test_copy(fd, src, dst, tmp, object_size);
drmtest_subtest_block("snooped-copy-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
gettimeofday(&start, NULL);
copy(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("Time to snooped copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
}
drmtest_subtest_block("display-pwrite-blt-gtt_mmap-correctness")
test_as_gtt_mmap(fd, src, dst, object_size);
drmtest_subtest_block("display-pwrite-blt-gtt_mmap-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
drmtest_subtest_block("snooped-pwrite-blt-cpu_mmap-correctness")
test_as_cpu_mmap(fd, src, dst, object_size);
drmtest_subtest_block("snooped-pwrite-blt-cpu_mmap-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
gettimeofday(&start, NULL);
as_gtt_mmap(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("** mmap display copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
gettimeofday(&start, NULL);
as_cpu_mmap(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("** mmap snooped copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
}
gem_set_caching(fd, src, 2);
gem_set_caching(fd, dst, 2);
drmtest_subtest_block("display-copy-correctness")
test_copy(fd, src, dst, tmp, object_size);
drmtest_subtest_block("display-copy-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
gettimeofday(&start, NULL);
copy(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("Time to display copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
}
drmtest_subtest_block("display-pwrite-blt-gtt_mmap-correctness")
test_as_gtt_mmap(fd, src, dst, object_size);
drmtest_subtest_block("display-pwrite-blt-gtt_mmap-performance") {
for (count = 1; count <= 1<<17; count <<= 1) {
struct timeval start, end;
gettimeofday(&start, NULL);
as_gtt_mmap(fd, src, dst, tmp, object_size, count);
gettimeofday(&end, NULL);
printf("** mmap display copy %d bytes x %6d: %7.3fµs, %s\n",
object_size, count,
elapsed(&start, &end, count),
bytes_per_sec((char *)buf, object_size/elapsed(&start, &end, count)*1e6));
fflush(stdout);
}
}
@@ -515,5 +515,5 @@ int main(int argc, char **argv)
close(fd);
return 0;
return drmtest_retval();
}