igt: Make dependency on libunwind mandatory
Subsystems (2)
PATCH 1/1 igt: Make dependency on libunwind mandatory
With Android support gone there is not much reason for keeping libunwind dependency optional. This also deals (cheaply!) with ifdefs covering huge portions of code, removing a placement minefield.
--- configure.ac | 12 ++---------- lib/igt_core.c | 13 ++++--------- meson.build | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-)
configure.ac +2 -10
@@ -124,8 +124,10 @@ PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.82]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) PKG_CHECK_MODULES(KMOD, [libkmod]) PKG_CHECK_MODULES(PROCPS, [libprocps]) +PKG_CHECK_MODULES(LIBUNWIND, [libunwind]) PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no]) + if test x$have_valgrind = xyes; then AC_DEFINE(HAVE_VALGRIND, 1, [Enable valgrind annotation support.]) fi
@@ -330,15 +332,6 @@ AM_CONDITIONAL(BUILD_SHADER_DEBUGGER, [test "x$BUILD_SHADER_DEBUGGER" != xno]) AS_IF([test "x$BUILD_SHADER_DEBUGGER" != xno], [enable_debugger=yes], [enable_debugger=no]) -AC_ARG_WITH(libunwind, - AS_HELP_STRING([--without-libunwind], - [Build tests without libunwind support]), - [], [with_libunwind=yes]) -if test "x$with_libunwind" = xyes; then - PKG_CHECK_MODULES(LIBUNWIND, libunwind, AC_DEFINE(HAVE_LIBUNWIND, 1, [libunwind support]), - AC_MSG_ERROR([libunwind not found. Use --without-libunwind to disable libunwind support.])) -fi - # enable debug symbols AC_ARG_ENABLE(debug, AS_HELP_STRING([--disable-debug],
@@ -434,7 +427,6 @@ echo " Build tests : ${BUILD_TESTS}" echo " Chamelium tests : ${enable_chamelium}" echo " Audio tests : ${enable_audio}" echo " Compile prime tests: ${NOUVEAU}" -echo " Print stack traces : ${with_libunwind}" echo " Debug flags : ${DEBUG_CFLAGS}" echo "" echo " • Tools:"
lib/igt_core.c +4 -9
@@ -71,6 +71,9 @@#include "igt_sysfs.h" #include "igt_rc.h" +#define UNW_LOCAL_ONLY +#include <libunwind.h> +#ifdef HAVE_LIBGEN_H #include <libgen.h> /* for basename() on Solaris */ #endif
@@ -1173,10 +1176,6 @@ static void write_stderr(const char *str)__write_stderr (str,strlen (str)); } -#ifdef HAVE_LIBUNWIND -#define UNW_LOCAL_ONLY -#include <libunwind.h> -static void print_backtrace (void ) {unw_cursor_t cursor;
@@ -1371,7 +1370,6 @@ static void print_backtrace_sig_safe(void) } } -#endif void __igt_fail_assert(const char *domain, const char *file, const int line, const char *func, const char *assertion,
@@ -1394,9 +1392,7 @@ void __igt_fail_assert(const char *domain, const char *file, const int line,va_end (args); } -#ifdef HAVE_LIBUNWIND print_backtrace (); -#endif if (run_under_gdb ())abort ();
@@ -1876,9 +1872,8 @@ static void fatal_sig_handler(int sig) igt_exitcode =128 + sig; failed_one = true; -#ifdef HAVE_LIBUNWIND print_backtrace_sig_safe (); -#endif +if (in_subtest)exit_subtest ("CRASH" ); }
meson.build +1 -1
@@ -38,6 +38,7 @@ libdrm_amdgpu = dependency('libdrm_amdgpu', required : false) pciaccess = dependency('pciaccess', version : '>=0.10') libkmod = dependency('libkmod') libprocps = dependency('libprocps', required : true) +libunwind = dependency('libunwind', required : true) valgrind = dependency('valgrind', required : false) if valgrind.found()
@@ -56,7 +57,6 @@ if glib.found() config.set('HAVE_GLIB', 1) endif -libunwind = dependency('libunwind') gsl = dependency('gsl', required : false) alsa = dependency('alsa', required : false)
Signature · 6 lines
2.13.6 _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Arkadiusz Hiler (2017-12-01 13:19:54)
Quoted 3 lines
With Android support gone there is not much reason for keeping libunwind dependency optional. This also deals (cheaply!) with ifdefs covering huge portions of code, removing a placement minefield.
Could also force building with frame-pointers? I'm wonder if that would help with the less-than-useful stacktraces I get...
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoted 8 lines · Chris Wilson
Quoting Arkadiusz Hiler (2017-12-01 13:19:54)
Quoted 3 lines
With Android support gone there is not much reason for keeping libunwind dependency optional. This also deals (cheaply!) with ifdefs covering huge portions of code, removing a placement minefield.
Could also force building with frame-pointers? I'm wonder if that would help with the less-than-useful stacktraces I get...
-Chris
Give it a shot. Spin a series forcing FPs through the CI.
Thanks for the review, merged with the unnecessary newline removed.
Signature · 6 lines
Cheers, Arek _______________________________________________ Intel-gfx mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.BAT: success for igt: Make dependency on libunwind mandatory
In reply to Arkadiusz Hiler== Series Details ==
== Series Details ==
Series: igt: Make dependency on libunwind mandatory
URL : https://patchwork.freedesktop.org/series/34752/
State : success
== Summary ==
IGT patchset tested on top of latest successful build 476c4b462e0453c70ee81664c0227fdddc26cbd0 igt/gem_eio: Increase wakeup delay for in-flight-suspend
with latest DRM-Tip kernel build CI_DRM_3429f0e4ac384907 drm-tip: 2017y-12m-01d-13h-14m-22s UTC integration manifest
No testlist changes.
Test debugfs_test:
Subgroup read_all_entries:
dmesg-fail -> DMESG-WARN (fi-elk-e7500) fdo#103989
Test gem_exec_reloc:
Subgroup basic-gtt-active:
fail -> PASS (fi-gdg-551) fdo#102582 +3
Test gem_mmap_gtt:
Subgroup basic-small-bo-tiledx:
pass -> FAIL (fi-gdg-551) fdo#102575fdo#103989 https://bugs.freedesktop.org/show_bug.cgi?id=103989
fdo#102582 https://bugs.freedesktop.org/show_bug.cgi?id=102582
fdo#102575 https://bugs.freedesktop.org/show_bug.cgi?id=102575
fi-bdw-5557u total:288 pass:267 dwarn:0 dfail:0 fail:0 skip:21 time:446s fi-bdw-gvtdvm total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:443s fi-blb-e6850 total:288 pass:223 dwarn:1 dfail:0 fail:0 skip:64 time:387s fi-bsw-n3050 total:288 pass:242 dwarn:0 dfail:0 fail:0 skip:46 time:525s fi-bwr-2160 total:288 pass:183 dwarn:0 dfail:0 fail:0 skip:105 time:282s fi-bxt-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:517s fi-bxt-j4205 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:513s fi-byt-j1900 total:288 pass:253 dwarn:0 dfail:0 fail:0 skip:35 time:494s fi-byt-n2820 total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:482s fi-elk-e7500 total:224 pass:162 dwarn:16 dfail:0 fail:0 skip:45 fi-gdg-551 total:288 pass:178 dwarn:1 dfail:0 fail:1 skip:108 time:269s fi-glk-1 total:288 pass:260 dwarn:0 dfail:0 fail:0 skip:28 time:540s fi-hsw-4770 total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:382s fi-hsw-4770r total:288 pass:224 dwarn:0 dfail:0 fail:0 skip:64 time:260s fi-ilk-650 total:288 pass:228 dwarn:0 dfail:0 fail:0 skip:60 time:398s fi-ivb-3520m total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:486s fi-ivb-3770 total:288 pass:259 dwarn:0 dfail:0 fail:0 skip:29 time:448s fi-kbl-7500u total:288 pass:263 dwarn:1 dfail:0 fail:0 skip:24 time:493s fi-kbl-7560u total:288 pass:269 dwarn:0 dfail:0 fail:0 skip:19 time:534s fi-kbl-7567u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:477s fi-kbl-r total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:530s fi-pnv-d510 total:288 pass:222 dwarn:1 dfail:0 fail:0 skip:65 time:599s fi-skl-6260u total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:454s fi-skl-6600u total:288 pass:261 dwarn:0 dfail:0 fail:0 skip:27 time:547s fi-skl-6700hq total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:564s fi-skl-6700k total:288 pass:264 dwarn:0 dfail:0 fail:0 skip:24 time:519s fi-skl-6770hq total:288 pass:268 dwarn:0 dfail:0 fail:0 skip:20 time:499s fi-skl-gvtdvm total:288 pass:265 dwarn:0 dfail:0 fail:0 skip:23 time:448s fi-snb-2520m total:288 pass:249 dwarn:0 dfail:0 fail:0 skip:39 time:550s fi-snb-2600 total:288 pass:248 dwarn:0 dfail:0 fail:0 skip:40 time:421s Blacklisted hosts: fi-cfl-s2 total:288 pass:262 dwarn:0 dfail:0 fail:0 skip:26 time:614s fi-glk-dsi total:288 pass:258 dwarn:0 dfail:0 fail:0 skip:30 time:492s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_578/
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Quoting Arkadiusz Hiler (2017-12-01 13:19:54)
Quoted 18 lines
With Android support gone there is not much reason for keeping libunwind dependency optional. This also deals (cheaply!) with ifdefs covering huge portions of code, removing a placement minefield.
Cc Tvrtko Ursulin <[email protected]>Cc Chris Wilson <[email protected]>Signed-off-by Arkadiusz Hiler <[email protected]>--- configure.ac | 12 ++---------- lib/igt_core.c | 13 ++++--------- meson.build | 2 +- 3 files changed, 7 insertions(+), 20 deletions(-)configure.ac +0
-0
configure.ac PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.82]) · line 130
Quoted 7 lines
configure.ac +2
-0@@ -124,8 +124,10 @@ PKG_CHECK_MODULES(DRM, [libdrm >= 2.4.82]) PKG_CHECK_MODULES(PCIACCESS, [pciaccess >= 0.10]) PKG_CHECK_MODULES(KMOD, [libkmod]) PKG_CHECK_MODULES(PROCPS, [libprocps]) +PKG_CHECK_MODULES(LIBUNWIND, [libunwind]) PKG_CHECK_MODULES(VALGRIND, [valgrind], [have_valgrind=yes], [have_valgrind=no]) +
Surplus '\n'.
-Chris
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Patchwork
CI✓ Fi.CI.IGT: success for igt: Make dependency on libunwind mandatory
In reply to Arkadiusz Hiler== Series Details ==
== Series Details ==
Series: igt: Make dependency on libunwind mandatory
URL : https://patchwork.freedesktop.org/series/34752/
State : success
== Summary ==
Test gem_tiled_swapping:
Subgroup non-threaded:
incomplete -> PASS (shard-snb) fdo#104009 +1
Test kms_frontbuffer_tracking:
Subgroup fbc-1p-offscren-pri-shrfb-draw-blt:
pass -> FAIL (shard-snb) fdo#101623
Test drv_module_reload:
Subgroup basic-reload-inject:
pass -> DMESG-WARN (shard-snb) fdo#102707 +1
Test kms_plane:
Subgroup plane-panning-bottom-right-suspend-pipe-a-planes:
incomplete -> PASS (shard-hsw)
Test gem_busy:
Subgroup close-race:
fail -> PASS (shard-snb) fdo#103829fdo#104009 https://bugs.freedesktop.org/show_bug.cgi?id=104009
fdo#101623 https://bugs.freedesktop.org/show_bug.cgi?id=101623
fdo#102707 https://bugs.freedesktop.org/show_bug.cgi?id=102707
fdo#103829 https://bugs.freedesktop.org/show_bug.cgi?id=103829
shard-hsw total:2663 pass:1536 dwarn:1 dfail:0 fail:10 skip:1116 time:9535s shard-snb total:2663 pass:1306 dwarn:3 dfail:0 fail:12 skip:1342 time:8174s Blacklisted hosts: shard-apl total:2663 pass:1689 dwarn:3 dfail:0 fail:22 skip:949 time:13669s shard-kbl total:2663 pass:1805 dwarn:1 dfail:0 fail:24 skip:833 time:10935s
== Logs ==
For more details see: https://intel-gfx-ci.01.org/tree/drm-tip/IGTPW_578/shards.html
_______________________________________________
Intel-gfx mailing list
[email protected]
https://lists.freedesktop.org/mailman/listinfo/intel-gfx