[i-g-t,3/6] meson: Install benchmarks to $libexec/intel-gpu-tools/benchmarks
diff mbox

Message ID 1512654031-22342-3-git-send-email-petri.latvala@intel.com
State New
Headers show

Commit Message

Petri Latvala Dec. 7, 2017, 1:40 p.m. UTC
Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
---
 benchmarks/meson.build | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Ville Syrjälä Dec. 7, 2017, 4:32 p.m. UTC | #1
On Thu, Dec 07, 2017 at 03:40:28PM +0200, Petri Latvala wrote:
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  benchmarks/meson.build | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/benchmarks/meson.build b/benchmarks/meson.build
> index 4afd204f..26d65c4b 100644
> --- a/benchmarks/meson.build
> +++ b/benchmarks/meson.build
> @@ -31,8 +31,12 @@ foreach prog : benchmark_progs
>  	# FIXME meson doesn't like binaries with the same name
>  	# meanwhile just suffix with _bench
>  	executable(prog + '_bench', prog + '.c',
> +		   install : true,
> +		   install_dir : join_paths(get_option('libexecdir'), 'intel-gpu-tools', 'benchmarks'),

Could maybe define this benchmarksdir or something?

Either way
Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>

>  		   dependencies : test_deps)
>  endforeach
>  
>  executable('gem_wsim_bench', 'gem_wsim.c',
> +	   install : true,
> +	   install_dir : join_paths(get_option('libexecdir'), 'intel-gpu-tools', 'benchmarks'),
>  	   dependencies : test_deps + [ lib_igt_perf ])
> -- 
> 2.14.1
> 
> _______________________________________________
> Intel-gfx mailing list
> Intel-gfx@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/intel-gfx
Chris Wilson Dec. 7, 2017, 4:48 p.m. UTC | #2
Quoting Petri Latvala (2017-12-07 13:40:28)
> Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> ---
>  benchmarks/meson.build | 4 ++++
>  1 file changed, 4 insertions(+)
> 
> diff --git a/benchmarks/meson.build b/benchmarks/meson.build
> index 4afd204f..26d65c4b 100644
> --- a/benchmarks/meson.build
> +++ b/benchmarks/meson.build
> @@ -31,8 +31,12 @@ foreach prog : benchmark_progs
>         # FIXME meson doesn't like binaries with the same name
>         # meanwhile just suffix with _bench
>         executable(prog + '_bench', prog + '.c',
> +                  install : true,
> +                  install_dir : join_paths(get_option('libexecdir'), 'intel-gpu-tools', 'benchmarks'),

Isn't the package name now "igt-gpu-tools" ?
-Chris
Daniel Vetter Dec. 7, 2017, 5:52 p.m. UTC | #3
On Thu, Dec 07, 2017 at 06:32:58PM +0200, Ville Syrjälä wrote:
> On Thu, Dec 07, 2017 at 03:40:28PM +0200, Petri Latvala wrote:
> > Signed-off-by: Petri Latvala <petri.latvala@intel.com>
> > Cc: Daniel Vetter <daniel.vetter@ffwll.ch>
> > ---
> >  benchmarks/meson.build | 4 ++++
> >  1 file changed, 4 insertions(+)
> > 
> > diff --git a/benchmarks/meson.build b/benchmarks/meson.build
> > index 4afd204f..26d65c4b 100644
> > --- a/benchmarks/meson.build
> > +++ b/benchmarks/meson.build
> > @@ -31,8 +31,12 @@ foreach prog : benchmark_progs
> >  	# FIXME meson doesn't like binaries with the same name
> >  	# meanwhile just suffix with _bench
> >  	executable(prog + '_bench', prog + '.c',
> > +		   install : true,
> > +		   install_dir : join_paths(get_option('libexecdir'), 'intel-gpu-tools', 'benchmarks'),
> 
> Could maybe define this benchmarksdir or something?

Yeah, I think extracting all the install dirs, and defining them all in
the top-level meson.build file would be good. Maybe as a follow-up.

And +1 on igt-gpu-tools, but that's perhaps also a different thing to
tackle, there's more places. Perhaps for igt 2.0 :-)
-Daniel

> 
> Either way
> Reviewed-by: Ville Syrjälä <ville.syrjala@linux.intel.com>
> 
> >  		   dependencies : test_deps)
> >  endforeach
> >  
> >  executable('gem_wsim_bench', 'gem_wsim.c',
> > +	   install : true,
> > +	   install_dir : join_paths(get_option('libexecdir'), 'intel-gpu-tools', 'benchmarks'),
> >  	   dependencies : test_deps + [ lib_igt_perf ])
> > -- 
> > 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

Patch
diff mbox

diff --git a/benchmarks/meson.build b/benchmarks/meson.build
index 4afd204f..26d65c4b 100644
--- a/benchmarks/meson.build
+++ b/benchmarks/meson.build
@@ -31,8 +31,12 @@  foreach prog : benchmark_progs
 	# FIXME meson doesn't like binaries with the same name
 	# meanwhile just suffix with _bench
 	executable(prog + '_bench', prog + '.c',
+		   install : true,
+		   install_dir : join_paths(get_option('libexecdir'), 'intel-gpu-tools', 'benchmarks'),
 		   dependencies : test_deps)
 endforeach
 
 executable('gem_wsim_bench', 'gem_wsim.c',
+	   install : true,
+	   install_dir : join_paths(get_option('libexecdir'), 'intel-gpu-tools', 'benchmarks'),
 	   dependencies : test_deps + [ lib_igt_perf ])