Skip to contentSkip to conversation

tests/gem_lmem_swapping: limit lmem to 4G

PATCH Superseded Matthew Auld 2 participants 2 messages Mar 28, 2022

v2 of 3 Superseded Latest is v3 →

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 tests/gem_lmem_swapping: limit lmem to 4G

From: CQ Tang <[email protected]>

On some systems lmem can be as large as 16G, which seems to trigger various CI timeouts, and in the best case just takes a long time. For the purposes of the test we should be able to limit to 4G, without any big loss in coverage.

v2:
- No need to try again without the modparam; if it's not supported it will still load the driver just fine.

---
 tests/i915/gem_lmem_swapping.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
tests/i915/gem_lmem_swapping.c +5 -1
index 31644bcd..69f7bae9 100644
@@ -527,7 +527,10 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
 	igt_fixture {
 		struct intel_execution_engine2 *e;
 
-		i915 = drm_open_driver(DRIVER_INTEL);
+		igt_i915_driver_unload();
+		igt_assert_eq(igt_i915_driver_load("lmem_size=4096"), 0);
+
+		i915 = __drm_open_driver(DRIVER_INTEL);
 		igt_require_gem(i915);
 		igt_require(gem_has_lmem(i915));
 
@@ -556,6 +559,7 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
 		intel_ctx_destroy(i915, ctx);
 		free(regions);
 		close(i915);
+		igt_i915_driver_unload();
 	}
 
 	igt_exit();
Signature · 1 line
2.34.1
#1 lore raw
Quoted 26 lines · Matthew Auld

From: CQ Tang <[email protected]>

On some systems lmem can be as large as 16G, which seems to trigger various CI timeouts, and in the best case just takes a long time. For the purposes of the test we should be able to limit to 4G, without any big loss in coverage.

v2:
- No need to try again without the modparam; if it's not supported it will still load the driver just fine.

---
 tests/i915/gem_lmem_swapping.c | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)
tests/i915/gem_lmem_swapping.c +0 -0
index 31644bcd..69f7bae9 100644

tests/i915/gem_lmem_swapping.c igt_main_args("", long_options, help_str, opt_handler, NULL) · line 533

Quoted 8 lines
tests/i915/gem_lmem_swapping.c +4 -1
@@ -527,7 +527,10 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
 	igt_fixture {
 		struct intel_execution_engine2 *e;
 
-		i915 = drm_open_driver(DRIVER_INTEL);
+		igt_i915_driver_unload();
+		igt_assert_eq(igt_i915_driver_load("lmem_size=4096"), 0);
+
+		i915 = __drm_open_driver(DRIVER_INTEL);

A debug print would still be lovely if the param is missing. __igt_params_get() handily tells you if lmem_size exists.

igt_debug might not be good for that kind of a print, log buffer isn't dumped on igt_runner timeouts. igt_info maybe, igt_warn might be overkill.

Signature · 1 line
Petri Latvala
Quoted 14 lines
tests/i915/gem_lmem_swapping.c +1 -0
 		igt_require_gem(i915);
 		igt_require(gem_has_lmem(i915));
 
@@ -556,6 +559,7 @@ igt_main_args("", long_options, help_str, opt_handler, NULL)
 		intel_ctx_destroy(i915, ctx);
 		free(regions);
 		close(i915);
+		igt_i915_driver_unload();
 	}
 
 	igt_exit();
Signature · 1 line
2.34.1