[Mesa-dev] [PATCH 4/4] autotools: include intel_tiled_memcopy.c

[Juan A. Suarez Romero]

On Wed, 2018-10-24 at 09:16 -0700, Dylan Baker wrote:
> Quoting Juan A. Suarez Romero (2018-10-24 09:10:37)
> > On Tue, 2018-10-23 at 15:56 -0700, Dylan Baker wrote:
> > > There are two problems with the fixed patch. First, it fails to create a
> > > dependency on the sourced .c file, so changes to intel_tiled_memcpy.c
> > > won't trigger a rebuild. It also doesn't get included in the dist
> > > tarball.
> > > 
> > > CC: Tapani Pälli <tapani.palli at intel.com>
> > > Fixes: 11b1afdc92db98e93f2ca50beeb7fc481a11e708
> > >        ("i965/tiled_memcpy: inline movntdqa loads in tiled_to_linear")
> > 
> > Nice! This indeed fixes `make distcheck`
> 
> Yup! I'm trying to get things cleaned up for the 18.3 release next week. Learned
> the hard way the last time around that I need to start on this early :)
> 

That's nice. Then maybe you are interested that master does not build with LLVM
7.0. There are some patches in the mailing list, but not sure if they fix
completely the build.

I'm wondering if building Mesa 18.3 with LLVM 7.0 should be part of the
"features" we want in the branchpoint.


> > 
> > Reviewed-by: Juan A. Suarez <jasuarez at igalia.com>
> 
> Thanks!
> 
> > 
> > 
> > > ---
> > >  src/mesa/drivers/dri/i965/Makefile.am      | 4 ++++
> > >  src/mesa/drivers/dri/i965/Makefile.sources | 3 +++
> > >  2 files changed, 7 insertions(+)
> > > 
> > > diff --git a/src/mesa/drivers/dri/i965/Makefile.am b/src/mesa/drivers/dri/i965/Makefile.am
> > > index dc19da2c4a6..fda17589cfb 100644
> > > --- a/src/mesa/drivers/dri/i965/Makefile.am
> > > +++ b/src/mesa/drivers/dri/i965/Makefile.am
> > > @@ -126,6 +126,7 @@ CLEANFILES = $(BUILT_SOURCES)
> > >  EXTRA_DIST = \
> > >       brw_oa.py \
> > >       $(i965_oa_xml_FILES) \
> > > +     $(intel_tiled_memcpy_dep_FILES) \
> > >       meson.build
> > >  
> > >  brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
> > > @@ -135,3 +136,6 @@ brw_oa_metrics.c: brw_oa.py $(i965_oa_xml_FILES)
> > >       $(i965_oa_xml_FILES:%=$(srcdir)/%)
> > >  
> > >  brw_oa_metrics.h: brw_oa_metrics.c
> > > +
> > > +intel_tiled_memcpy_normal.c: $(intel_tiled_memcpy_dep_FILES)
> > > +intel_tiled_memcpy_sse41.c: $(intel_tiled_memcpy_dep_FILES)
> > > diff --git a/src/mesa/drivers/dri/i965/Makefile.sources b/src/mesa/drivers/dri/i965/Makefile.sources
> > > index 0ab0e42fb18..043a70029f2 100644
> > > --- a/src/mesa/drivers/dri/i965/Makefile.sources
> > > +++ b/src/mesa/drivers/dri/i965/Makefile.sources
> > > @@ -121,6 +121,9 @@ intel_tiled_memcpy_sse41_FILES = \
> > >       intel_tiled_memcpy_sse41.c \
> > >       intel_tiled_memcpy_sse41.h
> > >  
> > > +intel_tiled_memcpy_dep_FILES = \
> > > +     intel_tiled_memcpy.c
> > > +
> > >  i965_gen4_FILES = \
> > >       genX_blorp_exec.c \
> > >       genX_state_upload.c