| Message ID | 20180211162136.15605-3-romain.naour@gmail.com |
|---|---|
| State | Superseded |
| Headers | show |
| Series | [v2,1/3] package/python-numpy: add host variant for piglit | expand |
On 11/02/2018 17:21, Romain Naour wrote: > Piglit is an open-source test suite for OpenGL implementations. > It's an python3 script based around several tools like glxinfo, > wflinfo, dmesg. > > Even though waffle support can be replaced by freeglut, > using pliglit with waffle is recommended since freeglut > will be replaced by waffle. > > Signed-off-by: Romain Naour <romain.naour@gmail.com> > Cc: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > Bernd, I'm Cc you since you're probably interested by piglit to > test new mesa3d version. > > v2: bump version > --- Tested on AMD SUMO with Gallium r600 driver. Tested-by: Valentin Korenblit <valentin.korenblit@smile.fr>
Hi All, Le 11/02/2018 à 17:21, Romain Naour a écrit : > Piglit is an open-source test suite for OpenGL implementations. > It's an python3 script based around several tools like glxinfo, > wflinfo, dmesg. > > Even though waffle support can be replaced by freeglut, > using pliglit with waffle is recommended since freeglut > will be replaced by waffle. > > Signed-off-by: Romain Naour <romain.naour@gmail.com> > Cc: Bernd Kuhls <bernd.kuhls@t-online.de> > --- > Bernd, I'm Cc you since you're probably interested by piglit to > test new mesa3d version. > > v2: bump version > --- [...] > diff --git a/package/piglit/Config.in b/package/piglit/Config.in > new file mode 100644 > index 0000000000..eaa19c17ba > --- /dev/null > +++ b/package/piglit/Config.in > @@ -0,0 +1,35 @@ > +config BR2_PACKAGE_PIGLIT > + bool "piglit" > + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND > + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBEGL > + depends on BR2_PACKAGE_PYTHON3 # python3 only script > + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS Missing "depends on BR2_PACKAGE_HAS_LIBGLES" introduced in waffle package with the last respin. > + select BR2_PACKAGE_MESA3D_DEMOS # glxinfo > + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_ZLIB > + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL > + select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND > + select BR2_PACKAGE_PYTHON_MAKO > + select BR2_PACKAGE_PYTHON_NUMPY > + select BR2_PACKAGE_PYTHON_SIX > + select BR2_PACKAGE_PYTHON3_BZIP2 > + select BR2_PACKAGE_PYTHON3_PYEXPAT > + select BR2_PACKAGE_PYTHON3_XZ > + select BR2_PACKAGE_PYTHON3_ZLIB > + select BR2_PACKAGE_UTIL_LINUX # runtime dependency > + select BR2_PACKAGE_UTIL_LINUX_BINARIES # require real dmesg tool > + select BR2_PACKAGE_WAFFLE # wflinfo > + help > + Piglit is an open-source test suite for OpenGL > + implementations. > + > + https://piglit.freedesktop.org > + > +comment "piglit needs an OpenGL GL or EGL provider" > + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND > + depends on BR2_PACKAGE_PYTHON3 > + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS > + depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBEGL The dependency comment should be updated accordingly. Any reviewer ? Best regards, Romain
Hello, On Sun, 11 Feb 2018 17:21:36 +0100, Romain Naour wrote: > diff --git a/package/piglit/Config.in b/package/piglit/Config.in > new file mode 100644 > index 0000000000..eaa19c17ba > --- /dev/null > +++ b/package/piglit/Config.in > @@ -0,0 +1,35 @@ > +config BR2_PACKAGE_PIGLIT > + bool "piglit" > + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND > + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBEGL So we would have to rework this to use the dependencies I have suggested for waffle. Maybe we need to simply "depends on BR2_PACKAGE_WAFFLE", because it is such a mess to express waffle dependencies in a correct way ? If we don't do a "depends on BR2_PACKAGE_WAFFLE", we would have to replicate waffle dependencies, which is possible. But since for waffle I suggested to not add a Config.in comment about those dependencies because they are too complicated, we would also not have a Config.in comment about those dependencies in piglit. So having the "depends on BR2_PACKAGE_WAFFLE" is maybe good enough. > + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 > + select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7 The xproto-glproto package no longer exists, this needs to be rebased. > + select BR2_PACKAGE_ZLIB > + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL > + select BR2_PACKAGE_LIBPNG > + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND > + select BR2_PACKAGE_PYTHON_MAKO > + select BR2_PACKAGE_PYTHON_NUMPY > + select BR2_PACKAGE_PYTHON_SIX > + select BR2_PACKAGE_PYTHON3_BZIP2 > + select BR2_PACKAGE_PYTHON3_PYEXPAT > + select BR2_PACKAGE_PYTHON3_XZ > + select BR2_PACKAGE_PYTHON3_ZLIB > + select BR2_PACKAGE_UTIL_LINUX # runtime dependency > + select BR2_PACKAGE_UTIL_LINUX_BINARIES # require real dmesg tool > + select BR2_PACKAGE_WAFFLE # wflinfo Well, I guess it needs waffle for more than wflinfo, no? > diff --git a/package/piglit/piglit.mk b/package/piglit/piglit.mk > new file mode 100644 > index 0000000000..c33a8f9022 > --- /dev/null > +++ b/package/piglit/piglit.mk > @@ -0,0 +1,69 @@ > +################################################################################ > +# > +# piglit > +# > +################################################################################ > + > +PIGLIT_VERSION = 5153c0bd89ca78e4dd56cc0917930909fa085eb0 > +PIGLIT_SITE = https://anongit.freedesktop.org/git/piglit.git > +PIGLIT_SITE_METHOD = git > +PIGLIT_LICENSE = MIT (code), \ > + LGPL-2.0+ (libpiglit*.so), \ > + GPL-3.0 (tests/glslparsertest/glsl2/norsetto-*), \ > + GPL-2.0+ (tests/glslparsertest/glsl2/gst-gl-*), \ > + BSD-3-Clause (tests/glslparsertest/shaders/*) > +PIGLIT_LICENSE_FILES = COPYING licences/GPL-2 licences/GPL-3 licences/LGPL-2 > + > +PIGLIT_DEPENDENCIES = host-pkgconf \ > + host-python-mako \ > + host-python-numpy \ > + host-python-six \ This is surprising, what does it do on the host during the build process that requires those tools ? Or is it that piglit generates a report on the target, and then provides a bunch of host tool to process such reports ? > + libpng \ > + python-mako \ > + python-numpy \ > + python-six \ > + waffle \ > + zlib > + > +PIGLIT_CONF_OPTS += \ > + -DPIGLIT_USE_WAFFLE=ON \ > + -DPIGLIT_BUILD_CL_TESTS=OFF \ > + -DPIGLIT_BUILD_WGL_TESTS=OFF > + > +ifeq ($(BR2_PACKAGE_XORG7),y) > +# libxcb for xcb-dri2 > +PIGLIT_DEPENDENCIES += \ > + xlib_libX11 \ > + xlib_libXext \ > + xproto_glproto \ Also needs adjustment now that xproto_glproto has been removed. Other than those comments, looks pretty good to me. Could you address those comments and send an updated version? Thanks! Thomas
Hi Thomas, Le 16/09/2018 à 23:38, Thomas Petazzoni a écrit : > Hello, > > On Sun, 11 Feb 2018 17:21:36 +0100, Romain Naour wrote: > >> diff --git a/package/piglit/Config.in b/package/piglit/Config.in >> new file mode 100644 >> index 0000000000..eaa19c17ba >> --- /dev/null >> +++ b/package/piglit/Config.in >> @@ -0,0 +1,35 @@ >> +config BR2_PACKAGE_PIGLIT >> + bool "piglit" >> + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND >> + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBEGL > > So we would have to rework this to use the dependencies I have > suggested for waffle. Maybe we need to simply "depends on > BR2_PACKAGE_WAFFLE", because it is such a mess to express waffle > dependencies in a correct way ? > > If we don't do a "depends on BR2_PACKAGE_WAFFLE", we would have to > replicate waffle dependencies, which is possible. But since for waffle > I suggested to not add a Config.in comment about those dependencies > because they are too complicated, we would also not have a Config.in > comment about those dependencies in piglit. So having the "depends on > BR2_PACKAGE_WAFFLE" is maybe good enough. Ok > >> + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 >> + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 >> + select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7 > > The xproto-glproto package no longer exists, this needs to be rebased. Indeed, I noticed It while rebasing my development branch on master. > >> + select BR2_PACKAGE_ZLIB >> + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL >> + select BR2_PACKAGE_LIBPNG >> + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND >> + select BR2_PACKAGE_PYTHON_MAKO >> + select BR2_PACKAGE_PYTHON_NUMPY >> + select BR2_PACKAGE_PYTHON_SIX >> + select BR2_PACKAGE_PYTHON3_BZIP2 >> + select BR2_PACKAGE_PYTHON3_PYEXPAT >> + select BR2_PACKAGE_PYTHON3_XZ >> + select BR2_PACKAGE_PYTHON3_ZLIB >> + select BR2_PACKAGE_UTIL_LINUX # runtime dependency >> + select BR2_PACKAGE_UTIL_LINUX_BINARIES # require real dmesg tool >> + select BR2_PACKAGE_WAFFLE # wflinfo > > Well, I guess it needs waffle for more than wflinfo, no? It's correct, piglit link with libwaffle-1. > >> diff --git a/package/piglit/piglit.mk b/package/piglit/piglit.mk >> new file mode 100644 >> index 0000000000..c33a8f9022 >> --- /dev/null >> +++ b/package/piglit/piglit.mk >> @@ -0,0 +1,69 @@ >> +################################################################################ >> +# >> +# piglit >> +# >> +################################################################################ >> + >> +PIGLIT_VERSION = 5153c0bd89ca78e4dd56cc0917930909fa085eb0 >> +PIGLIT_SITE = https://anongit.freedesktop.org/git/piglit.git >> +PIGLIT_SITE_METHOD = git >> +PIGLIT_LICENSE = MIT (code), \ >> + LGPL-2.0+ (libpiglit*.so), \ >> + GPL-3.0 (tests/glslparsertest/glsl2/norsetto-*), \ >> + GPL-2.0+ (tests/glslparsertest/glsl2/gst-gl-*), \ >> + BSD-3-Clause (tests/glslparsertest/shaders/*) >> +PIGLIT_LICENSE_FILES = COPYING licences/GPL-2 licences/GPL-3 licences/LGPL-2 >> + >> +PIGLIT_DEPENDENCIES = host-pkgconf \ >> + host-python-mako \ >> + host-python-numpy \ >> + host-python-six \ > > This is surprising, what does it do on the host during the build > process that requires those tools ? Or is it that piglit generates a > report on the target, and then provides a bunch of host tool to process > such reports ? Reports can be processed on the target directly. I believe it's for the same reason that we need host-numpy. I think the build system is checking the host-python instead of python for the target. I'm not sure how to fix this... > >> + libpng \ >> + python-mako \ >> + python-numpy \ >> + python-six \ >> + waffle \ >> + zlib >> + >> +PIGLIT_CONF_OPTS += \ >> + -DPIGLIT_USE_WAFFLE=ON \ >> + -DPIGLIT_BUILD_CL_TESTS=OFF \ >> + -DPIGLIT_BUILD_WGL_TESTS=OFF >> + >> +ifeq ($(BR2_PACKAGE_XORG7),y) >> +# libxcb for xcb-dri2 >> +PIGLIT_DEPENDENCIES += \ >> + xlib_libX11 \ >> + xlib_libXext \ >> + xproto_glproto \ > > Also needs adjustment now that xproto_glproto has been removed. > > Other than those comments, looks pretty good to me. > > Could you address those comments and send an updated version? Ok, Thanks for the review. Best regards, Romain > > Thanks! > > Thomas >
Hello, On Mon, 17 Sep 2018 22:10:02 +0200, Romain Naour wrote: > > This is surprising, what does it do on the host during the build > > process that requires those tools ? Or is it that piglit generates a > > report on the target, and then provides a bunch of host tool to process > > such reports ? > > Reports can be processed on the target directly. > I believe it's for the same reason that we need host-numpy. What "same reason" ? > I think the build system is checking the host-python instead of python for the > target. > > I'm not sure how to fix this... So you mean that all those Python packages are not needed on the host, but because the build system is bogus and checks their presence on the host, we have to have them as dependencies ? So indeed, there's a macro in cmake/Modules/PythonModule.cmake that is used to check for Mako, Numpy and Six, and it works by running the host Python. I imagine they are in fact not needed on the host, and this macro needs to be adjusted. However, I'm not sure what's the right way to test if a *target* Python module is available. Maybe Yegor can help on this ? :-) Thomas
diff --git a/DEVELOPERS b/DEVELOPERS index 0e19f6a94e..31831ef9ed 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1513,6 +1513,7 @@ F: package/minetest/ F: package/minetest-game/ F: package/openpowerlink/ F: package/physfs/ +F: package/piglit/ F: package/solarus/ F: package/stress-ng/ F: package/supertux/ diff --git a/package/Config.in b/package/Config.in index 0622ec49b4..7e653301d6 100644 --- a/package/Config.in +++ b/package/Config.in @@ -113,6 +113,7 @@ menu "Debugging, profiling and benchmark" source "package/nmon/Config.in" source "package/oprofile/Config.in" source "package/pax-utils/Config.in" + source "package/piglit/Config.in" source "package/pv/Config.in" source "package/racehound/Config.in" source "package/ramsmp/Config.in" diff --git a/package/piglit/Config.in b/package/piglit/Config.in new file mode 100644 index 0000000000..eaa19c17ba --- /dev/null +++ b/package/piglit/Config.in @@ -0,0 +1,35 @@ +config BR2_PACKAGE_PIGLIT + bool "piglit" + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_HAS_LIBGL || BR2_PACKAGE_HAS_LIBEGL + depends on BR2_PACKAGE_PYTHON3 # python3 only script + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + select BR2_PACKAGE_MESA3D_DEMOS # glxinfo + select BR2_PACKAGE_XLIB_LIBX11 if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XLIB_LIBXEXT if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_XPROTO_GLPROTO if BR2_PACKAGE_XORG7 + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBDRM if BR2_PACKAGE_HAS_LIBGL + select BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_LIBXKBCOMMON if BR2_PACKAGE_WAYLAND + select BR2_PACKAGE_PYTHON_MAKO + select BR2_PACKAGE_PYTHON_NUMPY + select BR2_PACKAGE_PYTHON_SIX + select BR2_PACKAGE_PYTHON3_BZIP2 + select BR2_PACKAGE_PYTHON3_PYEXPAT + select BR2_PACKAGE_PYTHON3_XZ + select BR2_PACKAGE_PYTHON3_ZLIB + select BR2_PACKAGE_UTIL_LINUX # runtime dependency + select BR2_PACKAGE_UTIL_LINUX_BINARIES # require real dmesg tool + select BR2_PACKAGE_WAFFLE # wflinfo + help + Piglit is an open-source test suite for OpenGL + implementations. + + https://piglit.freedesktop.org + +comment "piglit needs an OpenGL GL or EGL provider" + depends on BR2_PACKAGE_XORG7 || BR2_PACKAGE_WAYLAND + depends on BR2_PACKAGE_PYTHON3 + depends on BR2_PACKAGE_PYTHON_NUMPY_ARCH_SUPPORTS + depends on !BR2_PACKAGE_HAS_LIBGL && !BR2_PACKAGE_HAS_LIBEGL diff --git a/package/piglit/piglit.hash b/package/piglit/piglit.hash new file mode 100644 index 0000000000..cf5b46afae --- /dev/null +++ b/package/piglit/piglit.hash @@ -0,0 +1,6 @@ +# Locally calculated +sha256 7e9ba2d1282eab81bc9ac5dd6158190bc7015f063708926aa6bf6723f14f23d9 piglit-5153c0bd89ca78e4dd56cc0917930909fa085eb0.tar.gz +sha256 dcc398730859aee7cc1d6aa57f526f8d181b47bb3a49830e85b5723d5bc2c3bc COPYING +sha256 8177f97513213526df2cf6184d8ff986c675afb514d4e68a404010521b880643 licences/GPL-2 +sha256 8ceb4b9ee5adedde47b31e975c1d90c73ad27b6b165a1dcd80c7c545eb65b903 licences/GPL-3 +sha256 b7993225104d90ddd8024fd838faf300bea5e83d91203eab98e29512acebd69c licences/LGPL-2 diff --git a/package/piglit/piglit.mk b/package/piglit/piglit.mk new file mode 100644 index 0000000000..c33a8f9022 --- /dev/null +++ b/package/piglit/piglit.mk @@ -0,0 +1,69 @@ +################################################################################ +# +# piglit +# +################################################################################ + +PIGLIT_VERSION = 5153c0bd89ca78e4dd56cc0917930909fa085eb0 +PIGLIT_SITE = https://anongit.freedesktop.org/git/piglit.git +PIGLIT_SITE_METHOD = git +PIGLIT_LICENSE = MIT (code), \ + LGPL-2.0+ (libpiglit*.so), \ + GPL-3.0 (tests/glslparsertest/glsl2/norsetto-*), \ + GPL-2.0+ (tests/glslparsertest/glsl2/gst-gl-*), \ + BSD-3-Clause (tests/glslparsertest/shaders/*) +PIGLIT_LICENSE_FILES = COPYING licences/GPL-2 licences/GPL-3 licences/LGPL-2 + +PIGLIT_DEPENDENCIES = host-pkgconf \ + host-python-mako \ + host-python-numpy \ + host-python-six \ + libpng \ + python-mako \ + python-numpy \ + python-six \ + waffle \ + zlib + +PIGLIT_CONF_OPTS += \ + -DPIGLIT_USE_WAFFLE=ON \ + -DPIGLIT_BUILD_CL_TESTS=OFF \ + -DPIGLIT_BUILD_WGL_TESTS=OFF + +ifeq ($(BR2_PACKAGE_XORG7),y) +# libxcb for xcb-dri2 +PIGLIT_DEPENDENCIES += \ + xlib_libX11 \ + xlib_libXext \ + xproto_glproto \ + $(if $(BR2_PACKAGE_LIBXCB),libxcb) +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGL),y) +PIGLIT_DEPENDENCIES += libgl libdrm +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GL_TESTS=ON +else +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GL_TESTS=OFF +endif + +ifeq ($(BR2_PACKAGE_XORG7)$(BR2_PACKAGE_HAS_LIBGL),yy) +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLX_TESTS=ON +else +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLX_TESTS=OFF +endif + +ifeq ($(BR2_PACKAGE_HAS_LIBGLES),y) +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLES1_TESTS=ON \ + -DPIGLIT_BUILD_GLES2_TESTS=ON \ + -DPIGLIT_BUILD_GLES3_TESTS=ON +else +PIGLIT_CONF_OPTS += -DPIGLIT_BUILD_GLES1_TESTS=OFF \ + -DPIGLIT_BUILD_GLES2_TESTS=OFF \ + -DPIGLIT_BUILD_GLES3_TESTS=OFF +endif + +ifeq ($(BR2_PACKAGE_WAYLAND),y) +PIGLIT_DEPENDENCIES += wayland libxkbcommon +endif + +$(eval $(cmake-package))
Piglit is an open-source test suite for OpenGL implementations. It's an python3 script based around several tools like glxinfo, wflinfo, dmesg. Even though waffle support can be replaced by freeglut, using pliglit with waffle is recommended since freeglut will be replaced by waffle. Signed-off-by: Romain Naour <romain.naour@gmail.com> Cc: Bernd Kuhls <bernd.kuhls@t-online.de> --- Bernd, I'm Cc you since you're probably interested by piglit to test new mesa3d version. v2: bump version --- DEVELOPERS | 1 + package/Config.in | 1 + package/piglit/Config.in | 35 +++++++++++++++++++++++ package/piglit/piglit.hash | 6 ++++ package/piglit/piglit.mk | 69 ++++++++++++++++++++++++++++++++++++++++++++++ 5 files changed, 112 insertions(+) create mode 100644 package/piglit/Config.in create mode 100644 package/piglit/piglit.hash create mode 100644 package/piglit/piglit.mk