[PATCH i-g-t 3/4] DO_NOT_MERGE: gem_concurrent_all: limit scope of test

[Kamil Konieczny]

DO NOT MERGE: limit the scope of test to minimal one and
make it behave like gem_concurrent_blit. Make it with ifdefs
because even for named tests there are executed some parts
like pinning, which in turn take a few minutes to complete
despite the fact they are doing nothnig due to name mismatch
in following HAX patch. Second reason is I want to test
gem_concurrent_blit, but that one is really gem_concurrent_all
with one check for its executable name, so the easiest way
is to disable this check.
With this ./gem_concurrent_all --run '4KiB-tiny-gpu-*' takes
about 40s instead of over 4 minutes.

Signed-off-by: Kamil Konieczny <kamil.konieczny at linux.intel.com>
Cc: Zbigniew Kempczyński <zbigniew.kempczynski at intel.com>
---
 tests/i915/gem_concurrent_all.c | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/tests/i915/gem_concurrent_all.c b/tests/i915/gem_concurrent_all.c
index 24009da4..3e42baff 100644
--- a/tests/i915/gem_concurrent_all.c
+++ b/tests/i915/gem_concurrent_all.c
@@ -1769,6 +1769,13 @@ num_buffers(uint64_t max,
 	return n;
 }
 
+/* This is for CI only, to lower time taken to run one test and to print
+ * what mode it was run (reloc or noreloc)
+ */
+#define DISABLE_ALL_BUT_TINY_TESTS
+#define ONLY_BLIT_TESTS
+#define PRINT_RELOC_MODE
+
 igt_main
 {
 	const struct access_mode modes[] = {
@@ -1883,15 +1890,17 @@ igt_main
 		{ "16MiB", 2048, 2048 },
 		{ NULL}
 	};
-
+#ifndef DISABLE_ALL_BUT_TINY_TESTS
 	uint64_t pin_sz = 0;
 	void *pinned = NULL;
+#endif
 	char name[80];
 	int count = 0;
 
+#ifndef ONLY_BLIT_TESTS
 	if (strstr(igt_test_name(), "all"))
 		all = true;
-
+#endif
 	igt_fixture {
 		igt_allow_unlimited_files();
 
@@ -1909,6 +1918,9 @@ igt_main
 		put_ahnd(ahnd);
 		if (ahnd)
 			intel_bb_track(true);
+#ifdef PRINT_RELOC_MODE
+		igt_info("%s running in %s mode\n", igt_test_name(), ahnd ? "noreloc" : "reloc");
+#endif
 	}
 
 	for (const struct create *c = create; c->name; c++) {
@@ -1923,6 +1935,7 @@ igt_main
 				run_modes(name, c, modes, s, count);
 			}
 
+#ifndef DISABLE_ALL_BUT_TINY_TESTS
 			/* "Average" test set */
 			snprintf(name, sizeof(name), "%s%s-%s",
 				 c->name, s->name, "small");
@@ -2014,6 +2027,7 @@ igt_main
 					}
 				}
 			}
+#endif
 		}
 	}
 }
-- 
2.32.0