mirror of
https://github.com/tiagovignatti/intel-gpu-tools.git
synced 2026-08-23 14:23:03 +00:00
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>
This commit is contained in:
@@ -93,6 +93,8 @@ int main(int argc, char **argv)
|
||||
volatile uint32_t *ptr = base;
|
||||
int x = 0;
|
||||
|
||||
igt_assert(base);
|
||||
|
||||
for (i = 0; i < size/sizeof(*ptr); i++)
|
||||
x += ptr[i];
|
||||
|
||||
@@ -108,6 +110,8 @@ int main(int argc, char **argv)
|
||||
ptr = base;
|
||||
x = 0;
|
||||
|
||||
igt_assert(base);
|
||||
|
||||
for (i = 0; i < size/sizeof(*ptr); i++)
|
||||
x += ptr[i];
|
||||
|
||||
@@ -126,6 +130,8 @@ int main(int argc, char **argv)
|
||||
base = gem_mmap__cpu(fd, handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
ptr = base;
|
||||
|
||||
igt_assert(base);
|
||||
|
||||
for (i = 0; i < size/sizeof(*ptr); i++)
|
||||
ptr[i] = i;
|
||||
|
||||
@@ -138,6 +144,7 @@ int main(int argc, char **argv)
|
||||
gettimeofday(&start, NULL);
|
||||
for (loop = 0; loop < 1000; loop++) {
|
||||
base = gem_mmap__cpu(fd, handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
igt_assert(base);
|
||||
memset(base, 0, size);
|
||||
munmap(base, size);
|
||||
}
|
||||
@@ -147,6 +154,7 @@ int main(int argc, char **argv)
|
||||
|
||||
gettimeofday(&start, NULL);
|
||||
base = gem_mmap__cpu(fd, handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
igt_assert(base);
|
||||
for (loop = 0; loop < 1000; loop++)
|
||||
memset(base, 0, size);
|
||||
munmap(base, size);
|
||||
@@ -178,6 +186,8 @@ int main(int argc, char **argv)
|
||||
volatile uint32_t *ptr = base;
|
||||
int x = 0;
|
||||
|
||||
igt_assert(base);
|
||||
|
||||
for (i = 0; i < size/sizeof(*ptr); i++)
|
||||
x += ptr[i];
|
||||
|
||||
@@ -193,6 +203,8 @@ int main(int argc, char **argv)
|
||||
volatile uint32_t *ptr = base;
|
||||
int x = 0;
|
||||
|
||||
igt_assert(base);
|
||||
|
||||
for (i = 0; i < size/sizeof(*ptr); i++)
|
||||
x += ptr[i];
|
||||
|
||||
@@ -212,6 +224,8 @@ int main(int argc, char **argv)
|
||||
volatile uint32_t *ptr = base;
|
||||
int x = 0;
|
||||
|
||||
igt_assert(base);
|
||||
|
||||
for (i = 0; i < size/sizeof(*ptr); i++)
|
||||
x += ptr[i];
|
||||
|
||||
@@ -232,6 +246,8 @@ int main(int argc, char **argv)
|
||||
uint32_t *base = gem_mmap__gtt(fd, handle, size, PROT_READ | PROT_WRITE);
|
||||
volatile uint32_t *ptr = base;
|
||||
|
||||
igt_assert(base);
|
||||
|
||||
for (i = 0; i < size/sizeof(*ptr); i++)
|
||||
ptr[i] = i;
|
||||
|
||||
@@ -248,6 +264,8 @@ int main(int argc, char **argv)
|
||||
uint32_t *base = gem_mmap__wc(fd, handle, 0, size, PROT_READ | PROT_WRITE);
|
||||
volatile uint32_t *ptr = base;
|
||||
|
||||
igt_assert(base);
|
||||
|
||||
for (i = 0; i < size/sizeof(*ptr); i++)
|
||||
ptr[i] = i;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user