* [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes
@ 2019-06-04 12:59 Arkadiusz Hiler
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 2/4] Makefile: Do not nest new gem tests in i915 directory Arkadiusz Hiler
` (6 more replies)
0 siblings, 7 replies; 14+ messages in thread
From: Arkadiusz Hiler @ 2019-06-04 12:59 UTC (permalink / raw)
To: igt-dev
VLA in structs (struct { int array[count] }) is a GCC extension, so
let's avoid using it.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Simon Ser <simon.ser@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
tests/i915/gem_exec_balancer.c | 230 ++++++++++++++++++---------------
1 file changed, 128 insertions(+), 102 deletions(-)
diff --git a/tests/i915/gem_exec_balancer.c b/tests/i915/gem_exec_balancer.c
index 33b17fc5..c1c0a2f7 100644
--- a/tests/i915/gem_exec_balancer.c
+++ b/tests/i915/gem_exec_balancer.c
@@ -32,6 +32,26 @@ IGT_TEST_DESCRIPTION("Exercise in-kernel load-balancing");
#define INSTANCE_COUNT (1 << I915_PMU_SAMPLE_INSTANCE_BITS)
+static size_t sizeof_load_balance(int count)
+{
+ return offsetof(struct i915_context_engines_load_balance,
+ engines[count]);
+}
+
+static size_t sizeof_param_engines(int count)
+{
+ return offsetof(struct i915_context_param_engines,
+ engines[count]);
+}
+
+static size_t sizeof_engines_bond(int count)
+{
+ return offsetof(struct i915_context_engines_bond,
+ engines[count]);
+}
+
+#define alloca0(sz) ({ size_t sz__ = (sz); memset(alloca(sz__), 0, sz__); })
+
static bool has_class_instance(int i915, uint16_t class, uint16_t instance)
{
int fd;
@@ -93,16 +113,17 @@ static int __set_engines(int i915, uint32_t ctx,
const struct i915_engine_class_instance *ci,
unsigned int count)
{
- I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, count);
+ struct i915_context_param_engines *engines =
+ alloca0(sizeof_param_engines(count));
struct drm_i915_gem_context_param p = {
.ctx_id = ctx,
.param = I915_CONTEXT_PARAM_ENGINES,
- .size = sizeof(engines),
- .value = to_user_pointer(&engines)
+ .size = sizeof_param_engines(count),
+ .value = to_user_pointer(engines)
};
- engines.extensions = 0;
- memcpy(engines.engines, ci, sizeof(engines.engines));
+ engines->extensions = 0;
+ memcpy(engines->engines, ci, sizeof(engines->engines));
return __gem_context_set_param(i915, &p);
}
@@ -119,30 +140,30 @@ static int __set_load_balancer(int i915, uint32_t ctx,
unsigned int count,
void *ext)
{
- I915_DEFINE_CONTEXT_ENGINES_LOAD_BALANCE(balancer, count);
- I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, 1 + count);
+ struct i915_context_engines_load_balance *balancer =
+ alloca0(sizeof_load_balance(count));
+ struct i915_context_param_engines *engines =
+ alloca0(sizeof_param_engines(count + 1));
struct drm_i915_gem_context_param p = {
.ctx_id = ctx,
.param = I915_CONTEXT_PARAM_ENGINES,
- .size = sizeof(engines),
- .value = to_user_pointer(&engines)
+ .size = sizeof_param_engines(count + 1),
+ .value = to_user_pointer(engines)
};
- memset(&balancer, 0, sizeof(balancer));
- balancer.base.name = I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE;
- balancer.base.next_extension = to_user_pointer(ext);
+ balancer->base.name = I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE;
+ balancer->base.next_extension = to_user_pointer(ext);
igt_assert(count);
- balancer.num_siblings = count;
- memcpy(balancer.engines, ci, count * sizeof(*ci));
+ balancer->num_siblings = count;
+ memcpy(balancer->engines, ci, count * sizeof(*ci));
- memset(&engines, 0, sizeof(engines));
- engines.extensions = to_user_pointer(&balancer);
- engines.engines[0].engine_class =
+ engines->extensions = to_user_pointer(balancer);
+ engines->engines[0].engine_class =
I915_ENGINE_CLASS_INVALID;
- engines.engines[0].engine_instance =
+ engines->engines[0].engine_instance =
I915_ENGINE_CLASS_INVALID_NONE;
- memcpy(engines.engines + 1, ci, count * sizeof(*ci));
+ memcpy(engines->engines + 1, ci, count * sizeof(*ci));
return __gem_context_set_param(i915, &p);
}
@@ -185,11 +206,13 @@ static uint32_t batch_create(int i915)
static void invalid_balancer(int i915)
{
- I915_DEFINE_CONTEXT_ENGINES_LOAD_BALANCE(balancer, 64);
- I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, 64);
+ struct i915_context_engines_load_balance *balancer =
+ alloca0(sizeof_load_balance(64));
+ struct i915_context_param_engines *engines =
+ alloca0(sizeof_param_engines(64));
struct drm_i915_gem_context_param p = {
.param = I915_CONTEXT_PARAM_ENGINES,
- .value = to_user_pointer(&engines)
+ .value = to_user_pointer(engines)
};
uint32_t handle;
void *ptr;
@@ -212,91 +235,89 @@ static void invalid_balancer(int i915)
p.ctx_id = gem_context_create(i915);
p.size = (sizeof(struct i915_context_param_engines) +
- (count + 1) * sizeof(*engines.engines));
+ (count + 1) * sizeof(*engines->engines));
- memset(&engines, 0, sizeof(engines));
- engines.engines[0].engine_class = I915_ENGINE_CLASS_INVALID;
- engines.engines[0].engine_instance = I915_ENGINE_CLASS_INVALID_NONE;
- memcpy(engines.engines + 1, ci, count * sizeof(*ci));
+ engines->engines[0].engine_class = I915_ENGINE_CLASS_INVALID;
+ engines->engines[0].engine_instance = I915_ENGINE_CLASS_INVALID_NONE;
+ memcpy(engines->engines + 1, ci, count * sizeof(*ci));
gem_context_set_param(i915, &p);
- engines.extensions = -1ull;
+ engines->extensions = -1ull;
igt_assert_eq(__gem_context_set_param(i915, &p), -EFAULT);
- engines.extensions = 1ull;
+ engines->extensions = 1ull;
igt_assert_eq(__gem_context_set_param(i915, &p), -EFAULT);
- memset(&balancer, 0, sizeof(balancer));
- balancer.base.name = I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE;
- balancer.num_siblings = count;
- memcpy(balancer.engines, ci, count * sizeof(*ci));
+ balancer->base.name = I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE;
+ balancer->num_siblings = count;
+ memcpy(balancer->engines, ci, count * sizeof(*ci));
- engines.extensions = to_user_pointer(&balancer);
+ engines->extensions = to_user_pointer(balancer);
gem_context_set_param(i915, &p);
- balancer.engine_index = 1;
+ balancer->engine_index = 1;
igt_assert_eq(__gem_context_set_param(i915, &p), -EEXIST);
- balancer.engine_index = count;
+ balancer->engine_index = count;
igt_assert_eq(__gem_context_set_param(i915, &p), -EEXIST);
- balancer.engine_index = count + 1;
+ balancer->engine_index = count + 1;
igt_assert_eq(__gem_context_set_param(i915, &p), -EINVAL);
- balancer.engine_index = 0;
+ balancer->engine_index = 0;
gem_context_set_param(i915, &p);
- balancer.base.next_extension = to_user_pointer(&balancer);
+ balancer->base.next_extension = to_user_pointer(balancer);
igt_assert_eq(__gem_context_set_param(i915, &p), -EEXIST);
- balancer.base.next_extension = -1ull;
+ balancer->base.next_extension = -1ull;
igt_assert_eq(__gem_context_set_param(i915, &p), -EFAULT);
handle = gem_create(i915, 4096 * 3);
ptr = gem_mmap__gtt(i915, handle, 4096 * 3, PROT_WRITE);
gem_close(i915, handle);
- memset(&engines, 0, sizeof(engines));
- engines.engines[0].engine_class = I915_ENGINE_CLASS_INVALID;
- engines.engines[0].engine_instance = I915_ENGINE_CLASS_INVALID_NONE;
- engines.engines[1].engine_class = I915_ENGINE_CLASS_INVALID;
- engines.engines[1].engine_instance = I915_ENGINE_CLASS_INVALID_NONE;
- memcpy(engines.engines + 2, ci, count * sizeof(ci));
+ memset(engines, 0, sizeof_param_engines(64));
+ engines->engines[0].engine_class = I915_ENGINE_CLASS_INVALID;
+ engines->engines[0].engine_instance = I915_ENGINE_CLASS_INVALID_NONE;
+ engines->engines[1].engine_class = I915_ENGINE_CLASS_INVALID;
+ engines->engines[1].engine_instance = I915_ENGINE_CLASS_INVALID_NONE;
+ memcpy(engines->engines + 2, ci, count * sizeof(ci));
p.size = (sizeof(struct i915_context_param_engines) +
- (count + 2) * sizeof(*engines.engines));
+ (count + 2) * sizeof(*engines->engines));
gem_context_set_param(i915, &p);
- balancer.base.next_extension = 0;
- balancer.engine_index = 1;
- engines.extensions = to_user_pointer(&balancer);
+ balancer->base.next_extension = 0;
+ balancer->engine_index = 1;
+ engines->extensions = to_user_pointer(balancer);
gem_context_set_param(i915, &p);
- memcpy(ptr + 4096 - 8, &balancer, sizeof(balancer));
- memcpy(ptr + 8192 - 8, &balancer, sizeof(balancer));
- balancer.engine_index = 0;
+ memcpy(ptr + 4096 - 8, balancer, sizeof_load_balance(64));
+ memcpy(ptr + 8192 - 8, balancer, sizeof_load_balance(64));
+ balancer->engine_index = 0;
- engines.extensions = to_user_pointer(ptr) + 4096 - 8;
+ engines->extensions = to_user_pointer(ptr) + 4096 - 8;
gem_context_set_param(i915, &p);
- balancer.base.next_extension = engines.extensions;
- engines.extensions = to_user_pointer(&balancer);
+ balancer->base.next_extension = engines->extensions;
+ engines->extensions = to_user_pointer(balancer);
gem_context_set_param(i915, &p);
munmap(ptr, 4096);
igt_assert_eq(__gem_context_set_param(i915, &p), -EFAULT);
- engines.extensions = to_user_pointer(ptr) + 4096 - 8;
+ engines->extensions = to_user_pointer(ptr) + 4096 - 8;
igt_assert_eq(__gem_context_set_param(i915, &p), -EFAULT);
- engines.extensions = to_user_pointer(ptr) + 8192 - 8;
+ engines->extensions = to_user_pointer(ptr) + 8192 - 8;
gem_context_set_param(i915, &p);
- balancer.base.next_extension = engines.extensions;
- engines.extensions = to_user_pointer(&balancer);
+ balancer->base.next_extension = engines->extensions;
+ engines->extensions = to_user_pointer(balancer);
gem_context_set_param(i915, &p);
munmap(ptr + 8192, 4096);
igt_assert_eq(__gem_context_set_param(i915, &p), -EFAULT);
- engines.extensions = to_user_pointer(ptr) + 8192 - 8;
+ engines->extensions = to_user_pointer(ptr) + 8192 - 8;
igt_assert_eq(__gem_context_set_param(i915, &p), -EFAULT);
munmap(ptr + 4096, 4096);
@@ -308,61 +329,64 @@ static void invalid_balancer(int i915)
static void invalid_bonds(int i915)
{
- I915_DEFINE_CONTEXT_ENGINES_BOND(bonds[16], 1);
- I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, 1);
+ struct i915_context_engines_bond *bonds[16];
+ struct i915_context_param_engines *engines =
+ alloca0(sizeof_param_engines(1));
+
struct drm_i915_gem_context_param p = {
.ctx_id = gem_context_create(i915),
.param = I915_CONTEXT_PARAM_ENGINES,
- .value = to_user_pointer(&engines),
- .size = sizeof(engines),
+ .value = to_user_pointer(engines),
+ .size = sizeof_param_engines(1),
};
uint32_t handle;
void *ptr;
- memset(&engines, 0, sizeof(engines));
+ const size_t bond_size = sizeof_engines_bond(1);
+
gem_context_set_param(i915, &p);
- memset(bonds, 0, sizeof(bonds));
for (int n = 0; n < ARRAY_SIZE(bonds); n++) {
- bonds[n].base.name = I915_CONTEXT_ENGINES_EXT_BOND;
- bonds[n].base.next_extension =
- n ? to_user_pointer(&bonds[n - 1]) : 0;
- bonds[n].num_bonds = 1;
+ bonds[n] = alloca0(bond_size);
+ bonds[n]->base.name = I915_CONTEXT_ENGINES_EXT_BOND;
+ bonds[n]->base.next_extension =
+ n ? to_user_pointer(bonds[n - 1]) : 0;
+ bonds[n]->num_bonds = 1;
}
- engines.extensions = to_user_pointer(&bonds);
+ engines->extensions = to_user_pointer(bonds);
gem_context_set_param(i915, &p);
- bonds[0].base.next_extension = -1ull;
+ bonds[0]->base.next_extension = -1ull;
igt_assert_eq(__gem_context_set_param(i915, &p), -EFAULT);
- bonds[0].base.next_extension = to_user_pointer(&bonds[0]);
+ bonds[0]->base.next_extension = to_user_pointer(bonds[0]);
igt_assert_eq(__gem_context_set_param(i915, &p), -E2BIG);
- engines.extensions = to_user_pointer(&bonds[1]);
+ engines->extensions = to_user_pointer(bonds[1]);
igt_assert_eq(__gem_context_set_param(i915, &p), -E2BIG);
- bonds[0].base.next_extension = 0;
+ bonds[0]->base.next_extension = 0;
gem_context_set_param(i915, &p);
handle = gem_create(i915, 4096 * 3);
ptr = gem_mmap__gtt(i915, handle, 4096 * 3, PROT_WRITE);
gem_close(i915, handle);
- memcpy(ptr + 4096, &bonds[0], sizeof(bonds[0]));
- engines.extensions = to_user_pointer(ptr) + 4096;
+ memcpy(ptr + 4096, bonds[0], bond_size);
+ engines->extensions = to_user_pointer(ptr) + 4096;
gem_context_set_param(i915, &p);
- memcpy(ptr, &bonds[0], sizeof(bonds[0]));
- bonds[0].base.next_extension = to_user_pointer(ptr);
- memcpy(ptr + 4096, &bonds[0], sizeof(bonds[0]));
+ memcpy(ptr, bonds[0], bond_size);
+ bonds[0]->base.next_extension = to_user_pointer(ptr);
+ memcpy(ptr + 4096, bonds[0], bond_size);
gem_context_set_param(i915, &p);
munmap(ptr, 4096);
igt_assert_eq(__gem_context_set_param(i915, &p), -EFAULT);
- bonds[0].base.next_extension = 0;
- memcpy(ptr + 8192, &bonds[0], sizeof(bonds[0]));
- bonds[0].base.next_extension = to_user_pointer(ptr) + 8192;
- memcpy(ptr + 4096, &bonds[0], sizeof(bonds[0]));
+ bonds[0]->base.next_extension = 0;
+ memcpy(ptr + 8192, bonds[0], bond_size);
+ bonds[0]->base.next_extension = to_user_pointer(ptr) + 8192;
+ memcpy(ptr + 4096, bonds[0], bond_size);
gem_context_set_param(i915, &p);
munmap(ptr + 8192, 4096);
@@ -543,10 +567,12 @@ static void individual(int i915)
static void bonded(int i915, unsigned int flags)
#define CORK 0x1
{
- I915_DEFINE_CONTEXT_ENGINES_BOND(bonds[16], 1);
+ struct i915_context_engines_bond *bonds[16];
struct i915_engine_class_instance *master_engines;
uint32_t master;
+ size_t bond_size = sizeof_engines_bond(1);
+
/*
* I915_CONTEXT_PARAM_ENGINE provides an extension that allows us
* to specify which engine(s) to pair with a parallel (EXEC_SUBMIT)
@@ -555,12 +581,12 @@ static void bonded(int i915, unsigned int flags)
master = gem_queue_create(i915);
- memset(bonds, 0, sizeof(bonds));
for (int n = 0; n < ARRAY_SIZE(bonds); n++) {
- bonds[n].base.name = I915_CONTEXT_ENGINES_EXT_BOND;
- bonds[n].base.next_extension =
- n ? to_user_pointer(&bonds[n - 1]) : 0;
- bonds[n].num_bonds = 1;
+ bonds[n] = alloca0(bond_size);
+ bonds[n]->base.name = I915_CONTEXT_ENGINES_EXT_BOND;
+ bonds[n]->base.next_extension =
+ n ? to_user_pointer(bonds[n - 1]) : 0;
+ bonds[n]->num_bonds = 1;
}
for (int class = 0; class < 32; class++) {
@@ -584,14 +610,14 @@ static void bonded(int i915, unsigned int flags)
limit = min(count, limit);
igt_assert(limit <= ARRAY_SIZE(bonds));
for (n = 0; n < limit; n++) {
- bonds[n].master = master_engines[n];
- bonds[n].engines[0] = siblings[n];
+ bonds[n]->master = master_engines[n];
+ bonds[n]->engines[0] = siblings[n];
}
ctx = gem_context_clone(i915,
master, I915_CONTEXT_CLONE_VM,
I915_CONTEXT_CREATE_FLAGS_SINGLE_TIMELINE);
- set_load_balancer(i915, ctx, siblings, count, &bonds[limit - 1]);
+ set_load_balancer(i915, ctx, siblings, count, bonds[limit - 1]);
order = malloc(sizeof(*order) * 8 * limit);
igt_assert(order);
@@ -681,11 +707,12 @@ static void bonded(int i915, unsigned int flags)
static void indices(int i915)
{
- I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, I915_EXEC_RING_MASK + 1);
+ struct i915_context_param_engines *engines =
+ alloca0(sizeof_param_engines(I915_EXEC_RING_MASK + 1));
struct drm_i915_gem_context_param p = {
.ctx_id = gem_context_create(i915),
.param = I915_CONTEXT_PARAM_ENGINES,
- .value = to_user_pointer(&engines)
+ .value = to_user_pointer(engines)
};
struct drm_i915_gem_exec_object2 batch = {
@@ -709,15 +736,14 @@ static void indices(int i915)
continue;
for (int n = 0; n < count; n++) {
- I915_DEFINE_CONTEXT_ENGINES_LOAD_BALANCE(*balancer,
- count);
+ struct i915_context_engines_load_balance *balancer;
- engines.engines[nengines].engine_class =
+ engines->engines[nengines].engine_class =
I915_ENGINE_CLASS_INVALID;
- engines.engines[nengines].engine_instance =
+ engines->engines[nengines].engine_instance =
I915_ENGINE_CLASS_INVALID_NONE;
- balancer = calloc(sizeof(*balancer), 1);
+ balancer = calloc(sizeof_load_balance(1), 1);
igt_assert(balancer);
balancer->base.name =
@@ -736,7 +762,7 @@ static void indices(int i915)
}
igt_require(balancers);
- engines.extensions = to_user_pointer(balancers);
+ engines->extensions = to_user_pointer(balancers);
p.size = (sizeof(struct i915_engine_class_instance) * nengines +
sizeof(struct i915_context_param_engines));
gem_context_set_param(i915, &p);
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 2/4] Makefile: Do not nest new gem tests in i915 directory
2019-06-04 12:59 [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Arkadiusz Hiler
@ 2019-06-04 12:59 ` Arkadiusz Hiler
2019-06-04 13:02 ` Chris Wilson
2019-06-05 9:28 ` Petri Latvala
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 3/4] meson: Add gem_exec_balancer to test-list.txt Arkadiusz Hiler
` (5 subsequent siblings)
6 siblings, 2 replies; 14+ messages in thread
From: Arkadiusz Hiler @ 2019-06-04 12:59 UTC (permalink / raw)
To: igt-dev; +Cc: Petri Latvala
$ diff <(sed "s/ /\n/g" meson-test-list.txt | grep -v 'vc4\|v3d\|panfrost' | sort) <(sed "s/ /\n/g" autotools-test-list.txt | sort)
30d29
< gem_ctx_clone
32d30
< gem_ctx_engines
36d33
< gem_ctx_shared
137d133
< gem_vm_create
145a142,146
> i915/gem_ctx_clone
> i915/gem_ctx_engines
> i915/gem_ctx_shared
> i915/gem_exec_balancer
> i915/gem_vm_create
Let's make this consistent with meson and all the other gem tests we
have.
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
tests/Makefile.am | 2 +-
tests/Makefile.sources | 20 +++++++++++++++-----
2 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c6af0aea..5a428b8a 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -96,7 +96,7 @@ gem_close_race_LDADD = $(LDADD) -lpthread
gem_ctx_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
gem_ctx_thrash_LDADD = $(LDADD) -lpthread
gem_ctx_sseu_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
-i915_gem_exec_balancer_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
+gem_exec_balancer_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
gem_exec_capture_LDADD = $(LDADD) -lz
gem_exec_parallel_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
gem_exec_parallel_LDADD = $(LDADD) -lpthread
diff --git a/tests/Makefile.sources b/tests/Makefile.sources
index cf38792f..027ed82f 100644
--- a/tests/Makefile.sources
+++ b/tests/Makefile.sources
@@ -22,11 +22,6 @@ TESTS_progs = \
drm_import_export \
drm_mm \
drm_read \
- i915/gem_ctx_clone \
- i915/gem_ctx_engines \
- i915/gem_ctx_shared \
- i915/gem_exec_balancer \
- i915/gem_vm_create \
kms_3d \
kms_addfb_basic \
kms_atomic \
@@ -137,9 +132,15 @@ gem_cs_tlb_SOURCES = i915/gem_cs_tlb.c
TESTS_progs += gem_ctx_bad_destroy
gem_ctx_bad_destroy_SOURCES = i915/gem_ctx_bad_destroy.c
+TESTS_progs += gem_ctx_clone
+gem_ctx_clone_SOURCES = i915/gem_ctx_clone.c
+
TESTS_progs += gem_ctx_create
gem_ctx_create_SOURCES = i915/gem_ctx_create.c
+TESTS_progs += gem_ctx_engines
+gem_ctx_engines_SOURCES = i915/gem_ctx_engines.c
+
TESTS_progs += gem_ctx_exec
gem_ctx_exec_SOURCES = i915/gem_ctx_exec.c
@@ -149,6 +150,9 @@ gem_ctx_isolation_SOURCES = i915/gem_ctx_isolation.c
TESTS_progs += gem_ctx_param
gem_ctx_param_SOURCES = i915/gem_ctx_param.c
+TESTS_progs += gem_ctx_shared
+gem_ctx_shared_SOURCES = i915/gem_ctx_shared.c
+
TESTS_progs += gem_ctx_sseu
gem_ctx_sseu_SOURCES = i915/gem_ctx_sseu.c
@@ -182,6 +186,9 @@ gem_exec_await_SOURCES = i915/gem_exec_await.c
TESTS_progs += gem_exec_bad_domains
gem_exec_bad_domains_SOURCES = i915/gem_exec_bad_domains.c
+TESTS_progs += gem_exec_balancer
+gem_exec_balancer_SOURCES = i915/gem_exec_balancer.c
+
TESTS_progs += gem_exec_basic
gem_exec_basic_SOURCES = i915/gem_exec_basic.c
@@ -512,6 +519,9 @@ i915_selftest_SOURCES = i915/i915_selftest.c
TESTS_progs += i915_suspend
i915_suspend_SOURCES = i915/i915_suspend.c
+TESTS_progs += gem_vm_create
+gem_vm_create_SOURCES = i915/gem_vm_create.c
+
TESTS_progs_X = gem_concurrent_all
gem_concurrent_all_SOURCES = i915/gem_concurrent_all.c
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 3/4] meson: Add gem_exec_balancer to test-list.txt
2019-06-04 12:59 [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Arkadiusz Hiler
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 2/4] Makefile: Do not nest new gem tests in i915 directory Arkadiusz Hiler
@ 2019-06-04 12:59 ` Arkadiusz Hiler
2019-06-05 9:11 ` Petri Latvala
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 4/4] tools/meson: Build igt_stats Arkadiusz Hiler
` (4 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Arkadiusz Hiler @ 2019-06-04 12:59 UTC (permalink / raw)
To: igt-dev; +Cc: Petri Latvala
It was missing due to a small oversight in a variable name.
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Petri Latvala <petri.latvala@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
tests/meson.build | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/tests/meson.build b/tests/meson.build
index 74678182..f168fbba 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -298,7 +298,7 @@ test_executables += executable('gem_exec_balancer', 'i915/gem_exec_balancer.c',
install_dir : libexecdir,
install_rpath : libexecdir_rpathdir,
install : true)
-test_progs += 'gem_exec_balancer'
+test_list += 'gem_exec_balancer'
test_executables += executable('gem_mocs_settings',
join_paths('i915', 'gem_mocs_settings.c'),
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t 4/4] tools/meson: Build igt_stats
2019-06-04 12:59 [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Arkadiusz Hiler
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 2/4] Makefile: Do not nest new gem tests in i915 directory Arkadiusz Hiler
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 3/4] meson: Add gem_exec_balancer to test-list.txt Arkadiusz Hiler
@ 2019-06-04 12:59 ` Arkadiusz Hiler
2019-06-05 9:10 ` Petri Latvala
2019-06-04 13:03 ` [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Chris Wilson
` (3 subsequent siblings)
6 siblings, 1 reply; 14+ messages in thread
From: Arkadiusz Hiler @ 2019-06-04 12:59 UTC (permalink / raw)
To: igt-dev; +Cc: Petri Latvala
Since upgrade to Meson 0.46.0 we can have multiple binaries with the
same name. Let's re-enable build of igt_stats!
Cc: Petri Latvala <petri.latvala@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
tools/meson.build | 3 +--
1 file changed, 1 insertion(+), 2 deletions(-)
diff --git a/tools/meson.build b/tools/meson.build
index dfaed82a..6e72b263 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -12,8 +12,7 @@ foreach prog : tools_progs_noisnt
endforeach
tools_progs = [
- # FIXME we already have a libtestcase with this name as target
- #'igt_stats',
+ 'igt_stats',
'intel_audio_dump',
'intel_backlight',
'intel_bios_dumper',
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 2/4] Makefile: Do not nest new gem tests in i915 directory
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 2/4] Makefile: Do not nest new gem tests in i915 directory Arkadiusz Hiler
@ 2019-06-04 13:02 ` Chris Wilson
2019-06-04 13:18 ` Arkadiusz Hiler
2019-06-05 9:28 ` Petri Latvala
1 sibling, 1 reply; 14+ messages in thread
From: Chris Wilson @ 2019-06-04 13:02 UTC (permalink / raw)
To: Arkadiusz Hiler, igt-dev; +Cc: Petri Latvala
Quoting Arkadiusz Hiler (2019-06-04 13:59:53)
> $ diff <(sed "s/ /\n/g" meson-test-list.txt | grep -v 'vc4\|v3d\|panfrost' | sort) <(sed "s/ /\n/g" autotools-test-list.txt | sort)
> 30d29
> < gem_ctx_clone
> 32d30
> < gem_ctx_engines
> 36d33
> < gem_ctx_shared
> 137d133
> < gem_vm_create
> 145a142,146
> > i915/gem_ctx_clone
> > i915/gem_ctx_engines
> > i915/gem_ctx_shared
> > i915/gem_exec_balancer
> > i915/gem_vm_create
>
> Let's make this consistent with meson and all the other gem tests we
> have.
Or fix all the others again. And stop throwing away the directory
structure for meson?
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes
2019-06-04 12:59 [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Arkadiusz Hiler
` (2 preceding siblings ...)
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 4/4] tools/meson: Build igt_stats Arkadiusz Hiler
@ 2019-06-04 13:03 ` Chris Wilson
2019-06-04 13:15 ` [igt-dev] [PATCH i-g-t v2] " Arkadiusz Hiler
` (2 subsequent siblings)
6 siblings, 0 replies; 14+ messages in thread
From: Chris Wilson @ 2019-06-04 13:03 UTC (permalink / raw)
To: Arkadiusz Hiler, igt-dev
Quoting Arkadiusz Hiler (2019-06-04 13:59:52)
> @@ -185,11 +206,13 @@ static uint32_t batch_create(int i915)
>
> static void invalid_balancer(int i915)
> {
> - I915_DEFINE_CONTEXT_ENGINES_LOAD_BALANCE(balancer, 64);
> - I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, 64);
They are static.
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 14+ messages in thread
* [igt-dev] [PATCH i-g-t v2] tests/gem_exec_balancer: Manually calculate VLA struct sizes
2019-06-04 12:59 [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Arkadiusz Hiler
` (3 preceding siblings ...)
2019-06-04 13:03 ` [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Chris Wilson
@ 2019-06-04 13:15 ` Arkadiusz Hiler
2019-06-04 13:23 ` Chris Wilson
2019-06-04 15:14 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2] tests/gem_exec_balancer: Manually calculate VLA struct sizes (rev2) Patchwork
2019-06-05 7:32 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
6 siblings, 1 reply; 14+ messages in thread
From: Arkadiusz Hiler @ 2019-06-04 13:15 UTC (permalink / raw)
To: igt-dev
VLA in structs (struct { int array[count] }) is a GCC extension, so
let's avoid using it.
v2: don't be overzealous in converting static-size structs
Cc: Chris Wilson <chris@chris-wilson.co.uk>
Cc: Simon Ser <simon.ser@intel.com>
Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
---
tests/i915/gem_exec_balancer.c | 64 ++++++++++++++++++++++------------
1 file changed, 42 insertions(+), 22 deletions(-)
diff --git a/tests/i915/gem_exec_balancer.c b/tests/i915/gem_exec_balancer.c
index 33b17fc5..29438381 100644
--- a/tests/i915/gem_exec_balancer.c
+++ b/tests/i915/gem_exec_balancer.c
@@ -32,6 +32,26 @@ IGT_TEST_DESCRIPTION("Exercise in-kernel load-balancing");
#define INSTANCE_COUNT (1 << I915_PMU_SAMPLE_INSTANCE_BITS)
+static size_t sizeof_load_balance(int count)
+{
+ return offsetof(struct i915_context_engines_load_balance,
+ engines[count]);
+}
+
+static size_t sizeof_param_engines(int count)
+{
+ return offsetof(struct i915_context_param_engines,
+ engines[count]);
+}
+
+static size_t sizeof_engines_bond(int count)
+{
+ return offsetof(struct i915_context_engines_bond,
+ engines[count]);
+}
+
+#define alloca0(sz) ({ size_t sz__ = (sz); memset(alloca(sz__), 0, sz__); })
+
static bool has_class_instance(int i915, uint16_t class, uint16_t instance)
{
int fd;
@@ -93,16 +113,17 @@ static int __set_engines(int i915, uint32_t ctx,
const struct i915_engine_class_instance *ci,
unsigned int count)
{
- I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, count);
+ struct i915_context_param_engines *engines =
+ alloca0(sizeof_param_engines(count));
struct drm_i915_gem_context_param p = {
.ctx_id = ctx,
.param = I915_CONTEXT_PARAM_ENGINES,
- .size = sizeof(engines),
- .value = to_user_pointer(&engines)
+ .size = sizeof_param_engines(count),
+ .value = to_user_pointer(engines)
};
- engines.extensions = 0;
- memcpy(engines.engines, ci, sizeof(engines.engines));
+ engines->extensions = 0;
+ memcpy(engines->engines, ci, sizeof(engines->engines));
return __gem_context_set_param(i915, &p);
}
@@ -119,30 +140,30 @@ static int __set_load_balancer(int i915, uint32_t ctx,
unsigned int count,
void *ext)
{
- I915_DEFINE_CONTEXT_ENGINES_LOAD_BALANCE(balancer, count);
- I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, 1 + count);
+ struct i915_context_engines_load_balance *balancer =
+ alloca0(sizeof_load_balance(count));
+ struct i915_context_param_engines *engines =
+ alloca0(sizeof_param_engines(count + 1));
struct drm_i915_gem_context_param p = {
.ctx_id = ctx,
.param = I915_CONTEXT_PARAM_ENGINES,
- .size = sizeof(engines),
- .value = to_user_pointer(&engines)
+ .size = sizeof_param_engines(count + 1),
+ .value = to_user_pointer(engines)
};
- memset(&balancer, 0, sizeof(balancer));
- balancer.base.name = I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE;
- balancer.base.next_extension = to_user_pointer(ext);
+ balancer->base.name = I915_CONTEXT_ENGINES_EXT_LOAD_BALANCE;
+ balancer->base.next_extension = to_user_pointer(ext);
igt_assert(count);
- balancer.num_siblings = count;
- memcpy(balancer.engines, ci, count * sizeof(*ci));
+ balancer->num_siblings = count;
+ memcpy(balancer->engines, ci, count * sizeof(*ci));
- memset(&engines, 0, sizeof(engines));
- engines.extensions = to_user_pointer(&balancer);
- engines.engines[0].engine_class =
+ engines->extensions = to_user_pointer(balancer);
+ engines->engines[0].engine_class =
I915_ENGINE_CLASS_INVALID;
- engines.engines[0].engine_instance =
+ engines->engines[0].engine_instance =
I915_ENGINE_CLASS_INVALID_NONE;
- memcpy(engines.engines + 1, ci, count * sizeof(*ci));
+ memcpy(engines->engines + 1, ci, count * sizeof(*ci));
return __gem_context_set_param(i915, &p);
}
@@ -709,15 +730,14 @@ static void indices(int i915)
continue;
for (int n = 0; n < count; n++) {
- I915_DEFINE_CONTEXT_ENGINES_LOAD_BALANCE(*balancer,
- count);
+ struct i915_context_engines_load_balance *balancer;
engines.engines[nengines].engine_class =
I915_ENGINE_CLASS_INVALID;
engines.engines[nengines].engine_instance =
I915_ENGINE_CLASS_INVALID_NONE;
- balancer = calloc(sizeof(*balancer), 1);
+ balancer = calloc(sizeof_load_balance(1), 1);
igt_assert(balancer);
balancer->base.name =
--
2.21.0
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 2/4] Makefile: Do not nest new gem tests in i915 directory
2019-06-04 13:02 ` Chris Wilson
@ 2019-06-04 13:18 ` Arkadiusz Hiler
0 siblings, 0 replies; 14+ messages in thread
From: Arkadiusz Hiler @ 2019-06-04 13:18 UTC (permalink / raw)
To: Chris Wilson; +Cc: igt-dev, Tomi Sarvela, Petri Latvala
On Tue, Jun 04, 2019 at 02:02:36PM +0100, Chris Wilson wrote:
> Quoting Arkadiusz Hiler (2019-06-04 13:59:53)
> > $ diff <(sed "s/ /\n/g" meson-test-list.txt | grep -v 'vc4\|v3d\|panfrost' | sort) <(sed "s/ /\n/g" autotools-test-list.txt | sort)
> > 30d29
> > < gem_ctx_clone
> > 32d30
> > < gem_ctx_engines
> > 36d33
> > < gem_ctx_shared
> > 137d133
> > < gem_vm_create
> > 145a142,146
> > > i915/gem_ctx_clone
> > > i915/gem_ctx_engines
> > > i915/gem_ctx_shared
> > > i915/gem_exec_balancer
> > > i915/gem_vm_create
> >
> > Let's make this consistent with meson and all the other gem tests we
> > have.
>
> Or fix all the others again. And stop throwing away the directory
> structure for meson?
> -Chris
Slowly getting there...
https://intel-gfx-ci.01.org/tree/drm-tip/IGT_5036/fi-icl-dsi/igt@amdgpu/amd_basic@query-info.html
This need to be fixed first. Most other tools are already fine with slashes.
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [igt-dev] [PATCH i-g-t v2] tests/gem_exec_balancer: Manually calculate VLA struct sizes
2019-06-04 13:15 ` [igt-dev] [PATCH i-g-t v2] " Arkadiusz Hiler
@ 2019-06-04 13:23 ` Chris Wilson
0 siblings, 0 replies; 14+ messages in thread
From: Chris Wilson @ 2019-06-04 13:23 UTC (permalink / raw)
To: Arkadiusz Hiler, igt-dev
Quoting Arkadiusz Hiler (2019-06-04 14:15:55)
> VLA in structs (struct { int array[count] }) is a GCC extension, so
> let's avoid using it.
>
> v2: don't be overzealous in converting static-size structs
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Simon Ser <simon.ser@intel.com>
> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
> ---
> tests/i915/gem_exec_balancer.c | 64 ++++++++++++++++++++++------------
> 1 file changed, 42 insertions(+), 22 deletions(-)
>
> diff --git a/tests/i915/gem_exec_balancer.c b/tests/i915/gem_exec_balancer.c
> index 33b17fc5..29438381 100644
> --- a/tests/i915/gem_exec_balancer.c
> +++ b/tests/i915/gem_exec_balancer.c
> @@ -32,6 +32,26 @@ IGT_TEST_DESCRIPTION("Exercise in-kernel load-balancing");
>
> #define INSTANCE_COUNT (1 << I915_PMU_SAMPLE_INSTANCE_BITS)
>
> +static size_t sizeof_load_balance(int count)
> +{
> + return offsetof(struct i915_context_engines_load_balance,
> + engines[count]);
> +}
> +
> +static size_t sizeof_param_engines(int count)
> +{
> + return offsetof(struct i915_context_param_engines,
> + engines[count]);
> +}
> +
> +static size_t sizeof_engines_bond(int count)
> +{
> + return offsetof(struct i915_context_engines_bond,
> + engines[count]);
> +}
> +
> +#define alloca0(sz) ({ size_t sz__ = (sz); memset(alloca(sz__), 0, sz__); })
> +
> static bool has_class_instance(int i915, uint16_t class, uint16_t instance)
> {
> int fd;
> @@ -93,16 +113,17 @@ static int __set_engines(int i915, uint32_t ctx,
> const struct i915_engine_class_instance *ci,
> unsigned int count)
> {
> - I915_DEFINE_CONTEXT_PARAM_ENGINES(engines, count);
> + struct i915_context_param_engines *engines =
> + alloca0(sizeof_param_engines(count));
> struct drm_i915_gem_context_param p = {
> .ctx_id = ctx,
> .param = I915_CONTEXT_PARAM_ENGINES,
> - .size = sizeof(engines),
> - .value = to_user_pointer(&engines)
> + .size = sizeof_param_engines(count),
> + .value = to_user_pointer(engines)
> };
>
> - engines.extensions = 0;
> - memcpy(engines.engines, ci, sizeof(engines.engines));
> + engines->extensions = 0;
> + memcpy(engines->engines, ci, sizeof(engines->engines));
This now needs to be count * sizeof(*engines->engines)
(Or sizeof(*ci) which is the pattern used later.)
> @@ -709,15 +730,14 @@ static void indices(int i915)
> continue;
>
> for (int n = 0; n < count; n++) {
> - I915_DEFINE_CONTEXT_ENGINES_LOAD_BALANCE(*balancer,
> - count);
> + struct i915_context_engines_load_balance *balancer;
>
> engines.engines[nengines].engine_class =
> I915_ENGINE_CLASS_INVALID;
> engines.engines[nengines].engine_instance =
> I915_ENGINE_CLASS_INVALID_NONE;
>
> - balancer = calloc(sizeof(*balancer), 1);
> + balancer = calloc(sizeof_load_balance(1), 1);
> igt_assert(balancer);
Should be sizeof_load_balance(count)
One hopes this fails with -EFAULT, but it's unlikely to actually cross a
page boundary and be detectable. So maybe -EINVAL.
With the fixes,
Reviewed-by: Chris Wilson <chris@chris-wilson.co.uk>
-Chris
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 14+ messages in thread
* [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2] tests/gem_exec_balancer: Manually calculate VLA struct sizes (rev2)
2019-06-04 12:59 [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Arkadiusz Hiler
` (4 preceding siblings ...)
2019-06-04 13:15 ` [igt-dev] [PATCH i-g-t v2] " Arkadiusz Hiler
@ 2019-06-04 15:14 ` Patchwork
2019-06-05 7:32 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
6 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2019-06-04 15:14 UTC (permalink / raw)
To: Arkadiusz Hiler; +Cc: igt-dev
== Series Details ==
Series: series starting with [i-g-t,v2] tests/gem_exec_balancer: Manually calculate VLA struct sizes (rev2)
URL : https://patchwork.freedesktop.org/series/61582/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6186 -> IGTPW_3103
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/61582/revisions/2/mbox/
Known issues
------------
Here are the changes found in IGTPW_3103 that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_mmap@basic-small-bo:
- fi-glk-dsi: [PASS][1] -> [INCOMPLETE][2] ([fdo#103359] / [fdo#110715] / [k.org#198133])
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/fi-glk-dsi/igt@gem_mmap@basic-small-bo.html
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/fi-glk-dsi/igt@gem_mmap@basic-small-bo.html
#### Possible fixes ####
* igt@gem_ctx_switch@basic-default:
- {fi-icl-guc}: [INCOMPLETE][3] ([fdo#107713] / [fdo#108569]) -> [PASS][4]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/fi-icl-guc/igt@gem_ctx_switch@basic-default.html
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/fi-icl-guc/igt@gem_ctx_switch@basic-default.html
* igt@i915_pm_rpm@module-reload:
- fi-icl-u3: [DMESG-WARN][5] ([fdo#107724]) -> [PASS][6]
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/fi-icl-u3/igt@i915_pm_rpm@module-reload.html
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/fi-icl-u3/igt@i915_pm_rpm@module-reload.html
* {igt@i915_selftest@live_blt}:
- fi-skl-iommu: [INCOMPLETE][7] ([fdo#108602]) -> [PASS][8]
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/fi-skl-iommu/igt@i915_selftest@live_blt.html
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/fi-skl-iommu/igt@i915_selftest@live_blt.html
* igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a:
- fi-blb-e6850: [INCOMPLETE][9] ([fdo#107718]) -> [PASS][10]
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/fi-blb-e6850/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/fi-blb-e6850/igt@kms_pipe_crc_basic@suspend-read-crc-pipe-a.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103359]: https://bugs.freedesktop.org/show_bug.cgi?id=103359
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#107718]: https://bugs.freedesktop.org/show_bug.cgi?id=107718
[fdo#107724]: https://bugs.freedesktop.org/show_bug.cgi?id=107724
[fdo#108569]: https://bugs.freedesktop.org/show_bug.cgi?id=108569
[fdo#108602]: https://bugs.freedesktop.org/show_bug.cgi?id=108602
[fdo#110715]: https://bugs.freedesktop.org/show_bug.cgi?id=110715
[fdo#110818 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110818
[k.org#198133]: https://bugzilla.kernel.org/show_bug.cgi?id=198133
Participating hosts (53 -> 46)
------------------------------
Missing (7): fi-ilk-m540 fi-hsw-4200u fi-byt-squawks fi-bsw-cyan fi-kbl-7560u fi-byt-clapper fi-bdw-samus
Build changes
-------------
* IGT: IGT_5037 -> IGTPW_3103
CI_DRM_6186: a629ccaaa66bb4effc461a00de5b3f92b6ea9c4c @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3103: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/
IGT_5037: a98c9cd50aa48933217ca41055279ccb1680d25b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
== Testlist changes ==
+igt@gem_exec_balancer@bonded-cork
+igt@gem_exec_balancer@bonded-imm
+igt@gem_exec_balancer@busy
+igt@gem_exec_balancer@full
+igt@gem_exec_balancer@full-late
+igt@gem_exec_balancer@full-late-pulse
+igt@gem_exec_balancer@full-pulse
+igt@gem_exec_balancer@indices
+igt@gem_exec_balancer@individual
+igt@gem_exec_balancer@invalid-balancer
+igt@gem_exec_balancer@invalid-bonds
+igt@gem_exec_balancer@nop
+igt@gem_exec_balancer@semaphore
+igt@gem_exec_balancer@smoke
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 14+ messages in thread
* [igt-dev] ✓ Fi.CI.IGT: success for series starting with [i-g-t,v2] tests/gem_exec_balancer: Manually calculate VLA struct sizes (rev2)
2019-06-04 12:59 [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Arkadiusz Hiler
` (5 preceding siblings ...)
2019-06-04 15:14 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2] tests/gem_exec_balancer: Manually calculate VLA struct sizes (rev2) Patchwork
@ 2019-06-05 7:32 ` Patchwork
6 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2019-06-05 7:32 UTC (permalink / raw)
To: Arkadiusz Hiler; +Cc: igt-dev
== Series Details ==
Series: series starting with [i-g-t,v2] tests/gem_exec_balancer: Manually calculate VLA struct sizes (rev2)
URL : https://patchwork.freedesktop.org/series/61582/
State : success
== Summary ==
CI Bug Log - changes from CI_DRM_6186_full -> IGTPW_3103_full
====================================================
Summary
-------
**SUCCESS**
No regressions found.
External URL: https://patchwork.freedesktop.org/api/1.0/series/61582/revisions/2/mbox/
Possible new issues
-------------------
Here are the unknown changes that may have been introduced in IGTPW_3103_full:
### IGT changes ###
#### Possible regressions ####
* {igt@gem_exec_balancer@bonded-cork} (NEW):
- shard-iclb: NOTRUN -> [FAIL][1]
[1]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb1/igt@gem_exec_balancer@bonded-cork.html
* {igt@gem_exec_balancer@bonded-imm} (NEW):
- shard-kbl: NOTRUN -> [FAIL][2] +1 similar issue
[2]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-kbl3/igt@gem_exec_balancer@bonded-imm.html
* {igt@gem_exec_balancer@smoke} (NEW):
- shard-iclb: NOTRUN -> [SKIP][3]
[3]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb3/igt@gem_exec_balancer@smoke.html
New tests
---------
New tests have been introduced between CI_DRM_6186_full and IGTPW_3103_full:
### New IGT tests (14) ###
* igt@gem_exec_balancer@bonded-cork:
- Statuses : 2 fail(s) 1 pass(s) 2 skip(s)
- Exec time: [0.0, 1.92] s
* igt@gem_exec_balancer@bonded-imm:
- Statuses : 1 fail(s) 3 pass(s) 2 skip(s)
- Exec time: [0.0, 1.87] s
* igt@gem_exec_balancer@busy:
- Statuses : 4 pass(s) 2 skip(s)
- Exec time: [0.0, 0.97] s
* igt@gem_exec_balancer@full:
- Statuses : 4 pass(s) 1 skip(s)
- Exec time: [0.0, 2.15] s
* igt@gem_exec_balancer@full-late:
- Statuses : 3 pass(s) 2 skip(s)
- Exec time: [0.0, 2.10] s
* igt@gem_exec_balancer@full-late-pulse:
- Statuses : 4 pass(s) 2 skip(s)
- Exec time: [0.0, 2.11] s
* igt@gem_exec_balancer@full-pulse:
- Statuses : 4 pass(s) 2 skip(s)
- Exec time: [0.0, 2.12] s
* igt@gem_exec_balancer@indices:
- Statuses : 4 pass(s) 2 skip(s)
- Exec time: [0.0, 1.98] s
* igt@gem_exec_balancer@individual:
- Statuses : 4 pass(s) 2 skip(s)
- Exec time: [0.0, 2.04] s
* igt@gem_exec_balancer@invalid-balancer:
- Statuses : 4 pass(s) 2 skip(s)
- Exec time: [0.0, 1.94] s
* igt@gem_exec_balancer@invalid-bonds:
- Statuses : 4 pass(s) 2 skip(s)
- Exec time: [0.0, 0.01] s
* igt@gem_exec_balancer@nop:
- Statuses : 4 pass(s) 2 skip(s)
- Exec time: [0.0, 37.63] s
* igt@gem_exec_balancer@semaphore:
- Statuses : 4 pass(s) 2 skip(s)
- Exec time: [0.0, 2.05] s
* igt@gem_exec_balancer@smoke:
- Statuses : 1 pass(s) 5 skip(s)
- Exec time: [0.0, 22.37] s
Known issues
------------
Here are the changes found in IGTPW_3103_full that come from known issues:
### IGT changes ###
#### Issues hit ####
* igt@gem_tiled_swapping@non-threaded:
- shard-hsw: [PASS][4] -> [FAIL][5] ([fdo#108686])
[4]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-hsw2/igt@gem_tiled_swapping@non-threaded.html
[5]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-hsw2/igt@gem_tiled_swapping@non-threaded.html
* igt@i915_suspend@debugfs-reader:
- shard-apl: [PASS][6] -> [DMESG-WARN][7] ([fdo#108566]) +2 similar issues
[6]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-apl5/igt@i915_suspend@debugfs-reader.html
[7]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-apl1/igt@i915_suspend@debugfs-reader.html
* igt@kms_cursor_crc@pipe-b-cursor-64x64-onscreen:
- shard-apl: [PASS][8] -> [FAIL][9] ([fdo#103232]) +1 similar issue
[8]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-apl8/igt@kms_cursor_crc@pipe-b-cursor-64x64-onscreen.html
[9]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-apl1/igt@kms_cursor_crc@pipe-b-cursor-64x64-onscreen.html
- shard-kbl: [PASS][10] -> [FAIL][11] ([fdo#103232]) +1 similar issue
[10]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-kbl6/igt@kms_cursor_crc@pipe-b-cursor-64x64-onscreen.html
[11]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-kbl4/igt@kms_cursor_crc@pipe-b-cursor-64x64-onscreen.html
* igt@kms_flip_tiling@flip-y-tiled:
- shard-iclb: [PASS][12] -> [FAIL][13] ([fdo#108303])
[12]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb1/igt@kms_flip_tiling@flip-y-tiled.html
[13]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb6/igt@kms_flip_tiling@flip-y-tiled.html
* igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-mmap-gtt:
- shard-hsw: [PASS][14] -> [SKIP][15] ([fdo#109271])
[14]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-hsw5/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-mmap-gtt.html
[15]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-hsw1/igt@kms_frontbuffer_tracking@fbc-2p-scndscrn-pri-indfb-draw-mmap-gtt.html
* igt@kms_frontbuffer_tracking@fbc-stridechange:
- shard-iclb: [PASS][16] -> [FAIL][17] ([fdo#103167]) +3 similar issues
[16]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb5/igt@kms_frontbuffer_tracking@fbc-stridechange.html
[17]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb8/igt@kms_frontbuffer_tracking@fbc-stridechange.html
* igt@kms_setmode@basic:
- shard-apl: [PASS][18] -> [FAIL][19] ([fdo#99912])
[18]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-apl8/igt@kms_setmode@basic.html
[19]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-apl3/igt@kms_setmode@basic.html
* igt@perf_pmu@rc6-runtime-pm:
- shard-apl: [PASS][20] -> [FAIL][21] ([fdo#105010])
[20]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-apl4/igt@perf_pmu@rc6-runtime-pm.html
[21]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-apl4/igt@perf_pmu@rc6-runtime-pm.html
- shard-kbl: [PASS][22] -> [FAIL][23] ([fdo#105010])
[22]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-kbl6/igt@perf_pmu@rc6-runtime-pm.html
[23]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-kbl1/igt@perf_pmu@rc6-runtime-pm.html
- shard-hsw: [PASS][24] -> [FAIL][25] ([fdo#105010])
[24]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-hsw5/igt@perf_pmu@rc6-runtime-pm.html
[25]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-hsw7/igt@perf_pmu@rc6-runtime-pm.html
* igt@prime_busy@wait-hang-vebox:
- shard-iclb: [PASS][26] -> [INCOMPLETE][27] ([fdo#107713] / [fdo#110428 ])
[26]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb1/igt@prime_busy@wait-hang-vebox.html
[27]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb1/igt@prime_busy@wait-hang-vebox.html
#### Possible fixes ####
* {igt@gem_ctx_param@vm}:
- shard-hsw: [DMESG-WARN][28] ([fdo#110836]) -> [PASS][29]
[28]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-hsw6/igt@gem_ctx_param@vm.html
[29]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-hsw5/igt@gem_ctx_param@vm.html
* igt@gem_mmap_gtt@forked-medium-copy-odd:
- shard-iclb: [INCOMPLETE][30] ([fdo#107713]) -> [PASS][31]
[30]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb8/igt@gem_mmap_gtt@forked-medium-copy-odd.html
[31]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb4/igt@gem_mmap_gtt@forked-medium-copy-odd.html
* igt@gem_tiled_swapping@non-threaded:
- shard-iclb: [FAIL][32] ([fdo#108686]) -> [PASS][33]
[32]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb2/igt@gem_tiled_swapping@non-threaded.html
[33]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb4/igt@gem_tiled_swapping@non-threaded.html
* igt@kms_dp_dsc@basic-dsc-enable-edp:
- shard-iclb: [SKIP][34] ([fdo#109349]) -> [PASS][35]
[34]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb3/igt@kms_dp_dsc@basic-dsc-enable-edp.html
[35]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb2/igt@kms_dp_dsc@basic-dsc-enable-edp.html
* igt@kms_flip@2x-modeset-vs-vblank-race-interruptible:
- shard-glk: [FAIL][36] ([fdo#103060]) -> [PASS][37]
[36]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-glk3/igt@kms_flip@2x-modeset-vs-vblank-race-interruptible.html
[37]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-glk2/igt@kms_flip@2x-modeset-vs-vblank-race-interruptible.html
* igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render:
- shard-iclb: [FAIL][38] ([fdo#103167]) -> [PASS][39] +3 similar issues
[38]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb2/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
[39]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb3/igt@kms_frontbuffer_tracking@fbcpsr-1p-primscrn-cur-indfb-draw-render.html
* igt@kms_plane_lowres@pipe-a-tiling-x:
- shard-iclb: [FAIL][40] ([fdo#103166]) -> [PASS][41]
[40]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb2/igt@kms_plane_lowres@pipe-a-tiling-x.html
[41]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb3/igt@kms_plane_lowres@pipe-a-tiling-x.html
* igt@kms_psr@psr2_basic:
- shard-iclb: [SKIP][42] ([fdo#109441]) -> [PASS][43] +1 similar issue
[42]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb7/igt@kms_psr@psr2_basic.html
[43]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb2/igt@kms_psr@psr2_basic.html
* igt@kms_setmode@basic:
- shard-kbl: [FAIL][44] ([fdo#99912]) -> [PASS][45]
[44]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-kbl7/igt@kms_setmode@basic.html
[45]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-kbl1/igt@kms_setmode@basic.html
* igt@kms_vblank@pipe-c-ts-continuation-suspend:
- shard-apl: [DMESG-WARN][46] ([fdo#108566]) -> [PASS][47] +1 similar issue
[46]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-apl1/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
[47]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-apl4/igt@kms_vblank@pipe-c-ts-continuation-suspend.html
* igt@perf@blocking:
- shard-iclb: [FAIL][48] ([fdo#110728]) -> [PASS][49]
[48]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb6/igt@perf@blocking.html
[49]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb8/igt@perf@blocking.html
#### Warnings ####
* igt@gem_mmap_gtt@forked-big-copy-xy:
- shard-iclb: [TIMEOUT][50] ([fdo#109673]) -> [INCOMPLETE][51] ([fdo#107713] / [fdo#109100]) +1 similar issue
[50]: https://intel-gfx-ci.01.org/tree/drm-tip/CI_DRM_6186/shard-iclb3/igt@gem_mmap_gtt@forked-big-copy-xy.html
[51]: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/shard-iclb1/igt@gem_mmap_gtt@forked-big-copy-xy.html
{name}: This element is suppressed. This means it is ignored when computing
the status of the difference (SUCCESS, WARNING, or FAILURE).
[fdo#103060]: https://bugs.freedesktop.org/show_bug.cgi?id=103060
[fdo#103166]: https://bugs.freedesktop.org/show_bug.cgi?id=103166
[fdo#103167]: https://bugs.freedesktop.org/show_bug.cgi?id=103167
[fdo#103232]: https://bugs.freedesktop.org/show_bug.cgi?id=103232
[fdo#105010]: https://bugs.freedesktop.org/show_bug.cgi?id=105010
[fdo#107713]: https://bugs.freedesktop.org/show_bug.cgi?id=107713
[fdo#108303]: https://bugs.freedesktop.org/show_bug.cgi?id=108303
[fdo#108566]: https://bugs.freedesktop.org/show_bug.cgi?id=108566
[fdo#108686]: https://bugs.freedesktop.org/show_bug.cgi?id=108686
[fdo#109100]: https://bugs.freedesktop.org/show_bug.cgi?id=109100
[fdo#109271]: https://bugs.freedesktop.org/show_bug.cgi?id=109271
[fdo#109349]: https://bugs.freedesktop.org/show_bug.cgi?id=109349
[fdo#109441]: https://bugs.freedesktop.org/show_bug.cgi?id=109441
[fdo#109673]: https://bugs.freedesktop.org/show_bug.cgi?id=109673
[fdo#110428 ]: https://bugs.freedesktop.org/show_bug.cgi?id=110428
[fdo#110728]: https://bugs.freedesktop.org/show_bug.cgi?id=110728
[fdo#110836]: https://bugs.freedesktop.org/show_bug.cgi?id=110836
[fdo#99912]: https://bugs.freedesktop.org/show_bug.cgi?id=99912
Participating hosts (10 -> 6)
------------------------------
Missing (4): pig-skl-6260u shard-skl pig-hsw-4770r pig-glk-j5005
Build changes
-------------
* IGT: IGT_5037 -> IGTPW_3103
* Piglit: piglit_4509 -> None
CI_DRM_6186: a629ccaaa66bb4effc461a00de5b3f92b6ea9c4c @ git://anongit.freedesktop.org/gfx-ci/linux
IGTPW_3103: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/
IGT_5037: a98c9cd50aa48933217ca41055279ccb1680d25b @ git://anongit.freedesktop.org/xorg/app/intel-gpu-tools
piglit_4509: fdc5a4ca11124ab8413c7988896eec4c97336694 @ git://anongit.freedesktop.org/piglit
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_3103/
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 4/4] tools/meson: Build igt_stats
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 4/4] tools/meson: Build igt_stats Arkadiusz Hiler
@ 2019-06-05 9:10 ` Petri Latvala
0 siblings, 0 replies; 14+ messages in thread
From: Petri Latvala @ 2019-06-05 9:10 UTC (permalink / raw)
To: Arkadiusz Hiler; +Cc: igt-dev
On Tue, Jun 04, 2019 at 03:59:55PM +0300, Arkadiusz Hiler wrote:
> Since upgrade to Meson 0.46.0 we can have multiple binaries with the
> same name. Let's re-enable build of igt_stats!
>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
> ---
> tools/meson.build | 3 +--
> 1 file changed, 1 insertion(+), 2 deletions(-)
>
> diff --git a/tools/meson.build b/tools/meson.build
> index dfaed82a..6e72b263 100644
> --- a/tools/meson.build
> +++ b/tools/meson.build
> @@ -12,8 +12,7 @@ foreach prog : tools_progs_noisnt
> endforeach
>
> tools_progs = [
> - # FIXME we already have a libtestcase with this name as target
> - #'igt_stats',
> + 'igt_stats',
> 'intel_audio_dump',
> 'intel_backlight',
> 'intel_bios_dumper',
> --
> 2.21.0
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 3/4] meson: Add gem_exec_balancer to test-list.txt
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 3/4] meson: Add gem_exec_balancer to test-list.txt Arkadiusz Hiler
@ 2019-06-05 9:11 ` Petri Latvala
0 siblings, 0 replies; 14+ messages in thread
From: Petri Latvala @ 2019-06-05 9:11 UTC (permalink / raw)
To: Arkadiusz Hiler; +Cc: igt-dev
On Tue, Jun 04, 2019 at 03:59:54PM +0300, Arkadiusz Hiler wrote:
> It was missing due to a small oversight in a variable name.
>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
> ---
> tests/meson.build | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/tests/meson.build b/tests/meson.build
> index 74678182..f168fbba 100644
> --- a/tests/meson.build
> +++ b/tests/meson.build
> @@ -298,7 +298,7 @@ test_executables += executable('gem_exec_balancer', 'i915/gem_exec_balancer.c',
> install_dir : libexecdir,
> install_rpath : libexecdir_rpathdir,
> install : true)
> -test_progs += 'gem_exec_balancer'
> +test_list += 'gem_exec_balancer'
>
> test_executables += executable('gem_mocs_settings',
> join_paths('i915', 'gem_mocs_settings.c'),
> --
> 2.21.0
>
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [igt-dev] [PATCH i-g-t 2/4] Makefile: Do not nest new gem tests in i915 directory
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 2/4] Makefile: Do not nest new gem tests in i915 directory Arkadiusz Hiler
2019-06-04 13:02 ` Chris Wilson
@ 2019-06-05 9:28 ` Petri Latvala
1 sibling, 0 replies; 14+ messages in thread
From: Petri Latvala @ 2019-06-05 9:28 UTC (permalink / raw)
To: Arkadiusz Hiler; +Cc: igt-dev
On Tue, Jun 04, 2019 at 03:59:53PM +0300, Arkadiusz Hiler wrote:
> $ diff <(sed "s/ /\n/g" meson-test-list.txt | grep -v 'vc4\|v3d\|panfrost' | sort) <(sed "s/ /\n/g" autotools-test-list.txt | sort)
> 30d29
> < gem_ctx_clone
> 32d30
> < gem_ctx_engines
> 36d33
> < gem_ctx_shared
> 137d133
> < gem_vm_create
> 145a142,146
> > i915/gem_ctx_clone
> > i915/gem_ctx_engines
> > i915/gem_ctx_shared
> > i915/gem_exec_balancer
> > i915/gem_vm_create
>
> Let's make this consistent with meson and all the other gem tests we
> have.
>
> Cc: Petri Latvala <petri.latvala@intel.com>
> Cc: Chris Wilson <chris@chris-wilson.co.uk>
> Signed-off-by: Arkadiusz Hiler <arkadiusz.hiler@intel.com>
With a pinky promise to Chris that we're getting there to re-enable
directory structures:
Reviewed-by: Petri Latvala <petri.latvala@intel.com>
> ---
> tests/Makefile.am | 2 +-
> tests/Makefile.sources | 20 +++++++++++++++-----
> 2 files changed, 16 insertions(+), 6 deletions(-)
>
> diff --git a/tests/Makefile.am b/tests/Makefile.am
> index c6af0aea..5a428b8a 100644
> --- a/tests/Makefile.am
> +++ b/tests/Makefile.am
> @@ -96,7 +96,7 @@ gem_close_race_LDADD = $(LDADD) -lpthread
> gem_ctx_thrash_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
> gem_ctx_thrash_LDADD = $(LDADD) -lpthread
> gem_ctx_sseu_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
> -i915_gem_exec_balancer_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
> +gem_exec_balancer_LDADD = $(LDADD) $(top_builddir)/lib/libigt_perf.la
> gem_exec_capture_LDADD = $(LDADD) -lz
> gem_exec_parallel_CFLAGS = $(AM_CFLAGS) $(THREAD_CFLAGS)
> gem_exec_parallel_LDADD = $(LDADD) -lpthread
> diff --git a/tests/Makefile.sources b/tests/Makefile.sources
> index cf38792f..027ed82f 100644
> --- a/tests/Makefile.sources
> +++ b/tests/Makefile.sources
> @@ -22,11 +22,6 @@ TESTS_progs = \
> drm_import_export \
> drm_mm \
> drm_read \
> - i915/gem_ctx_clone \
> - i915/gem_ctx_engines \
> - i915/gem_ctx_shared \
> - i915/gem_exec_balancer \
> - i915/gem_vm_create \
> kms_3d \
> kms_addfb_basic \
> kms_atomic \
> @@ -137,9 +132,15 @@ gem_cs_tlb_SOURCES = i915/gem_cs_tlb.c
> TESTS_progs += gem_ctx_bad_destroy
> gem_ctx_bad_destroy_SOURCES = i915/gem_ctx_bad_destroy.c
>
> +TESTS_progs += gem_ctx_clone
> +gem_ctx_clone_SOURCES = i915/gem_ctx_clone.c
> +
> TESTS_progs += gem_ctx_create
> gem_ctx_create_SOURCES = i915/gem_ctx_create.c
>
> +TESTS_progs += gem_ctx_engines
> +gem_ctx_engines_SOURCES = i915/gem_ctx_engines.c
> +
> TESTS_progs += gem_ctx_exec
> gem_ctx_exec_SOURCES = i915/gem_ctx_exec.c
>
> @@ -149,6 +150,9 @@ gem_ctx_isolation_SOURCES = i915/gem_ctx_isolation.c
> TESTS_progs += gem_ctx_param
> gem_ctx_param_SOURCES = i915/gem_ctx_param.c
>
> +TESTS_progs += gem_ctx_shared
> +gem_ctx_shared_SOURCES = i915/gem_ctx_shared.c
> +
> TESTS_progs += gem_ctx_sseu
> gem_ctx_sseu_SOURCES = i915/gem_ctx_sseu.c
>
> @@ -182,6 +186,9 @@ gem_exec_await_SOURCES = i915/gem_exec_await.c
> TESTS_progs += gem_exec_bad_domains
> gem_exec_bad_domains_SOURCES = i915/gem_exec_bad_domains.c
>
> +TESTS_progs += gem_exec_balancer
> +gem_exec_balancer_SOURCES = i915/gem_exec_balancer.c
> +
> TESTS_progs += gem_exec_basic
> gem_exec_basic_SOURCES = i915/gem_exec_basic.c
>
> @@ -512,6 +519,9 @@ i915_selftest_SOURCES = i915/i915_selftest.c
> TESTS_progs += i915_suspend
> i915_suspend_SOURCES = i915/i915_suspend.c
>
> +TESTS_progs += gem_vm_create
> +gem_vm_create_SOURCES = i915/gem_vm_create.c
> +
> TESTS_progs_X = gem_concurrent_all
> gem_concurrent_all_SOURCES = i915/gem_concurrent_all.c
>
> --
> 2.21.0
>
> _______________________________________________
> igt-dev mailing list
> igt-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/igt-dev
_______________________________________________
igt-dev mailing list
igt-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/igt-dev
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2019-06-05 9:28 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-06-04 12:59 [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Arkadiusz Hiler
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 2/4] Makefile: Do not nest new gem tests in i915 directory Arkadiusz Hiler
2019-06-04 13:02 ` Chris Wilson
2019-06-04 13:18 ` Arkadiusz Hiler
2019-06-05 9:28 ` Petri Latvala
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 3/4] meson: Add gem_exec_balancer to test-list.txt Arkadiusz Hiler
2019-06-05 9:11 ` Petri Latvala
2019-06-04 12:59 ` [igt-dev] [PATCH i-g-t 4/4] tools/meson: Build igt_stats Arkadiusz Hiler
2019-06-05 9:10 ` Petri Latvala
2019-06-04 13:03 ` [igt-dev] [PATCH i-g-t 1/4] tests/gem_exec_balancer: Manually calculate VLA struct sizes Chris Wilson
2019-06-04 13:15 ` [igt-dev] [PATCH i-g-t v2] " Arkadiusz Hiler
2019-06-04 13:23 ` Chris Wilson
2019-06-04 15:14 ` [igt-dev] ✓ Fi.CI.BAT: success for series starting with [i-g-t,v2] tests/gem_exec_balancer: Manually calculate VLA struct sizes (rev2) Patchwork
2019-06-05 7:32 ` [igt-dev] ✓ Fi.CI.IGT: " Patchwork
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.