diff mbox series

[1/9] mesa: Enable gallium-llvm on x86 and x86_64

Message ID 0d484e3706a46b34f4edfc3fec906e576a29a9bd.1534699224.git.raj.khem@gmail.com
State Superseded
Headers show
Series Use llvmpile for mesa on x86/x86-64 | expand

Commit Message

Khem Raj Aug. 19, 2018, 5:23 p.m. UTC 
Signed-off-by: Khem Raj <raj.khem@gmail.com>

---
 meta/recipes-graphics/cairo/cairo.inc | 3 ++-
 meta/recipes-graphics/mesa/mesa.inc   | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

-- 
2.18.0

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core

Comments

Richard Purdie Aug. 20, 2018, 9:40 a.m. UTC | #1 
On Sun, 2018-08-19 at 10:23 -0700, Khem Raj wrote:
> Signed-off-by: Khem Raj <raj.khem@gmail.com>

> ---

>  meta/recipes-graphics/cairo/cairo.inc | 3 ++-

>  meta/recipes-graphics/mesa/mesa.inc   | 3 +++

>  2 files changed, 5 insertions(+), 1 deletion(-)

> 

> diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-

> graphics/cairo/cairo.inc

> index 20e0d2c92a..7347f223ff 100644

> --- a/meta/recipes-graphics/cairo/cairo.inc

> +++ b/meta/recipes-graphics/cairo/cairo.inc

> @@ -22,7 +22,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender

> libxext"

>  DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"

>  

>  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11',

> 'x11 xcb', '', d)} \

> -           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}"

> +           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \

> +           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl',

> 'opengl', '', d)}"

>  

>  PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --

> disable-xlib,${X11DEPENDS}"

>  PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"

> diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-

> graphics/mesa/mesa.inc

> index 6aedeee9dc..2671d4de4d 100644

> --- a/meta/recipes-graphics/mesa/mesa.inc

> +++ b/meta/recipes-graphics/mesa/mesa.inc

> @@ -47,6 +47,9 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATU

> RES', 'wayland vulkan', d)} \

>                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11

> vulkan', 'dri3', '', d)} \

>  		   "

>  

> +PACKAGECONFIG_append_x86 = " gallium-llvm gallium r600"

> +PACKAGECONFIG_append_x86-64 = " gallium-llvm gallium r600"

> +

>  # "gbm" requires "dri", "opengl"

>  PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"


Adding this patch causes:

"oe-selftest -r sstatetests.SStateTests.test_sstate_32_64_same_hash"

to fail. I've not looked into it in more detail other than to narrow it
down to this patch.

Cheers,

Richard

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj Aug. 20, 2018, 5:14 p.m. UTC | #2 
On Mon, Aug 20, 2018 at 2:40 AM Richard Purdie
<richard.purdie@linuxfoundation.org> wrote:
>

> On Sun, 2018-08-19 at 10:23 -0700, Khem Raj wrote:

> > Signed-off-by: Khem Raj <raj.khem@gmail.com>

> > ---

> >  meta/recipes-graphics/cairo/cairo.inc | 3 ++-

> >  meta/recipes-graphics/mesa/mesa.inc   | 3 +++

> >  2 files changed, 5 insertions(+), 1 deletion(-)

> >

> > diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-

> > graphics/cairo/cairo.inc

> > index 20e0d2c92a..7347f223ff 100644

> > --- a/meta/recipes-graphics/cairo/cairo.inc

> > +++ b/meta/recipes-graphics/cairo/cairo.inc

> > @@ -22,7 +22,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender

> > libxext"

> >  DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"

> >

> >  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11',

> > 'x11 xcb', '', d)} \

> > -           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}"

> > +           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \

> > +           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl',

> > 'opengl', '', d)}"

> >

> >  PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --

> > disable-xlib,${X11DEPENDS}"

> >  PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"

> > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-

> > graphics/mesa/mesa.inc

> > index 6aedeee9dc..2671d4de4d 100644

> > --- a/meta/recipes-graphics/mesa/mesa.inc

> > +++ b/meta/recipes-graphics/mesa/mesa.inc

> > @@ -47,6 +47,9 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATU

> > RES', 'wayland vulkan', d)} \

> >                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11

> > vulkan', 'dri3', '', d)} \

> >                  "

> >

> > +PACKAGECONFIG_append_x86 = " gallium-llvm gallium r600"

> > +PACKAGECONFIG_append_x86-64 = " gallium-llvm gallium r600"

> > +

> >  # "gbm" requires "dri", "opengl"

> >  PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"

>

> Adding this patch causes:

>

> "oe-selftest -r sstatetests.SStateTests.test_sstate_32_64_same_hash"

>

> to fail. I've not looked into it in more detail other than to narrow it

> down to this patch.

>


 my hunch is that its due to new env variables
probably we need to add them to exclude list...?
see
YOCTO_ALTERNATE_* vars

http://git.openembedded.org/openembedded-core/commit/?h=master-next&id=c5a27bd4d450911afa38846bc00ef762e4414eda

> Cheers,

>

> Richard

>

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
Khem Raj Aug. 20, 2018, 5:51 p.m. UTC | #3 
On Mon, Aug 20, 2018 at 10:14 AM Khem Raj <raj.khem@gmail.com> wrote:
>

> On Mon, Aug 20, 2018 at 2:40 AM Richard Purdie

> <richard.purdie@linuxfoundation.org> wrote:

> >

> > On Sun, 2018-08-19 at 10:23 -0700, Khem Raj wrote:

> > > Signed-off-by: Khem Raj <raj.khem@gmail.com>

> > > ---

> > >  meta/recipes-graphics/cairo/cairo.inc | 3 ++-

> > >  meta/recipes-graphics/mesa/mesa.inc   | 3 +++

> > >  2 files changed, 5 insertions(+), 1 deletion(-)

> > >

> > > diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-

> > > graphics/cairo/cairo.inc

> > > index 20e0d2c92a..7347f223ff 100644

> > > --- a/meta/recipes-graphics/cairo/cairo.inc

> > > +++ b/meta/recipes-graphics/cairo/cairo.inc

> > > @@ -22,7 +22,8 @@ X11DEPENDS = "virtual/libx11 libsm libxrender

> > > libxext"

> > >  DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"

> > >

> > >  PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11',

> > > 'x11 xcb', '', d)} \

> > > -           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}"

> > > +           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \

> > > +           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl',

> > > 'opengl', '', d)}"

> > >

> > >  PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --

> > > disable-xlib,${X11DEPENDS}"

> > >  PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"

> > > diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-

> > > graphics/mesa/mesa.inc

> > > index 6aedeee9dc..2671d4de4d 100644

> > > --- a/meta/recipes-graphics/mesa/mesa.inc

> > > +++ b/meta/recipes-graphics/mesa/mesa.inc

> > > @@ -47,6 +47,9 @@ PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATU

> > > RES', 'wayland vulkan', d)} \

> > >                     ${@bb.utils.contains('DISTRO_FEATURES', 'x11

> > > vulkan', 'dri3', '', d)} \

> > >                  "

> > >

> > > +PACKAGECONFIG_append_x86 = " gallium-llvm gallium r600"

> > > +PACKAGECONFIG_append_x86-64 = " gallium-llvm gallium r600"

> > > +

> > >  # "gbm" requires "dri", "opengl"

> > >  PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"

> >

> > Adding this patch causes:

> >

> > "oe-selftest -r sstatetests.SStateTests.test_sstate_32_64_same_hash"

> >

> > to fail. I've not looked into it in more detail other than to narrow it

> > down to this patch.

> >

>

>  my hunch is that its due to new env variables

> probably we need to add them to exclude list...?

> see

> YOCTO_ALTERNATE_* vars

>

> http://git.openembedded.org/openembedded-core/commit/?h=master-next&id=c5a27bd4d450911afa38846bc00ef762e4414eda

>


I think I see the problem, its because of DLLVM_TARGETS_TO_BUILD being used
for native llvm. I am testting this fix
http://git.openembedded.org/openembedded-core-contrib/commit/?h=kraj/master&id=7cc195f4f8850ad314ef9b93535f874f05a6f9ed



> > Cheers,

> >

> > Richard

> >

-- 
_______________________________________________
Openembedded-core mailing list
Openembedded-core@lists.openembedded.org
http://lists.openembedded.org/mailman/listinfo/openembedded-core
diff mbox series

Patch

diff --git a/meta/recipes-graphics/cairo/cairo.inc b/meta/recipes-graphics/cairo/cairo.inc
index 20e0d2c92a..7347f223ff 100644
--- a/meta/recipes-graphics/cairo/cairo.inc
+++ b/meta/recipes-graphics/cairo/cairo.inc
@@ -22,7 +22,8 @@  X11DEPENDS = "virtual/libx11 libsm libxrender libxext"
 DEPENDS = "libpng fontconfig pixman glib-2.0 zlib"
 
 PACKAGECONFIG ??= "${@bb.utils.contains('DISTRO_FEATURES', 'x11', 'x11 xcb', '', d)} \
-           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)}"
+           ${@bb.utils.filter('DISTRO_FEATURES', 'directfb', d)} \
+           ${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'opengl', '', d)}"
 
 PACKAGECONFIG[x11] = "--with-x=yes -enable-xlib,--with-x=no --disable-xlib,${X11DEPENDS}"
 PACKAGECONFIG[xcb] = "--enable-xcb,--disable-xcb,libxcb"
diff --git a/meta/recipes-graphics/mesa/mesa.inc b/meta/recipes-graphics/mesa/mesa.inc
index 6aedeee9dc..2671d4de4d 100644
--- a/meta/recipes-graphics/mesa/mesa.inc
+++ b/meta/recipes-graphics/mesa/mesa.inc
@@ -47,6 +47,9 @@  PACKAGECONFIG ??= "${@bb.utils.filter('DISTRO_FEATURES', 'wayland vulkan', d)} \
                    ${@bb.utils.contains('DISTRO_FEATURES', 'x11 vulkan', 'dri3', '', d)} \
 		   "
 
+PACKAGECONFIG_append_x86 = " gallium-llvm gallium r600"
+PACKAGECONFIG_append_x86-64 = " gallium-llvm gallium r600"
+
 # "gbm" requires "dri", "opengl"
 PACKAGECONFIG[gbm] = "--enable-gbm,--disable-gbm"