* [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so
@ 2017-09-14 1:10 Jordan Justen
2017-09-14 1:10 ` [PATCH 2/6] meson: Install libigt.so Jordan Justen
` (5 more replies)
0 siblings, 6 replies; 15+ messages in thread
From: Jordan Justen @ 2017-09-14 1:10 UTC (permalink / raw)
To: Intel GFX discussion
The meson shared_library function appears to hard code prefixing the
library name with 'lib'.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
tools/Makefile.am | 2 +-
tools/intel_aubdump.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/Makefile.am b/tools/Makefile.am
index 2c7b5799..73811060 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -24,7 +24,7 @@ AM_LDFLAGS = -Wl,--as-needed
# aubdumper
-module_LTLIBRARIES = intel_aubdump.la
+module_LTLIBRARIES = libintel_aubdump.la
moduledir = $(libdir)
intel_aubdump_la_LDFLAGS = -module -avoid-version -no-undefined
intel_aubdump_la_SOURCES = aubdump.c
diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in
index 977fe951..8bc6b19d 100644
--- a/tools/intel_aubdump.in
+++ b/tools/intel_aubdump.in
@@ -105,7 +105,7 @@ prefix=@prefix@
exec_prefix=@exec_prefix@
libdir=@libdir@
-LD_PRELOAD=${libdir}/intel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \
+LD_PRELOAD=${libdir}/libintel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \
exec -- "$@" 3<<EOF
`echo -e $args`
EOF
--
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] 15+ messages in thread
* [PATCH 2/6] meson: Install libigt.so
2017-09-14 1:10 [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Jordan Justen
@ 2017-09-14 1:10 ` Jordan Justen
2017-09-14 19:13 ` Ville Syrjälä
2017-09-14 1:10 ` [PATCH 3/6] meson: Install libintel_aubdump.so Jordan Justen
` (4 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Jordan Justen @ 2017-09-14 1:10 UTC (permalink / raw)
To: Intel GFX discussion
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
lib/meson.build | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/meson.build b/lib/meson.build
index b78e42dc..0d379d90 100644
--- a/lib/meson.build
+++ b/lib/meson.build
@@ -170,6 +170,7 @@ lib_igt_build = shared_library('igt',
['dummy.c'],
link_whole: lib_intermediates,
dependencies: lib_deps,
+ install : true
)
lib_igt = declare_dependency(link_with : lib_igt_build,
--
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] 15+ messages in thread
* [PATCH 3/6] meson: Install libintel_aubdump.so
2017-09-14 1:10 [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Jordan Justen
2017-09-14 1:10 ` [PATCH 2/6] meson: Install libigt.so Jordan Justen
@ 2017-09-14 1:10 ` Jordan Justen
2017-09-14 1:10 ` [PATCH 4/6] intel_aubdump.in: Set executable permissions (for meson build) Jordan Justen
` (3 subsequent siblings)
5 siblings, 0 replies; 15+ messages in thread
From: Jordan Justen @ 2017-09-14 1:10 UTC (permalink / raw)
To: Intel GFX discussion
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
tools/meson.build | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/tools/meson.build b/tools/meson.build
index d2d4410e..91c58760 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -54,6 +54,7 @@ foreach prog : tools_progs
dependencies : tool_deps)
endforeach
-shared_library('intel_aubdump', 'aubdump.c', dependencies : [ igt_deps, dlsym ])
+shared_library('intel_aubdump', 'aubdump.c',
+ dependencies : [ igt_deps, dlsym ], install : true)
subdir('null_state_gen')
--
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] 15+ messages in thread
* [PATCH 4/6] intel_aubdump.in: Set executable permissions (for meson build)
2017-09-14 1:10 [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Jordan Justen
2017-09-14 1:10 ` [PATCH 2/6] meson: Install libigt.so Jordan Justen
2017-09-14 1:10 ` [PATCH 3/6] meson: Install libintel_aubdump.so Jordan Justen
@ 2017-09-14 1:10 ` Jordan Justen
2017-09-14 19:06 ` Ville Syrjälä
2017-09-14 1:10 ` [PATCH 5/6] meson: Process intel_aubdump.in into intel_aubdump Jordan Justen
` (2 subsequent siblings)
5 siblings, 1 reply; 15+ messages in thread
From: Jordan Justen @ 2017-09-14 1:10 UTC (permalink / raw)
To: Intel GFX discussion
Meson detects if an input file is executable, and copies that to the
output file.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
tools/intel_aubdump.in | 0
1 file changed, 0 insertions(+), 0 deletions(-)
mode change 100644 => 100755 tools/intel_aubdump.in
diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in
old mode 100644
new mode 100755
--
2.14.1
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH 5/6] meson: Process intel_aubdump.in into intel_aubdump
2017-09-14 1:10 [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Jordan Justen
` (2 preceding siblings ...)
2017-09-14 1:10 ` [PATCH 4/6] intel_aubdump.in: Set executable permissions (for meson build) Jordan Justen
@ 2017-09-14 1:10 ` Jordan Justen
2017-09-14 19:10 ` Ville Syrjälä
2017-09-14 1:11 ` [PATCH 6/6] intel_aubdump: Add --no-exec command option Jordan Justen
2017-09-14 11:46 ` [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Petri Latvala
5 siblings, 1 reply; 15+ messages in thread
From: Jordan Justen @ 2017-09-14 1:10 UTC (permalink / raw)
To: Intel GFX discussion
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
tools/meson.build | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/tools/meson.build b/tools/meson.build
index 91c58760..20b63cce 100644
--- a/tools/meson.build
+++ b/tools/meson.build
@@ -57,4 +57,11 @@ endforeach
shared_library('intel_aubdump', 'aubdump.c',
dependencies : [ igt_deps, dlsym ], install : true)
+conf_data = configuration_data()
+conf_data.set('prefix', get_option('prefix'))
+conf_data.set('exec_prefix', '${prefix}')
+conf_data.set('libdir', join_paths('${prefix}', get_option('libdir')))
+configure_file(input : 'intel_aubdump.in', output : 'intel_aubdump',
+ configuration : conf_data, install_dir : get_option('bindir'))
+
subdir('null_state_gen')
--
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] 15+ messages in thread
* [PATCH 6/6] intel_aubdump: Add --no-exec command option
2017-09-14 1:10 [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Jordan Justen
` (3 preceding siblings ...)
2017-09-14 1:10 ` [PATCH 5/6] meson: Process intel_aubdump.in into intel_aubdump Jordan Justen
@ 2017-09-14 1:11 ` Jordan Justen
2017-09-14 1:23 ` Jordan Justen
2017-09-14 11:46 ` [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Petri Latvala
5 siblings, 1 reply; 15+ messages in thread
From: Jordan Justen @ 2017-09-14 1:11 UTC (permalink / raw)
To: Intel GFX discussion
In some cases it is preferable to not send exec commands to the
kernel, but to otherwise record the exec command into the AUB file.
For example, when using the --device override option, it might be best
to avoid passing the EXEC ioctls through to the kernel.
Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
---
tools/aubdump.c | 13 +++++++++++--
tools/intel_aubdump.in | 7 +++++++
2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/tools/aubdump.c b/tools/aubdump.c
index 4392e589..6961cd51 100644
--- a/tools/aubdump.c
+++ b/tools/aubdump.c
@@ -58,6 +58,7 @@ static int gen = 0;
static int verbose = 0;
static bool device_override;
static uint32_t device;
+static bool no_exec = false;
#define MAX_BO_COUNT 64 * 1024
@@ -567,6 +568,8 @@ maybe_init(void)
"intel_aubdump: failed to parse device id '%s'",
value);
device_override = true;
+ } else if (!strcmp(key, "no_exec")) {
+ no_exec = true;
} else if (!strcmp(key, "file")) {
filename = strdup(value);
files[0] = fopen(filename, "w+");
@@ -645,7 +648,10 @@ ioctl(int fd, unsigned long request, ...)
"application uses DRM_IOCTL_I915_GEM_EXECBUFFER, not handled\n");
once = true;
}
- return libc_ioctl(fd, request, argp);
+ if (verbose && no_exec)
+ printf("Skipping DRM_IOCTL_I915_GEM_EXECBUFFER "
+ "ioctl (--no-exec)\n");
+ return no_exec ? 0 : libc_ioctl(fd, request, argp);
}
case DRM_IOCTL_I915_GEM_EXECBUFFER2:
@@ -654,7 +660,10 @@ ioctl(int fd, unsigned long request, ...)
if (device_override)
return 0;
- return libc_ioctl(fd, request, argp);
+ if (verbose && no_exec)
+ printf("Skipping DRM_IOCTL_I915_GEM_EXECBUFFER2 "
+ "ioctl (--no-exec)\n");
+ return no_exec ? 0 : libc_ioctl(fd, request, argp);
}
case DRM_IOCTL_I915_GEM_CREATE: {
diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in
index 8bc6b19d..ce77c849 100755
--- a/tools/intel_aubdump.in
+++ b/tools/intel_aubdump.in
@@ -15,6 +15,9 @@ contents and execution of the GEM application.
--device=ID Override PCI ID of the reported device
+ -n, --no-exec Record exec commands in the AUB file, but don't send
+ them to the kernel
+
-v Enable verbose output
--help Display this help message and exit
@@ -79,6 +82,10 @@ while true; do
add_arg "device=${1##--device=}"
shift
;;
+ -n|--no-exec)
+ add_arg "no_exec=1"
+ shift
+ ;;
--help)
show_help
;;
--
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] 15+ messages in thread
* Re: [PATCH 6/6] intel_aubdump: Add --no-exec command option
2017-09-14 1:11 ` [PATCH 6/6] intel_aubdump: Add --no-exec command option Jordan Justen
@ 2017-09-14 1:23 ` Jordan Justen
0 siblings, 0 replies; 15+ messages in thread
From: Jordan Justen @ 2017-09-14 1:23 UTC (permalink / raw)
To: Intel GFX discussion
On 2017-09-13 18:11:00, Jordan Justen wrote:
> In some cases it is preferable to not send exec commands to the
> kernel, but to otherwise record the exec command into the AUB file.
>
> For example, when using the --device override option, it might be best
> to avoid passing the EXEC ioctls through to the kernel.
>
> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
> ---
> tools/aubdump.c | 13 +++++++++++--
> tools/intel_aubdump.in | 7 +++++++
> 2 files changed, 18 insertions(+), 2 deletions(-)
>
> diff --git a/tools/aubdump.c b/tools/aubdump.c
> index 4392e589..6961cd51 100644
> --- a/tools/aubdump.c
> +++ b/tools/aubdump.c
> @@ -58,6 +58,7 @@ static int gen = 0;
> static int verbose = 0;
> static bool device_override;
> static uint32_t device;
> +static bool no_exec = false;
>
> #define MAX_BO_COUNT 64 * 1024
>
> @@ -567,6 +568,8 @@ maybe_init(void)
> "intel_aubdump: failed to parse device id '%s'",
> value);
> device_override = true;
> + } else if (!strcmp(key, "no_exec")) {
> + no_exec = true;
> } else if (!strcmp(key, "file")) {
> filename = strdup(value);
> files[0] = fopen(filename, "w+");
> @@ -645,7 +648,10 @@ ioctl(int fd, unsigned long request, ...)
> "application uses DRM_IOCTL_I915_GEM_EXECBUFFER, not handled\n");
> once = true;
> }
> - return libc_ioctl(fd, request, argp);
> + if (verbose && no_exec)
> + printf("Skipping DRM_IOCTL_I915_GEM_EXECBUFFER "
> + "ioctl (--no-exec)\n");
> + return no_exec ? 0 : libc_ioctl(fd, request, argp);
> }
>
> case DRM_IOCTL_I915_GEM_EXECBUFFER2:
> @@ -654,7 +660,10 @@ ioctl(int fd, unsigned long request, ...)
> if (device_override)
> return 0;
Hmm, I guess I just looked at the DRM_IOCTL_I915_GEM_EXECBUFFER case
and then glossed over the fact that DRM_IOCTL_I915_GEM_EXECBUFFER2
already skips exec when --device is used.
So, this patch should be dropped...
I guess the other meson ones might be useful.
-Jordan
>
> - return libc_ioctl(fd, request, argp);
> + if (verbose && no_exec)
> + printf("Skipping DRM_IOCTL_I915_GEM_EXECBUFFER2 "
> + "ioctl (--no-exec)\n");
> + return no_exec ? 0 : libc_ioctl(fd, request, argp);
> }
>
> case DRM_IOCTL_I915_GEM_CREATE: {
> diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in
> index 8bc6b19d..ce77c849 100755
> --- a/tools/intel_aubdump.in
> +++ b/tools/intel_aubdump.in
> @@ -15,6 +15,9 @@ contents and execution of the GEM application.
>
> --device=ID Override PCI ID of the reported device
>
> + -n, --no-exec Record exec commands in the AUB file, but don't send
> + them to the kernel
> +
> -v Enable verbose output
>
> --help Display this help message and exit
> @@ -79,6 +82,10 @@ while true; do
> add_arg "device=${1##--device=}"
> shift
> ;;
> + -n|--no-exec)
> + add_arg "no_exec=1"
> + shift
> + ;;
> --help)
> show_help
> ;;
> --
> 2.14.1
>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so
2017-09-14 1:10 [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Jordan Justen
` (4 preceding siblings ...)
2017-09-14 1:11 ` [PATCH 6/6] intel_aubdump: Add --no-exec command option Jordan Justen
@ 2017-09-14 11:46 ` Petri Latvala
2017-09-14 17:53 ` Jordan Justen
5 siblings, 1 reply; 15+ messages in thread
From: Petri Latvala @ 2017-09-14 11:46 UTC (permalink / raw)
To: Jordan Justen; +Cc: Intel GFX discussion
On Wed, Sep 13, 2017 at 06:10:55PM -0700, Jordan Justen wrote:
> The meson shared_library function appears to hard code prefixing the
> library name with 'lib'.
>
> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
> ---
> tools/Makefile.am | 2 +-
> tools/intel_aubdump.in | 2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/tools/Makefile.am b/tools/Makefile.am
> index 2c7b5799..73811060 100644
> --- a/tools/Makefile.am
> +++ b/tools/Makefile.am
> @@ -24,7 +24,7 @@ AM_LDFLAGS = -Wl,--as-needed
>
> # aubdumper
>
> -module_LTLIBRARIES = intel_aubdump.la
> +module_LTLIBRARIES = libintel_aubdump.la
> moduledir = $(libdir)
> intel_aubdump_la_LDFLAGS = -module -avoid-version -no-undefined
> intel_aubdump_la_SOURCES = aubdump.c
> diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in
> index 977fe951..8bc6b19d 100644
> --- a/tools/intel_aubdump.in
> +++ b/tools/intel_aubdump.in
> @@ -105,7 +105,7 @@ prefix=@prefix@
> exec_prefix=@exec_prefix@
> libdir=@libdir@
>
> -LD_PRELOAD=${libdir}/intel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \
> +LD_PRELOAD=${libdir}/libintel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \
> exec -- "$@" 3<<EOF
Ville's series makes meson build intel_aubdump.so instead. Can you
take a look at his series and slap reviews where appropriate?
https://patchwork.freedesktop.org/series/30155/
--
Petri Latvala
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so
2017-09-14 11:46 ` [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Petri Latvala
@ 2017-09-14 17:53 ` Jordan Justen
0 siblings, 0 replies; 15+ messages in thread
From: Jordan Justen @ 2017-09-14 17:53 UTC (permalink / raw)
To: Petri Latvala, Ville Syrjala; +Cc: Intel GFX discussion
On 2017-09-14 04:46:00, Petri Latvala wrote:
> On Wed, Sep 13, 2017 at 06:10:55PM -0700, Jordan Justen wrote:
> > The meson shared_library function appears to hard code prefixing the
> > library name with 'lib'.
> >
> > Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
> > ---
> > tools/Makefile.am | 2 +-
> > tools/intel_aubdump.in | 2 +-
> > 2 files changed, 2 insertions(+), 2 deletions(-)
> >
> > diff --git a/tools/Makefile.am b/tools/Makefile.am
> > index 2c7b5799..73811060 100644
> > --- a/tools/Makefile.am
> > +++ b/tools/Makefile.am
> > @@ -24,7 +24,7 @@ AM_LDFLAGS = -Wl,--as-needed
> >
> > # aubdumper
> >
> > -module_LTLIBRARIES = intel_aubdump.la
> > +module_LTLIBRARIES = libintel_aubdump.la
> > moduledir = $(libdir)
> > intel_aubdump_la_LDFLAGS = -module -avoid-version -no-undefined
> > intel_aubdump_la_SOURCES = aubdump.c
> > diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in
> > index 977fe951..8bc6b19d 100644
> > --- a/tools/intel_aubdump.in
> > +++ b/tools/intel_aubdump.in
> > @@ -105,7 +105,7 @@ prefix=@prefix@
> > exec_prefix=@exec_prefix@
> > libdir=@libdir@
> >
> > -LD_PRELOAD=${libdir}/intel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \
> > +LD_PRELOAD=${libdir}/libintel_aubdump.so${LD_PPRELOAD:+:${LD_PRELOAD}} \
> > exec -- "$@" 3<<EOF
>
>
> Ville's series makes meson build intel_aubdump.so instead. Can you
> take a look at his series and slap reviews where appropriate?
Oh, nice. I'll talk a look.
Ville, Petri: After skimming Ville's series, it looks like maybe
patches 2, 4 and 5 from this series might still be useful. Or, did I
miss similar patches on the list for that as well?
-Jordan
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 4/6] intel_aubdump.in: Set executable permissions (for meson build)
2017-09-14 1:10 ` [PATCH 4/6] intel_aubdump.in: Set executable permissions (for meson build) Jordan Justen
@ 2017-09-14 19:06 ` Ville Syrjälä
0 siblings, 0 replies; 15+ messages in thread
From: Ville Syrjälä @ 2017-09-14 19:06 UTC (permalink / raw)
To: Jordan Justen; +Cc: Intel GFX discussion
On Wed, Sep 13, 2017 at 06:10:58PM -0700, Jordan Justen wrote:
> Meson detects if an input file is executable, and copies that to the
> output file.
>
> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> ---
> tools/intel_aubdump.in | 0
> 1 file changed, 0 insertions(+), 0 deletions(-)
> mode change 100644 => 100755 tools/intel_aubdump.in
>
> diff --git a/tools/intel_aubdump.in b/tools/intel_aubdump.in
> old mode 100644
> new mode 100755
> --
> 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] 15+ messages in thread
* Re: [PATCH 5/6] meson: Process intel_aubdump.in into intel_aubdump
2017-09-14 1:10 ` [PATCH 5/6] meson: Process intel_aubdump.in into intel_aubdump Jordan Justen
@ 2017-09-14 19:10 ` Ville Syrjälä
0 siblings, 0 replies; 15+ messages in thread
From: Ville Syrjälä @ 2017-09-14 19:10 UTC (permalink / raw)
To: Jordan Justen; +Cc: Intel GFX discussion
On Wed, Sep 13, 2017 at 06:10:59PM -0700, Jordan Justen wrote:
> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
> ---
> tools/meson.build | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/tools/meson.build b/tools/meson.build
> index 91c58760..20b63cce 100644
> --- a/tools/meson.build
> +++ b/tools/meson.build
> @@ -57,4 +57,11 @@ endforeach
> shared_library('intel_aubdump', 'aubdump.c',
> dependencies : [ igt_deps, dlsym ], install : true)
>
> +conf_data = configuration_data()
> +conf_data.set('prefix', get_option('prefix'))
> +conf_data.set('exec_prefix', '${prefix}')
> +conf_data.set('libdir', join_paths('${prefix}', get_option('libdir')))
> +configure_file(input : 'intel_aubdump.in', output : 'intel_aubdump',
> + configuration : conf_data, install_dir : get_option('bindir'))
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
I haven't yet figured out why meson installs something without
explicit guidance, and other things it leaves behind until you tell it
otherwise. This one didn't seem to need the manual prodding. Someone
care to clue me in on the rules?
> +
> subdir('null_state_gen')
> --
> 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] 15+ messages in thread
* Re: [PATCH 2/6] meson: Install libigt.so
2017-09-14 1:10 ` [PATCH 2/6] meson: Install libigt.so Jordan Justen
@ 2017-09-14 19:13 ` Ville Syrjälä
2017-09-15 0:20 ` Jordan Justen
0 siblings, 1 reply; 15+ messages in thread
From: Ville Syrjälä @ 2017-09-14 19:13 UTC (permalink / raw)
To: Jordan Justen; +Cc: Intel GFX discussion
On Wed, Sep 13, 2017 at 06:10:56PM -0700, Jordan Justen wrote:
> Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
> ---
> lib/meson.build | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/lib/meson.build b/lib/meson.build
> index b78e42dc..0d379d90 100644
> --- a/lib/meson.build
> +++ b/lib/meson.build
> @@ -170,6 +170,7 @@ lib_igt_build = shared_library('igt',
> ['dummy.c'],
> link_whole: lib_intermediates,
> dependencies: lib_deps,
> + install : true
> )
I don't actually know what the plan is w.r.t. installing the lib, so
I'll leave this one for someone else to ack/nack.
>
> lib_igt = declare_dependency(link_with : lib_igt_build,
> --
> 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] 15+ messages in thread
* Re: [PATCH 2/6] meson: Install libigt.so
2017-09-14 19:13 ` Ville Syrjälä
@ 2017-09-15 0:20 ` Jordan Justen
2017-09-15 11:56 ` Petri Latvala
0 siblings, 1 reply; 15+ messages in thread
From: Jordan Justen @ 2017-09-15 0:20 UTC (permalink / raw)
To: Ville Syrjälä, Petri Latvala; +Cc: Intel GFX discussion
On 2017-09-14 12:13:08, Ville Syrjälä wrote:
> On Wed, Sep 13, 2017 at 06:10:56PM -0700, Jordan Justen wrote:
> > Signed-off-by: Jordan Justen <jordan.l.justen@intel.com>
> > ---
> > lib/meson.build | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/lib/meson.build b/lib/meson.build
> > index b78e42dc..0d379d90 100644
> > --- a/lib/meson.build
> > +++ b/lib/meson.build
> > @@ -170,6 +170,7 @@ lib_igt_build = shared_library('igt',
> > ['dummy.c'],
> > link_whole: lib_intermediates,
> > dependencies: lib_deps,
> > + install : true
> > )
>
> I don't actually know what the plan is w.r.t. installing the lib, so
> I'll leave this one for someone else to ack/nack.
Ok. I just noted that the aubdump library would not load because it
linked to this library and couldn't find it until it was installed.
-Jordan
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/6] meson: Install libigt.so
2017-09-15 0:20 ` Jordan Justen
@ 2017-09-15 11:56 ` Petri Latvala
2017-09-15 13:17 ` Ville Syrjälä
0 siblings, 1 reply; 15+ messages in thread
From: Petri Latvala @ 2017-09-15 11:56 UTC (permalink / raw)
To: Jordan Justen; +Cc: Intel GFX discussion
On Thu, Sep 14, 2017 at 05:20:47PM -0700, Jordan Justen wrote:
> On 2017-09-14 12:13:08, Ville Syrjälä wrote:
> > I don't actually know what the plan is w.r.t. installing the lib, so
> > I'll leave this one for someone else to ack/nack.
The plan is to install the lib.
The concerns with installing the lib are that we should keep support
for running the IGT binaries without and with installing. That means:
- Setting things up so that the runtime linker can find the installed
.so for installed executables, and builddir-.so for
builddir-executables.
- Making sure the linked .so originates from the same build as the
executable, using some better error message than just corrupting the
call stack. Nailing down an ABI for libigt.so is impossible.
With that said: Meson build system in general, and the existence of
the .so in particular is for experimental users who know they get to
keep both pieces when things break. And installing the .so is anyway
something to be done sooner or later.
Acked-by: Petri Latvala <petri.latvala@intel.com>
_______________________________________________
Intel-gfx mailing list
Intel-gfx@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/intel-gfx
^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH 2/6] meson: Install libigt.so
2017-09-15 11:56 ` Petri Latvala
@ 2017-09-15 13:17 ` Ville Syrjälä
0 siblings, 0 replies; 15+ messages in thread
From: Ville Syrjälä @ 2017-09-15 13:17 UTC (permalink / raw)
To: Petri Latvala; +Cc: Intel GFX discussion
On Fri, Sep 15, 2017 at 02:56:04PM +0300, Petri Latvala wrote:
> On Thu, Sep 14, 2017 at 05:20:47PM -0700, Jordan Justen wrote:
> > On 2017-09-14 12:13:08, Ville Syrjälä wrote:
> > > I don't actually know what the plan is w.r.t. installing the lib, so
> > > I'll leave this one for someone else to ack/nack.
>
> The plan is to install the lib.
>
> The concerns with installing the lib are that we should keep support
> for running the IGT binaries without and with installing. That means:
>
> - Setting things up so that the runtime linker can find the installed
> .so for installed executables, and builddir-.so for
> builddir-executables.
>
> - Making sure the linked .so originates from the same build as the
> executable, using some better error message than just corrupting the
> call stack. Nailing down an ABI for libigt.so is impossible.
>
> With that said: Meson build system in general, and the existence of
> the .so in particular is for experimental users who know they get to
> keep both pieces when things break. And installing the .so is anyway
> something to be done sooner or later.
>
> Acked-by: Petri Latvala <petri.latvala@intel.com>
Cool. I've pushed the three patches from this series, and my own series
(with the whitespace fixed) to master. Thanks for the patches and
reviews.
--
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] 15+ messages in thread
end of thread, other threads:[~2017-09-15 13:17 UTC | newest]
Thread overview: 15+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-09-14 1:10 [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Jordan Justen
2017-09-14 1:10 ` [PATCH 2/6] meson: Install libigt.so Jordan Justen
2017-09-14 19:13 ` Ville Syrjälä
2017-09-15 0:20 ` Jordan Justen
2017-09-15 11:56 ` Petri Latvala
2017-09-15 13:17 ` Ville Syrjälä
2017-09-14 1:10 ` [PATCH 3/6] meson: Install libintel_aubdump.so Jordan Justen
2017-09-14 1:10 ` [PATCH 4/6] intel_aubdump.in: Set executable permissions (for meson build) Jordan Justen
2017-09-14 19:06 ` Ville Syrjälä
2017-09-14 1:10 ` [PATCH 5/6] meson: Process intel_aubdump.in into intel_aubdump Jordan Justen
2017-09-14 19:10 ` Ville Syrjälä
2017-09-14 1:11 ` [PATCH 6/6] intel_aubdump: Add --no-exec command option Jordan Justen
2017-09-14 1:23 ` Jordan Justen
2017-09-14 11:46 ` [PATCH 1/6] intel_aubdump: Rename intel_aubdump.so to libintel_aubdump.so Petri Latvala
2017-09-14 17:53 ` Jordan Justen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox