[Mesa-dev] [PATCH v2 09/22] configure.ac, meson: Check for SPIRV-Tools

[Pierre Moreau]

On 2018-01-23 — 14:20, Jan Vesely wrote:
> On Tue, 2018-01-23 at 01:33 +0100, Pierre Moreau wrote:
> > Signed-off-by: Pierre Moreau <pierre.morrow at free.fr>
> 
> do these tools handle the original SPIR format as well? can this be
> used to support cl_khr_spir?
> 
> Jan

They do not I’m afraid. I just saw that SPIR-Tools [1] exists, hosted by
Khronos as well, but I haven’t interacted with those tools in the slightest.

[1]: https://github.com/KhronosGroup/SPIR-Tools

Pierre

> 
> > ---
> >  configure.ac | 5 +++++
> >  meson.build  | 2 ++
> >  2 files changed, 7 insertions(+)
> > 
> > diff --git a/configure.ac b/configure.ac
> > index 7c1fbe0ed1..8c50ea6792 100644
> > --- a/configure.ac
> > +++ b/configure.ac
> > @@ -2373,6 +2373,11 @@ AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
> >  AC_SUBST([OPENCL_LIBNAME])
> >  AC_SUBST([CLANG_RESOURCE_DIR])
> >  
> > +AS_IF([test "x$enable_opencl" = xyes], [
> > +    PKG_CHECK_MODULES([SPIRV_TOOLS], [SPIRV-Tools >= 2017.3])])
> > +AC_SUBST([SPIRV_TOOLS_CFLAGS])
> > +AC_SUBST([SPIRV_TOOLS_LIBS])
> > +
> >  dnl
> >  dnl Gallium configuration
> >  dnl
> > diff --git a/meson.build b/meson.build
> > index f3179c3806..78315020fa 100644
> > --- a/meson.build
> > +++ b/meson.build
> > @@ -596,10 +596,12 @@ if _opencl != 'disabled'
> >  
> >    # TODO: alitvec?
> >    dep_clc = dependency('libclc')
> > +  dep_spirv_tools = dependency('SPIRV-Tools', version : '>= 2017.3')
> >    with_gallium_opencl = true
> >    with_opencl_icd = _opencl == 'icd'
> >  else
> >    dep_clc = []
> > +  dep_spirv_tools = []
> >    with_gallium_opencl = false
> >    with_gallium_icd = false
> >  endif