[Mesa-dev] Please test the automake-gallium branch

[Tom Stellard]

On Wed, Sep 26, 2012 at 04:09:38PM -0700, Matt Turner wrote:
> On Wed, Sep 26, 2012 at 2:50 PM, Török Edwin
> <edwin+ml-mesadev at etorok.net> wrote:
> > On 09/26/2012 11:59 PM, Matt Turner wrote:
> >> I've pushed an automake-gallium2 branch to my repo with a number of
> >> fixes squashed-in.
> >>
> >> git://people.freedesktop.org/~mattst88/mesa automake-gallium2
> >
> > Nice progress!
> >
> > I was able to build it after reversing the 'if' below.
> 
> Weird. I don't have this problem.
> 
> > It doesn't load though:
> > libGL: OpenDriver: trying opt/xorg/lib/dri/r600_dri.so
> > libGL error: dlopen opt/xorg/lib/dri/r600_dri.so failed (opt/xorg/lib/dri/r600_dri.so: undefined symbol: _ZN4llvm13ParseAssemblyEPNS_12MemoryBufferEPNS_6ModuleERNS_12SMDiagnosticERNS_11LLVMContextE)
> 
> Tom, are there some extra LLVM libs that need to be linked in, or is
> this a problem caused by switching the if statement? I'm not able to
> reproduce this locally (with LLVM-3.1).
> 

I have not seen this error either.  I will try to reproduce when I get a
chance.

> > diff --git a/src/gallium/drivers/radeon/Makefile.am b/src/gallium/drivers/radeon/Makefile.am
> > index d0e0ec3..668ad5f 100644
> > --- a/src/gallium/drivers/radeon/Makefile.am
> > +++ b/src/gallium/drivers/radeon/Makefile.am
> > @@ -28,9 +28,9 @@ SIRegisterGetHWRegNum.inc: SIGenRegisterInfo.pl
> >
> >  R600Intrinsics.td: R600IntrinsicsNoOpenCL.td R600IntrinsicsOpenCL.td
> >  if HAVE_R600_LLVM_INTRINSICS
> > -       cp $(srcdir)/R600IntrinsicsNoOpenCL.td R600Intrinsics.td
> > -else
> >         cp $(srcdir)/R600IntrinsicsOpenCL.td R600Intrinsics.td
> > +else
> > +       cp $(srcdir)/R600IntrinsicsNoOpenCL.td R600Intrinsics.td
> >  endif
> >
> > However it still seems to be missing a dependency as rerunning configure
> > doesn't cause the .td file to be copied, had to manually remove it.
> 
> Tom's area. Let's see what he thinks.
> 

I'm very close to requiring LLVM 3.2 for compute support, which means
we can get rid of this bad hack.  So, I'll try to fix this in master.
In the short term, you can just rename R600IntrinsicsNoOpenCL.td to
R600Intrinsics.td and drop this part of the Makefile.

-Tom