* [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems
@ 2017-10-12 13:29 Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 2/7] tools/aubdump: Avoid ISO C90 warning Thierry Reding
` (9 more replies)
0 siblings, 10 replies; 14+ messages in thread
From: Thierry Reding @ 2017-10-12 13:29 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
From: Thierry Reding <treding@nvidia.com>
Data types are defined differently on 32-bit systems, causing gcc to
complain about printf format specifiers not matching the size of the
variables passed in. Use PRIu64 and %zu where appropriate.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
tests/perf.c | 32 ++++++++++++++++----------------
1 file changed, 16 insertions(+), 16 deletions(-)
diff --git a/tests/perf.c b/tests/perf.c
index ad62319e1bbc..a161c45d7009 100644
--- a/tests/perf.c
+++ b/tests/perf.c
@@ -932,25 +932,25 @@ accumulator_print(struct accumulator *accumulator, const char *title)
igt_debug("%s:\n", title);
if (intel_gen(devid) >= 8) {
- igt_debug("\ttime delta = %lu\n", deltas[idx++]);
- igt_debug("\tclock cycle delta = %lu\n", deltas[idx++]);
+ igt_debug("\ttime delta = %"PRIu64"\n", deltas[idx++]);
+ igt_debug("\tclock cycle delta = %"PRIu64"\n", deltas[idx++]);
for (int i = 0; i < format.n_a40; i++)
- igt_debug("\tA%u = %lu\n", i, deltas[idx++]);
+ igt_debug("\tA%u = %"PRIu64"\n", i, deltas[idx++]);
} else {
- igt_debug("\ttime delta = %lu\n", deltas[idx++]);
+ igt_debug("\ttime delta = %"PRIu64"\n", deltas[idx++]);
}
for (int i = 0; i < format.n_a; i++) {
int a_id = format.first_a + i;
- igt_debug("\tA%u = %lu\n", a_id, deltas[idx++]);
+ igt_debug("\tA%u = %"PRIu64"\n", a_id, deltas[idx++]);
}
for (int i = 0; i < format.n_a; i++)
- igt_debug("\tB%u = %lu\n", i, deltas[idx++]);
+ igt_debug("\tB%u = %"PRIu64"\n", i, deltas[idx++]);
for (int i = 0; i < format.n_c; i++)
- igt_debug("\tC%u = %lu\n", i, deltas[idx++]);
+ igt_debug("\tC%u = %"PRIu64"\n", i, deltas[idx++]);
}
/* The TestOa metric set is designed so */
@@ -2126,7 +2126,7 @@ test_oa_exponents(void)
}
igt_debug(" > report ts=%u"
- " ts_delta_last=%8u ts_delta_last_periodic=%8u is_timer=%i ctx_id=%8x gpu_ticks=%u period=%.2f A0=%lu A%i=%lu\n",
+ " ts_delta_last=%8u ts_delta_last_periodic=%8u is_timer=%i ctx_id=%8x gpu_ticks=%u period=%.2f A0=%"PRIu64" A%i=%"PRIu64"\n",
rpt[1],
(last != NULL) ? (rpt[1] - last[1]) : 0,
(last_periodic != NULL) ? (rpt[1] - last_periodic[1]) : 0,
@@ -2796,7 +2796,7 @@ test_buffer_fill(void)
do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
- igt_debug("fill_duration = %luns, oa_exponent = %u\n",
+ igt_debug("fill_duration = %"PRIu64"ns, oa_exponent = %u\n",
fill_duration, oa_exponent);
do_ioctl(stream_fd, I915_PERF_IOCTL_ENABLE, 0);
@@ -2813,7 +2813,7 @@ test_buffer_fill(void)
*/
while (((last_timestamp - first_timestamp) * oa_period) < (fill_duration / 2)) {
- igt_debug("dts=%u elapsed=%lu duration=%lu\n",
+ igt_debug("dts=%u elapsed=%"PRIu64" duration=%"PRIu64"\n",
last_timestamp - first_timestamp,
(last_timestamp - first_timestamp) * oa_period,
fill_duration / 2);
@@ -2881,7 +2881,7 @@ test_buffer_fill(void)
do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
- igt_debug("%f < %lu < %f\n",
+ igt_debug("%f < %zu < %f\n",
report_size * n_full_oa_reports * 0.45,
n_periodic_reports * report_size,
report_size * n_full_oa_reports * 0.55);
@@ -3032,7 +3032,7 @@ test_enable_disable(void)
do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
- igt_debug("%f < %lu < %f\n",
+ igt_debug("%f < %zu < %f\n",
report_size * n_full_oa_reports * 0.45,
n_periodic_reports * report_size,
report_size * n_full_oa_reports * 0.55);
@@ -3783,7 +3783,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
memset(accumulator.deltas, 0, sizeof(accumulator.deltas));
accumulate_reports(&accumulator, report0_32, report1_32);
- igt_debug("total: A0 = %lu, A21 = %lu, A26 = %lu\n",
+ igt_debug("total: A0 = %"PRIu64", A21 = %"PRIu64", A26 = %"PRIu64"\n",
accumulator.deltas[2 + 0], /* skip timestamp + clock cycles */
accumulator.deltas[2 + 21],
accumulator.deltas[2 + 26]);
@@ -3905,7 +3905,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
if (lprev) {
memset(laccumulator.deltas, 0, sizeof(laccumulator.deltas));
accumulate_reports(&laccumulator, lprev, report);
- igt_debug(" deltas: A0=%lu A21=%lu, A26=%lu\n",
+ igt_debug(" deltas: A0=%"PRIu64" A21=%"PRIu64", A26=%"PRIu64"\n",
laccumulator.deltas[2 + 0], /* skip timestamp + clock cycles */
laccumulator.deltas[2 + 21],
laccumulator.deltas[2 + 26]);
@@ -3946,7 +3946,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
if (!skip_reason) {
accumulate_reports(&accumulator, prev, report);
- igt_debug(" -> Accumulated deltas A0=%lu A21=%lu, A26=%lu\n",
+ igt_debug(" -> Accumulated deltas A0=%"PRIu64" A21=%"PRIu64", A26=%"PRIu64"\n",
accumulator.deltas[2 + 0], /* skip timestamp + clock cycles */
accumulator.deltas[2 + 21],
accumulator.deltas[2 + 26]);
@@ -3974,7 +3974,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
}
}
- igt_debug("n samples written = %ld/%lu (%ix%i)\n",
+ igt_debug("n samples written = %"PRIu64"/%"PRIu64" (%ix%i)\n",
accumulator.deltas[2 + 21],/* skip timestamp + clock cycles */
accumulator.deltas[2 + 26],
width, height);
--
2.14.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH i-g-t 2/7] tools/aubdump: Avoid ISO C90 warning
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
@ 2017-10-12 13:29 ` Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 3/7] lib: Fix compilation on non-x86 Thierry Reding
` (8 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thierry Reding @ 2017-10-12 13:29 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
From: Thierry Reding <treding@nvidia.com>
GCC will warn about ISO C90 forbidding to mix declarations and code.
Declare the variable at the beginning of the function to suppress the
warning.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
tools/aubdump.c | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/aubdump.c b/tools/aubdump.c
index 1aeff5f4532c..6ba3cb66256e 100644
--- a/tools/aubdump.c
+++ b/tools/aubdump.c
@@ -407,6 +407,7 @@ dump_execbuffer2(int fd, struct drm_i915_gem_execbuffer2 *execbuffer2)
uint32_t offset = gtt_size();
struct drm_i915_gem_exec_object2 *obj;
struct bo *bo, *batch_bo;
+ int batch_index;
void *data;
/* We can't do this at open time as we're not yet authenticated. */
@@ -460,7 +461,7 @@ dump_execbuffer2(int fd, struct drm_i915_gem_execbuffer2 *execbuffer2)
fail_if(bo->map == MAP_FAILED, "intel_aubdump: bo mmap failed\n");
}
- int batch_index = (execbuffer2->flags & I915_EXEC_BATCH_FIRST) ? 0 :
+ batch_index = (execbuffer2->flags & I915_EXEC_BATCH_FIRST) ? 0 :
execbuffer2->buffer_count - 1;
batch_bo = get_bo(exec_objects[batch_index].handle);
for (uint32_t i = 0; i < execbuffer2->buffer_count; i++) {
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH i-g-t 3/7] lib: Fix compilation on non-x86
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 2/7] tools/aubdump: Avoid ISO C90 warning Thierry Reding
@ 2017-10-12 13:29 ` Thierry Reding
2017-10-12 13:44 ` Ville Syrjälä
2017-10-17 22:05 ` Chris Wilson
2017-10-12 13:29 ` [PATCH i-g-t 4/7] lib/drmtest: Fix typo Thierry Reding
` (7 subsequent siblings)
9 siblings, 2 replies; 14+ messages in thread
From: Thierry Reding @ 2017-10-12 13:29 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
From: Thierry Reding <treding@nvidia.com>
The meson build avoids the failure by excluding the igt_x86.c file from
the compilation. autotools being what they are don't support that in an
easy way, so just use the preprocessor to avoid the duplicate function
definitions.
Since igt_x86.c will now be ignored for non-x86 builds, the meson work-
around can be removed.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
lib/igt_x86.c | 2 ++
lib/igt_x86.h | 2 +-
lib/meson.build | 5 +----
3 files changed, 4 insertions(+), 5 deletions(-)
diff --git a/lib/igt_x86.c b/lib/igt_x86.c
index 0f0963ced044..0ed3c6f1d356 100644
--- a/lib/igt_x86.c
+++ b/lib/igt_x86.c
@@ -93,6 +93,7 @@
#define has_YMM 0x1
+#if defined(__x86_64__) || defined(__i386__)
unsigned igt_x86_features(void)
{
unsigned max = __get_cpuid_max(BASIC_CPUID, 0);
@@ -172,3 +173,4 @@ char *igt_x86_features_to_string(unsigned features, char *line)
return ret;
}
+#endif
diff --git a/lib/igt_x86.h b/lib/igt_x86.h
index d6dcfa108331..27b7f0fd5837 100644
--- a/lib/igt_x86.h
+++ b/lib/igt_x86.h
@@ -40,7 +40,7 @@
#define AVX 0x80
#define AVX2 0x100
-#if defined(__x86_64__)
+#if defined(__x86_64__) || defined(__i386__)
unsigned igt_x86_features(void);
char *igt_x86_features_to_string(unsigned features, char *line);
#else
diff --git a/lib/meson.build b/lib/meson.build
index 42919eef52a8..e89d4bdf8278 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -56,6 +56,7 @@ lib_sources = [
'igt_stats.c',
'igt_sysfs.c',
'igt_vgem.c',
+ 'igt_x86.c',
'instdone.c',
'intel_batchbuffer.c',
'intel_chipset.c',
@@ -88,10 +89,6 @@ lib_sources = [
'igt_kmod.c',
]
-if ['x86', 'x86_64'].contains(host_machine.cpu_family())
- lib_sources += 'igt_x86.c'
-endif
-
lib_deps = [
cairo,
glib,
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH i-g-t 4/7] lib/drmtest: Fix typo
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 2/7] tools/aubdump: Avoid ISO C90 warning Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 3/7] lib: Fix compilation on non-x86 Thierry Reding
@ 2017-10-12 13:29 ` Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 5/7] lib/drmtest: Support nouveau Thierry Reding
` (6 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thierry Reding @ 2017-10-12 13:29 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
From: Thierry Reding <treding@nvidia.com>
"other" was misspelled as "otehr". Fix it.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
lib/drmtest.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/lib/drmtest.c b/lib/drmtest.c
index 8a07152c701a..24a5ea0f6a0f 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -355,7 +355,7 @@ static const char *chipset_to_str(int chipset)
case DRIVER_ANY:
return "any";
default:
- return "otehr";
+ return "other";
}
}
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH i-g-t 5/7] lib/drmtest: Support nouveau
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
` (2 preceding siblings ...)
2017-10-12 13:29 ` [PATCH i-g-t 4/7] lib/drmtest: Fix typo Thierry Reding
@ 2017-10-12 13:29 ` Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 6/7] lib/drmtest: Support Tegra Thierry Reding
` (5 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thierry Reding @ 2017-10-12 13:29 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
From: Thierry Reding <treding@nvidia.com>
Add a driver definition for nouveau and wire up all the necessary pieces
to identify its devices.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
lib/drmtest.c | 14 ++++++++++++--
lib/drmtest.h | 1 +
2 files changed, 13 insertions(+), 2 deletions(-)
diff --git a/lib/drmtest.c b/lib/drmtest.c
index 24a5ea0f6a0f..f46419ec36cf 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -80,7 +80,7 @@ static int __get_drm_device_name(int fd, char *name)
drm_version_t version;
memset(&version, 0, sizeof(version));
- version.name_len = 4;
+ version.name_len = 8;
version.name = name;
if (!drmIoctl(fd, DRM_IOCTL_VERSION, &version)){
@@ -92,7 +92,7 @@ static int __get_drm_device_name(int fd, char *name)
static bool __is_device(int fd, const char *expect)
{
- char name[5] = "";
+ char name[9] = "";
if (__get_drm_device_name(fd, name))
return false;
@@ -125,6 +125,11 @@ static bool is_amd_device(int fd)
return __is_device(fd, "amdg");
}
+static bool is_nouveau_device(int fd)
+{
+ return __is_device(fd, "nouveau");
+}
+
static bool has_known_intel_chipset(int fd)
{
struct drm_i915_getparam gp;
@@ -277,6 +282,9 @@ int __drm_open_driver(int chipset)
if (chipset & DRIVER_AMDGPU && is_amd_device(fd))
return fd;
+ if (chipset & DRIVER_NOUVEAU && is_nouveau_device(fd))
+ return fd;
+
/* Only VGEM-specific tests should be run on VGEM */
if (chipset == DRIVER_ANY && !is_vgem_device(fd))
return fd;
@@ -352,6 +360,8 @@ static const char *chipset_to_str(int chipset)
return "virtio";
case DRIVER_AMDGPU:
return "amdgpu";
+ case DRIVER_NOUVEAU:
+ return "nouveau";
case DRIVER_ANY:
return "any";
default:
diff --git a/lib/drmtest.h b/lib/drmtest.h
index a86799d54834..e54e1b6756af 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -43,6 +43,7 @@
#define DRIVER_VGEM (1 << 2)
#define DRIVER_VIRTIO (1 << 3)
#define DRIVER_AMDGPU (1 << 4)
+#define DRIVER_NOUVEAU (1 << 5)
/*
* Exclude DRVER_VGEM from DRIVER_ANY since if you run on a system
* with vgem as well as a supported driver, you can end up with a
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH i-g-t 6/7] lib/drmtest: Support Tegra
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
` (3 preceding siblings ...)
2017-10-12 13:29 ` [PATCH i-g-t 5/7] lib/drmtest: Support nouveau Thierry Reding
@ 2017-10-12 13:29 ` Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 7/7] lib/drmtest: Allow the test device to be overridden Thierry Reding
` (4 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thierry Reding @ 2017-10-12 13:29 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
From: Thierry Reding <treding@nvidia.com>
Add a driver definition for Tegra and wire up all the necessary pieces
to identify its devices.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
lib/drmtest.c | 10 ++++++++++
lib/drmtest.h | 1 +
2 files changed, 11 insertions(+)
diff --git a/lib/drmtest.c b/lib/drmtest.c
index f46419ec36cf..e05f88d4a887 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -130,6 +130,11 @@ static bool is_nouveau_device(int fd)
return __is_device(fd, "nouveau");
}
+static bool is_tegra_device(int fd)
+{
+ return __is_device(fd, "tegra");
+}
+
static bool has_known_intel_chipset(int fd)
{
struct drm_i915_getparam gp;
@@ -285,6 +290,9 @@ int __drm_open_driver(int chipset)
if (chipset & DRIVER_NOUVEAU && is_nouveau_device(fd))
return fd;
+ if (chipset & DRIVER_TEGRA && is_tegra_device(fd))
+ return fd;
+
/* Only VGEM-specific tests should be run on VGEM */
if (chipset == DRIVER_ANY && !is_vgem_device(fd))
return fd;
@@ -362,6 +370,8 @@ static const char *chipset_to_str(int chipset)
return "amdgpu";
case DRIVER_NOUVEAU:
return "nouveau";
+ case DRIVER_TEGRA:
+ return "tegra";
case DRIVER_ANY:
return "any";
default:
diff --git a/lib/drmtest.h b/lib/drmtest.h
index e54e1b6756af..bdb938ffd9ab 100644
--- a/lib/drmtest.h
+++ b/lib/drmtest.h
@@ -44,6 +44,7 @@
#define DRIVER_VIRTIO (1 << 3)
#define DRIVER_AMDGPU (1 << 4)
#define DRIVER_NOUVEAU (1 << 5)
+#define DRIVER_TEGRA (1 << 6)
/*
* Exclude DRVER_VGEM from DRIVER_ANY since if you run on a system
* with vgem as well as a supported driver, you can end up with a
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply related [flat|nested] 14+ messages in thread
* [PATCH i-g-t 7/7] lib/drmtest: Allow the test device to be overridden
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
` (4 preceding siblings ...)
2017-10-12 13:29 ` [PATCH i-g-t 6/7] lib/drmtest: Support Tegra Thierry Reding
@ 2017-10-12 13:29 ` Thierry Reding
2017-10-12 13:38 ` [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Lionel Landwerlin
` (3 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Thierry Reding @ 2017-10-12 13:29 UTC (permalink / raw)
To: intel-gfx; +Cc: dri-devel
From: Thierry Reding <treding@nvidia.com>
On setups where the device to be tested is not the first one, allow
users to override it using the IGT_DEVICE environment variable.
Signed-off-by: Thierry Reding <treding@nvidia.com>
---
lib/drmtest.c | 91 ++++++++++++++++++++++++++++++++++++-----------------------
1 file changed, 56 insertions(+), 35 deletions(-)
diff --git a/lib/drmtest.c b/lib/drmtest.c
index e05f88d4a887..1d814734162c 100644
--- a/lib/drmtest.c
+++ b/lib/drmtest.c
@@ -245,6 +245,47 @@ static int modprobe(const char *driver)
return igt_kmod_load(driver, "");
}
+static int __drm_open_device(const char *device, int chipset)
+{
+ int fd;
+
+ fd = open(device, O_RDWR);
+ if (fd == -1)
+ return fd;
+
+ if (chipset & DRIVER_INTEL && is_i915_device(fd) &&
+ has_known_intel_chipset(fd))
+ return fd;
+
+ if (chipset & DRIVER_VC4 &&
+ is_vc4_device(fd))
+ return fd;
+
+ if (chipset & DRIVER_VGEM &&
+ is_vgem_device(fd))
+ return fd;
+
+ if (chipset & DRIVER_VIRTIO &&
+ is_virtio_device(fd))
+ return fd;
+
+ if (chipset & DRIVER_AMDGPU && is_amd_device(fd))
+ return fd;
+
+ if (chipset & DRIVER_NOUVEAU && is_nouveau_device(fd))
+ return fd;
+
+ if (chipset & DRIVER_TEGRA && is_tegra_device(fd))
+ return fd;
+
+ /* Only VGEM-specific tests should be run on VGEM */
+ if (chipset == DRIVER_ANY && !is_vgem_device(fd))
+ return fd;
+
+ close(fd);
+ return -1;
+}
+
/**
* __drm_open_driver:
* @chipset: OR'd flags for each chipset to search, eg. #DRIVER_INTEL
@@ -256,48 +297,25 @@ static int modprobe(const char *driver)
*/
int __drm_open_driver(int chipset)
{
+ char *name = getenv("IGT_DEVICE");
+
+ if (name)
+ return __drm_open_device(name, chipset);
+
if (chipset & DRIVER_VGEM)
modprobe("vgem");
for (int i = 0; i < 16; i++) {
- char name[80];
- int fd;
+ int fd, ret;
- sprintf(name, "/dev/dri/card%u", i);
- fd = open(name, O_RDWR);
- if (fd == -1)
- continue;
-
- if (chipset & DRIVER_INTEL && is_i915_device(fd) &&
- has_known_intel_chipset(fd))
- return fd;
-
- if (chipset & DRIVER_VC4 &&
- is_vc4_device(fd))
- return fd;
-
- if (chipset & DRIVER_VGEM &&
- is_vgem_device(fd))
- return fd;
-
- if (chipset & DRIVER_VIRTIO &&
- is_virtio_device(fd))
- return fd;
-
- if (chipset & DRIVER_AMDGPU && is_amd_device(fd))
- return fd;
-
- if (chipset & DRIVER_NOUVEAU && is_nouveau_device(fd))
- return fd;
+ ret = asprintf(&name, "/dev/dri/card%u", i);
+ igt_assert(ret != -1);
- if (chipset & DRIVER_TEGRA && is_tegra_device(fd))
- return fd;
+ fd = __drm_open_device(name, chipset);
+ free(name);
- /* Only VGEM-specific tests should be run on VGEM */
- if (chipset == DRIVER_ANY && !is_vgem_device(fd))
+ if (fd >= 0)
return fd;
-
- close(fd);
}
return -1;
@@ -305,9 +323,12 @@ int __drm_open_driver(int chipset)
static int __drm_open_driver_render(int chipset)
{
- char *name;
+ char *name = getenv("IGT_DEVICE");
int i, fd;
+ if (name)
+ return __drm_open_device(name, chipset);
+
for (i = 128; i < (128 + 16); i++) {
int ret;
--
2.14.1
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply related [flat|nested] 14+ messages in thread
* Re: [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
` (5 preceding siblings ...)
2017-10-12 13:29 ` [PATCH i-g-t 7/7] lib/drmtest: Allow the test device to be overridden Thierry Reding
@ 2017-10-12 13:38 ` Lionel Landwerlin
2017-10-12 13:42 ` Ville Syrjälä
` (2 subsequent siblings)
9 siblings, 0 replies; 14+ messages in thread
From: Lionel Landwerlin @ 2017-10-12 13:38 UTC (permalink / raw)
To: Thierry Reding, intel-gfx; +Cc: dri-devel
Reviewed-by: Lionel Landwerlin <lionel.g.landwerlin@intel.com>
Thanks!
On 12/10/17 14:29, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
>
> Data types are defined differently on 32-bit systems, causing gcc to
> complain about printf format specifiers not matching the size of the
> variables passed in. Use PRIu64 and %zu where appropriate.
>
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
> tests/perf.c | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/tests/perf.c b/tests/perf.c
> index ad62319e1bbc..a161c45d7009 100644
> --- a/tests/perf.c
> +++ b/tests/perf.c
> @@ -932,25 +932,25 @@ accumulator_print(struct accumulator *accumulator, const char *title)
>
> igt_debug("%s:\n", title);
> if (intel_gen(devid) >= 8) {
> - igt_debug("\ttime delta = %lu\n", deltas[idx++]);
> - igt_debug("\tclock cycle delta = %lu\n", deltas[idx++]);
> + igt_debug("\ttime delta = %"PRIu64"\n", deltas[idx++]);
> + igt_debug("\tclock cycle delta = %"PRIu64"\n", deltas[idx++]);
>
> for (int i = 0; i < format.n_a40; i++)
> - igt_debug("\tA%u = %lu\n", i, deltas[idx++]);
> + igt_debug("\tA%u = %"PRIu64"\n", i, deltas[idx++]);
> } else {
> - igt_debug("\ttime delta = %lu\n", deltas[idx++]);
> + igt_debug("\ttime delta = %"PRIu64"\n", deltas[idx++]);
> }
>
> for (int i = 0; i < format.n_a; i++) {
> int a_id = format.first_a + i;
> - igt_debug("\tA%u = %lu\n", a_id, deltas[idx++]);
> + igt_debug("\tA%u = %"PRIu64"\n", a_id, deltas[idx++]);
> }
>
> for (int i = 0; i < format.n_a; i++)
> - igt_debug("\tB%u = %lu\n", i, deltas[idx++]);
> + igt_debug("\tB%u = %"PRIu64"\n", i, deltas[idx++]);
>
> for (int i = 0; i < format.n_c; i++)
> - igt_debug("\tC%u = %lu\n", i, deltas[idx++]);
> + igt_debug("\tC%u = %"PRIu64"\n", i, deltas[idx++]);
> }
>
> /* The TestOa metric set is designed so */
> @@ -2126,7 +2126,7 @@ test_oa_exponents(void)
> }
>
> igt_debug(" > report ts=%u"
> - " ts_delta_last=%8u ts_delta_last_periodic=%8u is_timer=%i ctx_id=%8x gpu_ticks=%u period=%.2f A0=%lu A%i=%lu\n",
> + " ts_delta_last=%8u ts_delta_last_periodic=%8u is_timer=%i ctx_id=%8x gpu_ticks=%u period=%.2f A0=%"PRIu64" A%i=%"PRIu64"\n",
> rpt[1],
> (last != NULL) ? (rpt[1] - last[1]) : 0,
> (last_periodic != NULL) ? (rpt[1] - last_periodic[1]) : 0,
> @@ -2796,7 +2796,7 @@ test_buffer_fill(void)
>
> do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
>
> - igt_debug("fill_duration = %luns, oa_exponent = %u\n",
> + igt_debug("fill_duration = %"PRIu64"ns, oa_exponent = %u\n",
> fill_duration, oa_exponent);
>
> do_ioctl(stream_fd, I915_PERF_IOCTL_ENABLE, 0);
> @@ -2813,7 +2813,7 @@ test_buffer_fill(void)
> */
> while (((last_timestamp - first_timestamp) * oa_period) < (fill_duration / 2)) {
>
> - igt_debug("dts=%u elapsed=%lu duration=%lu\n",
> + igt_debug("dts=%u elapsed=%"PRIu64" duration=%"PRIu64"\n",
> last_timestamp - first_timestamp,
> (last_timestamp - first_timestamp) * oa_period,
> fill_duration / 2);
> @@ -2881,7 +2881,7 @@ test_buffer_fill(void)
>
> do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
>
> - igt_debug("%f < %lu < %f\n",
> + igt_debug("%f < %zu < %f\n",
> report_size * n_full_oa_reports * 0.45,
> n_periodic_reports * report_size,
> report_size * n_full_oa_reports * 0.55);
> @@ -3032,7 +3032,7 @@ test_enable_disable(void)
>
> do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
>
> - igt_debug("%f < %lu < %f\n",
> + igt_debug("%f < %zu < %f\n",
> report_size * n_full_oa_reports * 0.45,
> n_periodic_reports * report_size,
> report_size * n_full_oa_reports * 0.55);
> @@ -3783,7 +3783,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
>
> memset(accumulator.deltas, 0, sizeof(accumulator.deltas));
> accumulate_reports(&accumulator, report0_32, report1_32);
> - igt_debug("total: A0 = %lu, A21 = %lu, A26 = %lu\n",
> + igt_debug("total: A0 = %"PRIu64", A21 = %"PRIu64", A26 = %"PRIu64"\n",
> accumulator.deltas[2 + 0], /* skip timestamp + clock cycles */
> accumulator.deltas[2 + 21],
> accumulator.deltas[2 + 26]);
> @@ -3905,7 +3905,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
> if (lprev) {
> memset(laccumulator.deltas, 0, sizeof(laccumulator.deltas));
> accumulate_reports(&laccumulator, lprev, report);
> - igt_debug(" deltas: A0=%lu A21=%lu, A26=%lu\n",
> + igt_debug(" deltas: A0=%"PRIu64" A21=%"PRIu64", A26=%"PRIu64"\n",
> laccumulator.deltas[2 + 0], /* skip timestamp + clock cycles */
> laccumulator.deltas[2 + 21],
> laccumulator.deltas[2 + 26]);
> @@ -3946,7 +3946,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
>
> if (!skip_reason) {
> accumulate_reports(&accumulator, prev, report);
> - igt_debug(" -> Accumulated deltas A0=%lu A21=%lu, A26=%lu\n",
> + igt_debug(" -> Accumulated deltas A0=%"PRIu64" A21=%"PRIu64", A26=%"PRIu64"\n",
> accumulator.deltas[2 + 0], /* skip timestamp + clock cycles */
> accumulator.deltas[2 + 21],
> accumulator.deltas[2 + 26]);
> @@ -3974,7 +3974,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
> }
> }
>
> - igt_debug("n samples written = %ld/%lu (%ix%i)\n",
> + igt_debug("n samples written = %"PRIu64"/%"PRIu64" (%ix%i)\n",
> accumulator.deltas[2 + 21],/* skip timestamp + clock cycles */
> accumulator.deltas[2 + 26],
> width, height);
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
` (6 preceding siblings ...)
2017-10-12 13:38 ` [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Lionel Landwerlin
@ 2017-10-12 13:42 ` Ville Syrjälä
2017-10-12 14:08 ` ✓ Fi.CI.BAT: success for series starting with [1/7] " Patchwork
2017-10-12 19:55 ` ✗ Fi.CI.IGT: failure " Patchwork
9 siblings, 0 replies; 14+ messages in thread
From: Ville Syrjälä @ 2017-10-12 13:42 UTC (permalink / raw)
To: Thierry Reding; +Cc: intel-gfx, dri-devel
On Thu, Oct 12, 2017 at 03:29:37PM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
>
> Data types are defined differently on 32-bit systems, causing gcc to
> complain about printf format specifiers not matching the size of the
> variables passed in. Use PRIu64 and %zu where appropriate.
I periodically fix these but someone keeps sneaking in new ones :(
Would be nice if ci actually made sure no new warnings get added..
Based on a quick glance this looks good so
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
>
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
> tests/perf.c | 32 ++++++++++++++++----------------
> 1 file changed, 16 insertions(+), 16 deletions(-)
>
> diff --git a/tests/perf.c b/tests/perf.c
> index ad62319e1bbc..a161c45d7009 100644
> --- a/tests/perf.c
> +++ b/tests/perf.c
> @@ -932,25 +932,25 @@ accumulator_print(struct accumulator *accumulator, const char *title)
>
> igt_debug("%s:\n", title);
> if (intel_gen(devid) >= 8) {
> - igt_debug("\ttime delta = %lu\n", deltas[idx++]);
> - igt_debug("\tclock cycle delta = %lu\n", deltas[idx++]);
> + igt_debug("\ttime delta = %"PRIu64"\n", deltas[idx++]);
> + igt_debug("\tclock cycle delta = %"PRIu64"\n", deltas[idx++]);
>
> for (int i = 0; i < format.n_a40; i++)
> - igt_debug("\tA%u = %lu\n", i, deltas[idx++]);
> + igt_debug("\tA%u = %"PRIu64"\n", i, deltas[idx++]);
> } else {
> - igt_debug("\ttime delta = %lu\n", deltas[idx++]);
> + igt_debug("\ttime delta = %"PRIu64"\n", deltas[idx++]);
> }
>
> for (int i = 0; i < format.n_a; i++) {
> int a_id = format.first_a + i;
> - igt_debug("\tA%u = %lu\n", a_id, deltas[idx++]);
> + igt_debug("\tA%u = %"PRIu64"\n", a_id, deltas[idx++]);
> }
>
> for (int i = 0; i < format.n_a; i++)
> - igt_debug("\tB%u = %lu\n", i, deltas[idx++]);
> + igt_debug("\tB%u = %"PRIu64"\n", i, deltas[idx++]);
>
> for (int i = 0; i < format.n_c; i++)
> - igt_debug("\tC%u = %lu\n", i, deltas[idx++]);
> + igt_debug("\tC%u = %"PRIu64"\n", i, deltas[idx++]);
> }
>
> /* The TestOa metric set is designed so */
> @@ -2126,7 +2126,7 @@ test_oa_exponents(void)
> }
>
> igt_debug(" > report ts=%u"
> - " ts_delta_last=%8u ts_delta_last_periodic=%8u is_timer=%i ctx_id=%8x gpu_ticks=%u period=%.2f A0=%lu A%i=%lu\n",
> + " ts_delta_last=%8u ts_delta_last_periodic=%8u is_timer=%i ctx_id=%8x gpu_ticks=%u period=%.2f A0=%"PRIu64" A%i=%"PRIu64"\n",
> rpt[1],
> (last != NULL) ? (rpt[1] - last[1]) : 0,
> (last_periodic != NULL) ? (rpt[1] - last_periodic[1]) : 0,
> @@ -2796,7 +2796,7 @@ test_buffer_fill(void)
>
> do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
>
> - igt_debug("fill_duration = %luns, oa_exponent = %u\n",
> + igt_debug("fill_duration = %"PRIu64"ns, oa_exponent = %u\n",
> fill_duration, oa_exponent);
>
> do_ioctl(stream_fd, I915_PERF_IOCTL_ENABLE, 0);
> @@ -2813,7 +2813,7 @@ test_buffer_fill(void)
> */
> while (((last_timestamp - first_timestamp) * oa_period) < (fill_duration / 2)) {
>
> - igt_debug("dts=%u elapsed=%lu duration=%lu\n",
> + igt_debug("dts=%u elapsed=%"PRIu64" duration=%"PRIu64"\n",
> last_timestamp - first_timestamp,
> (last_timestamp - first_timestamp) * oa_period,
> fill_duration / 2);
> @@ -2881,7 +2881,7 @@ test_buffer_fill(void)
>
> do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
>
> - igt_debug("%f < %lu < %f\n",
> + igt_debug("%f < %zu < %f\n",
> report_size * n_full_oa_reports * 0.45,
> n_periodic_reports * report_size,
> report_size * n_full_oa_reports * 0.55);
> @@ -3032,7 +3032,7 @@ test_enable_disable(void)
>
> do_ioctl(stream_fd, I915_PERF_IOCTL_DISABLE, 0);
>
> - igt_debug("%f < %lu < %f\n",
> + igt_debug("%f < %zu < %f\n",
> report_size * n_full_oa_reports * 0.45,
> n_periodic_reports * report_size,
> report_size * n_full_oa_reports * 0.55);
> @@ -3783,7 +3783,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
>
> memset(accumulator.deltas, 0, sizeof(accumulator.deltas));
> accumulate_reports(&accumulator, report0_32, report1_32);
> - igt_debug("total: A0 = %lu, A21 = %lu, A26 = %lu\n",
> + igt_debug("total: A0 = %"PRIu64", A21 = %"PRIu64", A26 = %"PRIu64"\n",
> accumulator.deltas[2 + 0], /* skip timestamp + clock cycles */
> accumulator.deltas[2 + 21],
> accumulator.deltas[2 + 26]);
> @@ -3905,7 +3905,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
> if (lprev) {
> memset(laccumulator.deltas, 0, sizeof(laccumulator.deltas));
> accumulate_reports(&laccumulator, lprev, report);
> - igt_debug(" deltas: A0=%lu A21=%lu, A26=%lu\n",
> + igt_debug(" deltas: A0=%"PRIu64" A21=%"PRIu64", A26=%"PRIu64"\n",
> laccumulator.deltas[2 + 0], /* skip timestamp + clock cycles */
> laccumulator.deltas[2 + 21],
> laccumulator.deltas[2 + 26]);
> @@ -3946,7 +3946,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
>
> if (!skip_reason) {
> accumulate_reports(&accumulator, prev, report);
> - igt_debug(" -> Accumulated deltas A0=%lu A21=%lu, A26=%lu\n",
> + igt_debug(" -> Accumulated deltas A0=%"PRIu64" A21=%"PRIu64", A26=%"PRIu64"\n",
> accumulator.deltas[2 + 0], /* skip timestamp + clock cycles */
> accumulator.deltas[2 + 21],
> accumulator.deltas[2 + 26]);
> @@ -3974,7 +3974,7 @@ gen8_test_single_ctx_render_target_writes_a_counter(void)
> }
> }
>
> - igt_debug("n samples written = %ld/%lu (%ix%i)\n",
> + igt_debug("n samples written = %"PRIu64"/%"PRIu64" (%ix%i)\n",
> accumulator.deltas[2 + 21],/* skip timestamp + clock cycles */
> accumulator.deltas[2 + 26],
> width, height);
> --
> 2.14.1
>
> _______________________________________________
> dri-devel mailing list
> dri-devel@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/dri-devel
--
Ville Syrjälä
Intel OTC
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH i-g-t 3/7] lib: Fix compilation on non-x86
2017-10-12 13:29 ` [PATCH i-g-t 3/7] lib: Fix compilation on non-x86 Thierry Reding
@ 2017-10-12 13:44 ` Ville Syrjälä
2017-10-12 13:56 ` [Intel-gfx] " Thierry Reding
2017-10-17 22:05 ` Chris Wilson
1 sibling, 1 reply; 14+ messages in thread
From: Ville Syrjälä @ 2017-10-12 13:44 UTC (permalink / raw)
To: Thierry Reding; +Cc: intel-gfx, dri-devel
On Thu, Oct 12, 2017 at 03:29:39PM +0200, Thierry Reding wrote:
> From: Thierry Reding <treding@nvidia.com>
>
> The meson build avoids the failure by excluding the igt_x86.c file from
> the compilation. autotools being what they are don't support that in an
> easy way,
There is some kind of build_x86 thing in autotools stuff.
But this looks OK to me as well so
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> so just use the preprocessor to avoid the duplicate function
> definitions.
>
> Since igt_x86.c will now be ignored for non-x86 builds, the meson work-
> around can be removed.
>
> Signed-off-by: Thierry Reding <treding@nvidia.com>
> ---
> lib/igt_x86.c | 2 ++
> lib/igt_x86.h | 2 +-
> lib/meson.build | 5 +----
> 3 files changed, 4 insertions(+), 5 deletions(-)
>
> diff --git a/lib/igt_x86.c b/lib/igt_x86.c
> index 0f0963ced044..0ed3c6f1d356 100644
> --- a/lib/igt_x86.c
> +++ b/lib/igt_x86.c
> @@ -93,6 +93,7 @@
>
> #define has_YMM 0x1
>
> +#if defined(__x86_64__) || defined(__i386__)
> unsigned igt_x86_features(void)
> {
> unsigned max = __get_cpuid_max(BASIC_CPUID, 0);
> @@ -172,3 +173,4 @@ char *igt_x86_features_to_string(unsigned features, char *line)
>
> return ret;
> }
> +#endif
> diff --git a/lib/igt_x86.h b/lib/igt_x86.h
> index d6dcfa108331..27b7f0fd5837 100644
> --- a/lib/igt_x86.h
> +++ b/lib/igt_x86.h
> @@ -40,7 +40,7 @@
> #define AVX 0x80
> #define AVX2 0x100
>
> -#if defined(__x86_64__)
> +#if defined(__x86_64__) || defined(__i386__)
> unsigned igt_x86_features(void);
> char *igt_x86_features_to_string(unsigned features, char *line);
> #else
> diff --git a/lib/meson.build b/lib/meson.build
> index 42919eef52a8..e89d4bdf8278 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -56,6 +56,7 @@ lib_sources = [
> 'igt_stats.c',
> 'igt_sysfs.c',
> 'igt_vgem.c',
> + 'igt_x86.c',
> 'instdone.c',
> 'intel_batchbuffer.c',
> 'intel_chipset.c',
> @@ -88,10 +89,6 @@ lib_sources = [
> 'igt_kmod.c',
> ]
>
> -if ['x86', 'x86_64'].contains(host_machine.cpu_family())
> - lib_sources += 'igt_x86.c'
> -endif
> -
> lib_deps = [
> cairo,
> glib,
> --
> 2.14.1
>
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
--
Ville Syrjälä
Intel OTC
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [Intel-gfx] [PATCH i-g-t 3/7] lib: Fix compilation on non-x86
2017-10-12 13:44 ` Ville Syrjälä
@ 2017-10-12 13:56 ` Thierry Reding
0 siblings, 0 replies; 14+ messages in thread
From: Thierry Reding @ 2017-10-12 13:56 UTC (permalink / raw)
To: Ville Syrjälä; +Cc: intel-gfx, dri-devel
[-- Attachment #1.1: Type: text/plain, Size: 626 bytes --]
On Thu, Oct 12, 2017 at 04:44:14PM +0300, Ville Syrjälä wrote:
> On Thu, Oct 12, 2017 at 03:29:39PM +0200, Thierry Reding wrote:
> > From: Thierry Reding <treding@nvidia.com>
> >
> > The meson build avoids the failure by excluding the igt_x86.c file from
> > the compilation. autotools being what they are don't support that in an
> > easy way,
>
> There is some kind of build_x86 thing in autotools stuff.
Indeed. I'm not sure it could be used, though, because the sources are
listed in Makefile.sources which is also used by the Android build. I
don't think it would understand the conditional.
Thierry
[-- Attachment #1.2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]
[-- Attachment #2: Type: text/plain, Size: 160 bytes --]
_______________________________________________
dri-devel mailing list
dri-devel@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/dri-devel
^ permalink raw reply [flat|nested] 14+ messages in thread
* ✓ Fi.CI.BAT: success for series starting with [1/7] tests/perf: Fix a bunch of warnings on 32-bit systems
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
` (7 preceding siblings ...)
2017-10-12 13:42 ` Ville Syrjälä
@ 2017-10-12 14:08 ` Patchwork
2017-10-12 19:55 ` ✗ Fi.CI.IGT: failure " Patchwork
9 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2017-10-12 14:08 UTC (permalink / raw)
To: Thierry Reding; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/7] tests/perf: Fix a bunch of warnings on 32-bit systems
URL : https://patchwork.freedesktop.org/series/31818/
State : success
== Summary ==
IGT patchset tested on top of latest successful build
1fc20664fcbff058db365a2238a5bddfeff5325a meson: Make syncobj tests build
with latest DRM-Tip kernel build CI_DRM_3222
a869721e93a5 drm-tip: 2017y-10m-12d-08h-30m-31s UTC integration manifest
No testlist changes.
fi-bdw-5557u total:289 pass:268 dwarn:0 dfail:0 fail:0 skip:21 time:458s
fi-bdw-gvtdvm total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:474s
fi-blb-e6850 total:289 pass:223 dwarn:1 dfail:0 fail:0 skip:65 time:391s
fi-bsw-n3050 total:289 pass:243 dwarn:0 dfail:0 fail:0 skip:46 time:581s
fi-bwr-2160 total:289 pass:183 dwarn:0 dfail:0 fail:0 skip:106 time:286s
fi-bxt-dsi total:289 pass:259 dwarn:0 dfail:0 fail:0 skip:30 time:531s
fi-bxt-j4205 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:530s
fi-byt-j1900 total:289 pass:253 dwarn:1 dfail:0 fail:0 skip:35 time:540s
fi-byt-n2820 total:289 pass:249 dwarn:1 dfail:0 fail:0 skip:39 time:522s
fi-cfl-s total:289 pass:253 dwarn:4 dfail:0 fail:0 skip:32 time:556s
fi-elk-e7500 total:289 pass:229 dwarn:0 dfail:0 fail:0 skip:60 time:434s
fi-gdg-551 total:289 pass:178 dwarn:1 dfail:0 fail:1 skip:109 time:274s
fi-glk-1 total:289 pass:261 dwarn:0 dfail:0 fail:0 skip:28 time:598s
fi-hsw-4770r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:441s
fi-ilk-650 total:289 pass:228 dwarn:0 dfail:0 fail:0 skip:61 time:464s
fi-ivb-3520m total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:506s
fi-ivb-3770 total:289 pass:260 dwarn:0 dfail:0 fail:0 skip:29 time:471s
fi-kbl-7500u total:289 pass:264 dwarn:1 dfail:0 fail:0 skip:24 time:506s
fi-kbl-7567u total:289 pass:265 dwarn:4 dfail:0 fail:0 skip:20 time:495s
fi-kbl-r total:289 pass:262 dwarn:0 dfail:0 fail:0 skip:27 time:595s
fi-pnv-d510 total:289 pass:222 dwarn:1 dfail:0 fail:0 skip:66 time:659s
fi-skl-6260u total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:465s
fi-skl-6700hq total:289 pass:263 dwarn:0 dfail:0 fail:0 skip:26 time:658s
fi-skl-6700k total:289 pass:265 dwarn:0 dfail:0 fail:0 skip:24 time:536s
fi-skl-6770hq total:289 pass:269 dwarn:0 dfail:0 fail:0 skip:20 time:521s
fi-skl-gvtdvm total:289 pass:266 dwarn:0 dfail:0 fail:0 skip:23 time:474s
fi-snb-2520m total:289 pass:250 dwarn:0 dfail:0 fail:0 skip:39 time:589s
fi-snb-2600 total:289 pass:249 dwarn:0 dfail:0 fail:0 skip:40 time:434s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_339/
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* ✗ Fi.CI.IGT: failure for series starting with [1/7] tests/perf: Fix a bunch of warnings on 32-bit systems
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
` (8 preceding siblings ...)
2017-10-12 14:08 ` ✓ Fi.CI.BAT: success for series starting with [1/7] " Patchwork
@ 2017-10-12 19:55 ` Patchwork
9 siblings, 0 replies; 14+ messages in thread
From: Patchwork @ 2017-10-12 19:55 UTC (permalink / raw)
To: Thierry Reding; +Cc: intel-gfx
== Series Details ==
Series: series starting with [1/7] tests/perf: Fix a bunch of warnings on 32-bit systems
URL : https://patchwork.freedesktop.org/series/31818/
State : failure
== Summary ==
Test kms_flip:
Subgroup flip-vs-fences-interruptible:
pass -> FAIL (shard-hsw) fdo#102946
Test kms_setmode:
Subgroup basic:
pass -> FAIL (shard-hsw) fdo#99912
Test prime_self_import:
Subgroup reimport-vs-gem_close-race:
fail -> PASS (shard-hsw) fdo#102655
Subgroup export-vs-gem_close-race:
pass -> FAIL (shard-hsw)
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-mmap-wc:
dmesg-warn -> PASS (shard-hsw) fdo#102614 +1
fdo#102946 https://bugs.freedesktop.org/show_bug.cgi?id=102946
fdo#99912 https://bugs.freedesktop.org/show_bug.cgi?id=99912
fdo#102655 https://bugs.freedesktop.org/show_bug.cgi?id=102655
fdo#102614 https://bugs.freedesktop.org/show_bug.cgi?id=102614
shard-hsw total:2500 pass:1404 dwarn:1 dfail:0 fail:11 skip:1084 time:9330s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_339/shards.html
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
* Re: [PATCH i-g-t 3/7] lib: Fix compilation on non-x86
2017-10-12 13:29 ` [PATCH i-g-t 3/7] lib: Fix compilation on non-x86 Thierry Reding
2017-10-12 13:44 ` Ville Syrjälä
@ 2017-10-17 22:05 ` Chris Wilson
1 sibling, 0 replies; 14+ messages in thread
From: Chris Wilson @ 2017-10-17 22:05 UTC (permalink / raw)
To: Thierry Reding, intel-gfx; +Cc: dri-devel
Quoting Thierry Reding (2017-10-12 14:29:39)
> diff --git a/lib/igt_x86.h b/lib/igt_x86.h
> index d6dcfa108331..27b7f0fd5837 100644
> --- a/lib/igt_x86.h
> +++ b/lib/igt_x86.h
> @@ -40,7 +40,7 @@
> #define AVX 0x80
> #define AVX2 0x100
>
> -#if defined(__x86_64__)
> +#if defined(__x86_64__) || defined(__i386__)
> unsigned igt_x86_features(void);
> char *igt_x86_features_to_string(unsigned features, char *line);
This by itself is a build regression from 2a74ae550842. Would be nice to
get this fixed irrespective of the meson fixes.
-Chris
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 14+ messages in thread
end of thread, other threads:[~2017-10-17 22:05 UTC | newest]
Thread overview: 14+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-10-12 13:29 [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 2/7] tools/aubdump: Avoid ISO C90 warning Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 3/7] lib: Fix compilation on non-x86 Thierry Reding
2017-10-12 13:44 ` Ville Syrjälä
2017-10-12 13:56 ` [Intel-gfx] " Thierry Reding
2017-10-17 22:05 ` Chris Wilson
2017-10-12 13:29 ` [PATCH i-g-t 4/7] lib/drmtest: Fix typo Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 5/7] lib/drmtest: Support nouveau Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 6/7] lib/drmtest: Support Tegra Thierry Reding
2017-10-12 13:29 ` [PATCH i-g-t 7/7] lib/drmtest: Allow the test device to be overridden Thierry Reding
2017-10-12 13:38 ` [PATCH i-g-t 1/7] tests/perf: Fix a bunch of warnings on 32-bit systems Lionel Landwerlin
2017-10-12 13:42 ` Ville Syrjälä
2017-10-12 14:08 ` ✓ Fi.CI.BAT: success for series starting with [1/7] " Patchwork
2017-10-12 19:55 ` ✗ Fi.CI.IGT: failure " 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.