diff options
| author | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-09 18:19:34 +0300 |
|---|---|---|
| committer | Ville Syrjälä <ville.syrjala@linux.intel.com> | 2015-10-09 18:33:30 +0300 |
| commit | 7eaae3c2013b6d4bdf11570d3fb9d95eb4978976 (patch) | |
| tree | d20ecd068c4645c7855af74452fbe2b58775a89d /benchmarks | |
| parent | 91d295cf06aeee733b57ec87933dba47ed2c8440 (diff) | |
Sprinkle igt_assert(ptr) after gem_mmap__{cpu,gtt,wc}
Do the following
ptr = gem_mmap__{cpu,gtt,wc}()
+igt_assert(ptr);
whenever the code doesn't handle the NULL ptr in any kind of
specific way.
Makes it easier to move the assert into gem_mmap__{cpu,gtt,wc}() itself.
Mostly done with coccinelle, with some manual cleanups:
@@
identifier I;
@@
<... when != igt_assert(I)
when != igt_require(I)
when != igt_require_f(I, ...)
when != I != NULL
when != I == NULL
(
I = gem_mmap__gtt(...);
+ igt_assert(I);
|
I = gem_mmap__cpu(...);
+ igt_assert(I);
|
I = gem_mmap__wc(...);
+ igt_assert(I);
)
...>
Signed-off-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
Stochastically-reviwewed-by: Chris Wilson <chris@chris-wilson.co.uk>
Diffstat (limited to 'benchmarks')
| -rw-r--r-- | benchmarks/gem_blt.c | 1 | ||||
| -rw-r--r-- | benchmarks/gem_mmap.c | 3 |
2 files changed, 4 insertions, 0 deletions
diff --git a/benchmarks/gem_blt.c b/benchmarks/gem_blt.c index 181a5f12..3ed23003 100644 --- a/benchmarks/gem_blt.c +++ b/benchmarks/gem_blt.c @@ -178,6 +178,7 @@ static int run(int object, int batch, int count, int reps) fd = drm_open_driver(DRIVER_INTEL); handle = gem_create(fd, size); buf = gem_mmap__cpu(fd, handle, 0, size, PROT_WRITE); + igt_assert(buf); gen = intel_gen(intel_get_drm_devid(fd)); has_64bit_reloc = gen >= 8; diff --git a/benchmarks/gem_mmap.c b/benchmarks/gem_mmap.c index bc26d310..6bf7fd3a 100644 --- a/benchmarks/gem_mmap.c +++ b/benchmarks/gem_mmap.c @@ -116,14 +116,17 @@ int main(int argc, char **argv) switch (map) { case CPU: ptr = gem_mmap__cpu(fd, handle, 0, OBJECT_SIZE, PROT_WRITE); + igt_assert(ptr); gem_set_domain(fd, handle, I915_GEM_DOMAIN_CPU, I915_GEM_DOMAIN_CPU); break; case GTT: ptr = gem_mmap__gtt(fd, handle, OBJECT_SIZE, PROT_WRITE); + igt_assert(ptr); gem_set_domain(fd, handle, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); break; case WC: ptr = gem_mmap__wc(fd, handle, 0, OBJECT_SIZE, PROT_WRITE); + igt_assert(ptr); gem_set_domain(fd, handle, I915_GEM_DOMAIN_GTT, I915_GEM_DOMAIN_GTT); break; default: |