igt/gem_userptr_blits: Fix forked access test

[platform/upstream/intel-gpu-tools.git] / tests / gem_caching.c

diff --git a/tests/gem_caching.c b/tests/gem_caching.c
index 6fa9a15..e3692b8 100644 (file)
--- a/tests/gem_caching.c
+++ b/tests/gem_caching.c
@@ -34,12 +34,16 @@
 #include <errno.h>
 #include <sys/stat.h>
 #include <sys/time.h>
-#include "drm.h"
-#include "i915_drm.h"
+
+#include <drm.h>
+
+#include "ioctl_wrappers.h"
 #include "drmtest.h"
 #include "intel_bufmgr.h"
 #include "intel_batchbuffer.h"
-#include "intel_gpu_tools.h"
+#include "intel_io.h"
+#include "intel_chipset.h"
+#include "igt_aux.h"
 
 /*
  * Testcase: snoop consistency when touching partial cachelines
@@ -59,19 +63,18 @@ int fd;
 static void
 copy_bo(drm_intel_bo *src, drm_intel_bo *dst)
 {
-       BEGIN_BATCH(8);
-       OUT_BATCH(XY_SRC_COPY_BLT_CMD |
-                 XY_SRC_COPY_BLT_WRITE_ALPHA |
-                 XY_SRC_COPY_BLT_WRITE_RGB);
+       BLIT_COPY_BATCH_START(devid, 0);
        OUT_BATCH((3 << 24) | /* 32 bits */
                  (0xcc << 16) | /* copy ROP */
                  4096);
        OUT_BATCH(0 << 16 | 0);
        OUT_BATCH((BO_SIZE/4096) << 16 | 1024);
        OUT_RELOC_FENCED(dst, I915_GEM_DOMAIN_RENDER, I915_GEM_DOMAIN_RENDER, 0);
+       BLIT_RELOC_UDW(devid);
        OUT_BATCH(0 << 16 | 0);
        OUT_BATCH(4096);
        OUT_RELOC_FENCED(src, I915_GEM_DOMAIN_RENDER, 0, 0);
+       BLIT_RELOC_UDW(devid);
        ADVANCE_BATCH();
 
        intel_batchbuffer_flush(batch);
@@ -103,14 +106,13 @@ blt_bo_fill(drm_intel_bo *tmp_bo, drm_intel_bo *bo, uint8_t val)
 #define TEST_READ 0x1
 #define TEST_WRITE 0x2
 #define TEST_BOTH (TEST_READ | TEST_WRITE)
