From 40ea6f4ea89dbf5a326677ea9482cc48743d2543 Mon Sep 17 00:00:00 2001 From: Daniel Vetter Date: Mon, 12 Aug 2013 08:41:05 +0200 Subject: [PATCH] tests: s/cacheing/caching Signed-off-by: Daniel Vetter --- lib/drmtest.c | 28 ++++++++++++++-------------- lib/drmtest.h | 6 +++--- tests/.gitignore | 2 +- tests/Makefile.am | 2 +- tests/{gem_cacheing.c => gem_caching.c} | 4 ++-- tests/gem_partial_pwrite_pread.c | 2 +- tests/gem_pread.c | 2 +- tests/gem_pread_after_blit.c | 4 ++-- tests/gem_pwrite.c | 2 +- tests/gem_pwrite_pread.c | 12 ++++++------ 10 files changed, 32 insertions(+), 32 deletions(-) rename tests/{gem_cacheing.c => gem_caching.c} (99%) diff --git a/lib/drmtest.c b/lib/drmtest.c index f546784..cae07a2 100644 --- a/lib/drmtest.c +++ b/lib/drmtest.c @@ -380,56 +380,56 @@ skip: return num_rings; } -struct local_drm_i915_gem_cacheing { +struct local_drm_i915_gem_caching { uint32_t handle; - uint32_t cacheing; + uint32_t caching; }; #define LOCAL_DRM_I915_GEM_SET_CACHEING 0x2f #define LOCAL_DRM_I915_GEM_GET_CACHEING 0x30 #define LOCAL_DRM_IOCTL_I915_GEM_SET_CACHEING \ - DRM_IOW(DRM_COMMAND_BASE + LOCAL_DRM_I915_GEM_SET_CACHEING, struct local_drm_i915_gem_cacheing) + DRM_IOW(DRM_COMMAND_BASE + LOCAL_DRM_I915_GEM_SET_CACHEING, struct local_drm_i915_gem_caching) #define LOCAL_DRM_IOCTL_I915_GEM_GET_CACHEING \ - DRM_IOWR(DRM_COMMAND_BASE + LOCAL_DRM_I915_GEM_GET_CACHEING, struct local_drm_i915_gem_cacheing) + DRM_IOWR(DRM_COMMAND_BASE + LOCAL_DRM_I915_GEM_GET_CACHEING, struct local_drm_i915_gem_caching) -int gem_has_cacheing(int fd) +int gem_has_caching(int fd) { - struct local_drm_i915_gem_cacheing arg; + struct local_drm_i915_gem_caching arg; int ret; arg.handle = gem_create(fd, 4096); if (arg.handle == 0) return 0; - arg.cacheing = 0; + arg.caching = 0; ret = ioctl(fd, LOCAL_DRM_IOCTL_I915_GEM_SET_CACHEING, &arg); gem_close(fd, arg.handle); return ret == 0; } -int gem_set_cacheing(int fd, uint32_t handle, int cacheing) +int gem_set_caching(int fd, uint32_t handle, int caching) { - struct local_drm_i915_gem_cacheing arg; + struct local_drm_i915_gem_caching arg; int ret; arg.handle = handle; - arg.cacheing = cacheing; + arg.caching = caching; ret = ioctl(fd, LOCAL_DRM_IOCTL_I915_GEM_SET_CACHEING, &arg); return ret == 0 ? 0 : -errno; } -int gem_get_cacheing(int fd, uint32_t handle) +uint32_t gem_get_caching(int fd, uint32_t handle) { - struct local_drm_i915_gem_cacheing arg; + struct local_drm_i915_gem_caching arg; int ret; arg.handle = handle; - arg.cacheing = 0; + arg.caching = 0; ret = ioctl(fd, LOCAL_DRM_IOCTL_I915_GEM_GET_CACHEING, &arg); assert(ret == 0); - return arg.cacheing; + return arg.caching; } uint32_t gem_open(int fd, uint32_t name) diff --git a/lib/drmtest.h b/lib/drmtest.h index 8320dbe..773beaa 100644 --- a/lib/drmtest.h +++ b/lib/drmtest.h @@ -53,9 +53,9 @@ bool gem_has_bsd(int fd); bool gem_has_blt(int fd); bool gem_has_vebox(int fd); int gem_get_num_rings(int fd); -int gem_has_cacheing(int fd); -int gem_set_cacheing(int fd, uint32_t handle, int cacheing); -int gem_get_cacheing(int fd, uint32_t handle); +int gem_has_caching(int fd); +int gem_set_caching(int fd, uint32_t handle, int caching); +uint32_t gem_get_caching(int fd, uint32_t handle); uint32_t gem_flink(int fd, uint32_t handle); uint32_t gem_open(int fd, uint32_t name); void gem_close(int fd, uint32_t handle); diff --git a/tests/.gitignore b/tests/.gitignore index 8d0b6e5..6395c73 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -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 diff --git a/tests/Makefile.am b/tests/Makefile.am index 5d0ed3e..8fff22c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -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 \ diff --git a/tests/gem_cacheing.c b/tests/gem_caching.c similarity index 99% rename from tests/gem_cacheing.c rename to tests/gem_caching.c index 8a169f1..d67bbf6 100644 --- a/tests/gem_cacheing.c +++ b/tests/gem_caching.c @@ -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); diff --git a/tests/gem_partial_pwrite_pread.c b/tests/gem_partial_pwrite_pread.c index ee176b1..0330216 100644 --- a/tests/gem_partial_pwrite_pread.c +++ b/tests/gem_partial_pwrite_pread.c @@ -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: diff --git a/tests/gem_pread.c b/tests/gem_pread.c index 7037221..7c2f18f 100644 --- a/tests/gem_pread.c +++ b/tests/gem_pread.c @@ -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) { diff --git a/tests/gem_pread_after_blit.c b/tests/gem_pread_after_blit.c index dce8241..55caa98 100644 --- a/tests/gem_pread_after_blit.c +++ b/tests/gem_pread_after_blit.c @@ -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; } diff --git a/tests/gem_pwrite.c b/tests/gem_pwrite.c index abdf119..87acbf5 100644 --- a/tests/gem_pwrite.c +++ b/tests/gem_pwrite.c @@ -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) { diff --git a/tests/gem_pwrite_pread.c b/tests/gem_pwrite_pread.c index 1f9187f..65427c3 100644 --- a/tests/gem_pwrite_pread.c +++ b/tests/gem_pwrite_pread.c @@ -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")) { -- 2.7.4