tests: s/cacheing/caching

Signed-off-by: Daniel Vetter <daniel.vetter@ffwll.ch>
This commit is contained in:
Daniel Vetter
2013-08-12 08:41:05 +02:00
parent 7b254f1939
commit 40ea6f4ea8
10 changed files with 32 additions and 32 deletions
+1 -1
View File
@@ -9,7 +9,7 @@ gem_bad_batch
gem_bad_blit
gem_bad_length
gem_basic
gem_cacheing
gem_caching
gem_cpu_concurrent_blit
gem_cpu_reloc
gem_cs_prefetch
+1 -1
View File
@@ -17,7 +17,7 @@ endif
TESTS_progs_M = \
gem_basic \
gem_cacheing \
gem_caching \
gem_cpu_concurrent_blit \
gem_cs_tlb \
gem_dummy_reloc_loop \
+2 -2
View File
@@ -119,7 +119,7 @@ int main(int argc, char **argv)
fd = drm_open_any();
if (!gem_has_cacheing(fd)) {
if (!gem_has_caching(fd)) {
printf("no set_caching support detected\n");
return 77;
}
@@ -138,7 +138,7 @@ int main(int argc, char **argv)
/* overallocate the buffers we're actually using because */
scratch_bo = drm_intel_bo_alloc(bufmgr, "scratch bo", BO_SIZE, 4096);
gem_set_cacheing(fd, scratch_bo->handle, 1);
gem_set_caching(fd, scratch_bo->handle, 1);
staging_bo = drm_intel_bo_alloc(bufmgr, "staging bo", BO_SIZE, 4096);
+1 -1
View File
@@ -258,7 +258,7 @@ static void do_tests(int cache_level, const char *suffix)
char name[80];
if (cache_level != -1) {
switch (gem_set_cacheing(fd, scratch_bo->handle, cache_level)) {
switch (gem_set_caching(fd, scratch_bo->handle, cache_level)) {
case 0: break;
case -EINVAL:
case -ENOTTY:
+1 -1
View File
@@ -120,7 +120,7 @@ int main(int argc, char **argv)
}
for (c = cache; c->level != -1; c++) {
if (gem_set_cacheing(fd, dst, c->level))
if (gem_set_caching(fd, dst, c->level))
continue;
for (count = 1; count <= 1<<17; count <<= 1) {
+2 -2
View File
@@ -131,8 +131,8 @@ static void do_test(int fd, int cache_level,
int loop)
{
if (cache_level != -1) {
if (gem_set_cacheing(fd, tmp[0]->handle, cache_level) ||
gem_set_cacheing(fd, tmp[1]->handle, cache_level))
if (gem_set_caching(fd, tmp[0]->handle, cache_level) ||
gem_set_caching(fd, tmp[1]->handle, cache_level))
return;
}
+1 -1
View File
@@ -127,7 +127,7 @@ int main(int argc, char **argv)
}
for (c = cache; c->level != -1; c++) {
if (gem_set_cacheing(fd, dst, c->level))
if (gem_set_caching(fd, dst, c->level))
continue;
for (count = 1; count <= 1<<17; count <<= 1) {
+6 -6
View File
@@ -398,8 +398,8 @@ int main(int argc, char **argv)
src = gem_create(fd, object_size);
tmp = malloc(object_size);
if (gem_set_cacheing(fd, src, 0) == 0 &&
gem_set_cacheing(fd, dst, 0) == 0) {
if (gem_set_caching(fd, src, 0) == 0 &&
gem_set_caching(fd, dst, 0) == 0) {
if (drmtest_run_subtest("uncached-copy-correctness"))
test_copy(fd, src, dst, tmp, object_size);
if (drmtest_run_subtest("uncached-copy-performance")) {
@@ -435,8 +435,8 @@ int main(int argc, char **argv)
}
}
if (gem_set_cacheing(fd, src, 1) == 0 &&
gem_set_cacheing(fd, dst, 1) == 0) {
if (gem_set_caching(fd, src, 1) == 0 &&
gem_set_caching(fd, dst, 1) == 0) {
if (drmtest_run_subtest("snooped-copy-correctness"))
test_copy(fd, src, dst, tmp, object_size);
if (drmtest_run_subtest("snooped-copy-performance")) {
@@ -472,8 +472,8 @@ int main(int argc, char **argv)
}
}
if (gem_set_cacheing(fd, src, 2) == 0 &&
gem_set_cacheing(fd, dst, 2) == 0) {
if (gem_set_caching(fd, src, 2) == 0 &&
gem_set_caching(fd, dst, 2) == 0) {
if (drmtest_run_subtest("display-copy-correctness"))
test_copy(fd, src, dst, tmp, object_size);
if (drmtest_run_subtest("display-copy-performance")) {