-int main(int argc, char **argv)
+igt_main
 {
        unsigned flags = TEST_BOTH;
        int i, j;
        uint8_t *cpu_ptr;
        uint8_t *gtt_ptr;
 
-       igt_subtest_init(argc, argv);
        igt_skip_on_simulation();
 
        igt_fixture {
@@ -125,7 +127,7 @@ int main(int argc, char **argv)
                        flags &= ~TEST_READ;
                if (IS_BROADWATER(devid) || IS_CRESTLINE(devid)) {
                        /* chipset is completely fubar */
-                       printf("coherency broken on i965g/gm\n");
+                       igt_info("coherency broken on i965g/gm\n");
                        flags = 0;
                }
 
@@ -143,10 +145,9 @@ int main(int argc, char **argv)
        }
 
        igt_subtest("reads") {
-               if (!(flags & TEST_READ))
-                       igt_skip();
+               igt_require(flags & TEST_READ);
 
-               printf("checking partial reads\n");
+               igt_info("checking partial reads\n");
 
                for (i = 0; i < ROUNDS; i++) {
                        uint8_t val0 = i;
@@ -160,11 +161,9 @@ int main(int argc, char **argv)
                        drm_intel_bo_map(scratch_bo, false);
                        cpu_ptr = scratch_bo->virtual;
                        for (j = 0; j < len; j++) {
-                               if (cpu_ptr[j] != val0) {
-                                       printf("mismatch at %i, got: %i, expected: %i\n",
-                                              j, cpu_ptr[j], val0);
-                                       igt_fail(1);
-                               }
+                               igt_assert_f(cpu_ptr[j] == val0,
+                                            "mismatch at %i, got: %i, expected: %i\n",
+                                            j, cpu_ptr[j], val0);
                        }
                        drm_intel_bo_unmap(scratch_bo);
 
@@ -173,10 +172,9 @@ int main(int argc, char **argv)
        }
 
        igt_subtest("writes") {
-               if (!(flags & TEST_WRITE))
-                       igt_skip();
+               igt_require(flags & TEST_WRITE);
 
-               printf("checking partial writes\n");
+               igt_info("checking partial writes\n");
 
                for (i = 0; i < ROUNDS; i++) {
                        uint8_t val0 = i, val1;
@@ -198,25 +196,19 @@ int main(int argc, char **argv)
                        gtt_ptr = staging_bo->virtual;
 
                        for (j = 0; j < start; j++) {
-                               if (gtt_ptr[j] != val0) {
-                                       printf("mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
-                                              j, start, len, gtt_ptr[j], val0);
-                                       igt_fail(1);
-                               }
+                               igt_assert_f(gtt_ptr[j] == val0,
+                                            "mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
+                                            j, start, len, gtt_ptr[j], val0);
                        }
                        for (; j < start + len; j++) {
-                               if (gtt_ptr[j] != val1) {
-                                       printf("mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
-                                              j, start, len, gtt_ptr[j], val1);
-                                       igt_fail(1);
-                               }
+                               igt_assert_f(gtt_ptr[j] == val1,
+                                            "mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
+                                            j, start, len, gtt_ptr[j], val1);
                        }
                        for (; j < BO_SIZE; j++) {
-                               if (gtt_ptr[j] != val0) {
-                                       printf("mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
-                                              j, start, len, gtt_ptr[j], val0);
-                                       igt_fail(1);
-                               }
+                               igt_assert_f(gtt_ptr[j] == val0,
+                                            "mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
+                                            j, start, len, gtt_ptr[j], val0);
                        }
                        drm_intel_gem_bo_unmap_gtt(staging_bo);
 
@@ -225,10 +217,9 @@ int main(int argc, char **argv)
        }
 
        igt_subtest("read-writes") {
-               if (!((flags & TEST_BOTH) == TEST_BOTH))
-                       igt_skip();
+               igt_require((flags & TEST_BOTH) == TEST_BOTH);
 
-               printf("checking partial writes after partial reads\n");
+               igt_info("checking partial writes after partial reads\n");
 
                for (i = 0; i < ROUNDS; i++) {
                        uint8_t val0 = i, val1, val2;
@@ -243,11 +234,9 @@ int main(int argc, char **argv)
                        do_or_die(drm_intel_bo_map(scratch_bo, false));
                        cpu_ptr = scratch_bo->virtual;
                        for (j = 0; j < len; j++) {
-                               if (cpu_ptr[j] != val0) {
-                                       printf("mismatch in read at %i, got: %i, expected: %i\n",
-                                              j, cpu_ptr[j], val0);
-                                       igt_fail(1);
-                               }
+                               igt_assert_f(cpu_ptr[j] == val0,
+                                            "mismatch in read at %i, got: %i, expected: %i\n",
+                                            j, cpu_ptr[j], val0);
                        }
                        drm_intel_bo_unmap(scratch_bo);
 
@@ -270,25 +259,19 @@ int main(int argc, char **argv)
                        gtt_ptr = staging_bo->virtual;
 
                        for (j = 0; j < start; j++) {
-                               if (gtt_ptr[j] != val1) {
-                                       printf("mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
-                                              j, start, len, gtt_ptr[j], val1);
-                                       igt_fail(1);
-                               }
+                               igt_assert_f(gtt_ptr[j] == val1,
+                                            "mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
+                                            j, start, len, gtt_ptr[j], val1);
                        }
                        for (; j < start + len; j++) {
-                               if (gtt_ptr[j] != val2) {
-                                       printf("mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
-                                              j, start, len, gtt_ptr[j], val2);
-                                       igt_fail(1);
-                               }
+                               igt_assert_f(gtt_ptr[j] == val2,
+                                            "mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
+                                            j, start, len, gtt_ptr[j], val2);
                        }
                        for (; j < BO_SIZE; j++) {
-                               if (gtt_ptr[j] != val1) {
-                                       printf("mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
-                                              j, start, len, gtt_ptr[j], val1);
-                                       igt_fail(1);
-                               }
+                               igt_assert_f(gtt_ptr[j] == val1,
+                                            "mismatch at %i, partial=[%d+%d] got: %i, expected: %i\n",
+                                            j, start, len, gtt_ptr[j], val1);
                        }
                        drm_intel_gem_bo_unmap_gtt(staging_bo);
                        drm_intel_bo_unmap(scratch_bo);
@@ -303,6 +286,4 @@ int main(int argc, char **argv)
 
                close(fd);
        }
-
-       igt_exit();
 }