zhangyiss/spack
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mesa, mesa18: Package updates (#29573)

Browse Source 
* mesa, mesa18: Implement the swr variant consistently between mesa and mesa18

* mesa: Bump to 21.3.7

* mesa: Build release by default tie swr to release builds

* mesa, mesa18: re-enable the llvm variant by default

This reverts the change made in #29360
This commit is contained in:
Chuck Atkins 2022-04-06 10:11:19 -05:00 committed by GitHub
parent 5283ca5781
commit 7477161a05
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 58 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
var/spack/repos/builtin/packages/mesa/package.py
View File

@ -19,6 +19,11 @@ class Mesa(MesonPackage):
url = "https://archive.mesa3d.org/mesa-20.2.1.tar.xz" url = "https://archive.mesa3d.org/mesa-20.2.1.tar.xz"
version('master', tag='master') version('master', tag='master')
# Note: If v22.x or greater is added please leave 21.3.7 as preferred. The swr
# multithreaded cpu driver was dropped 22.x and is currently necessary to get
# reasonable rendering performance on HPC OpenGL workloads.
# See https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/11264
version('21.3.7', sha256='b4fa9db7aa61bf209ef0b40bef83080999d86ad98df8b8b4fada7c128a1efc3d', preferred=True)
version('21.3.1', sha256='2b0dc2540cb192525741d00f706dbc4586349185dafc65729c7fda0800cc474d') version('21.3.1', sha256='2b0dc2540cb192525741d00f706dbc4586349185dafc65729c7fda0800cc474d')
version('21.2.6', sha256='1e7e22d93c6e8859fa044b1121119d26b2e67e4184b92ebb81c66497dc80c954') version('21.2.6', sha256='1e7e22d93c6e8859fa044b1121119d26b2e67e4184b92ebb81c66497dc80c954')
version('21.2.5', sha256='8e49585fb760d973723dab6435d0c86f7849b8305b1e6d99f475138d896bacbb') version('21.2.5', sha256='8e49585fb760d973723dab6435d0c86f7849b8305b1e6d99f475138d896bacbb')
@ -43,15 +48,29 @@ class Mesa(MesonPackage):
depends_on('expat') depends_on('expat')
depends_on('zlib@1.2.3:') depends_on('zlib@1.2.3:')
# Override the build type variant so we can default to release
variant('buildtype', default='release',
description='Meson build type',
values=('plain', 'debug', 'debugoptimized', 'release', 'minsize'))
# Internal options # Internal options
variant('llvm', default=False, description="Enable LLVM.") variant('llvm', default=True, description="Enable LLVM.")
_SWR_AUTO_VALUE = 'auto'
_SWR_ENABLED_VALUES = (_SWR_AUTO_VALUE, 'avx', 'avx2', 'knl', 'skx') # when clauses:
_SWR_DISABLED_VALUES = ('none',) # +llvm - swr requires llvm
variant('swr', default=_SWR_AUTO_VALUE, # buildtype=release - swr has known assert failures in debug that can be ignored
values=_SWR_DISABLED_VALUES + _SWR_ENABLED_VALUES, # @:21 - swr was removed in 22.0; see note above
multi=True, when='+llvm', variant(
description="Enable the SWR driver.") 'swr',
values=spack.variant.DisjointSetsOfValues(
('none',), ('auto',), ('avx', 'avx2', 'knl', 'skx',),
)
.with_non_feature_values('auto')
.with_non_feature_values('none')
.with_default('auto'),
when='+llvm buildtype=release @:21',
description="Enable the SWR driver.",
)
# Front ends # Front ends
variant('osmesa', default=True, description="Enable the OSMesa frontend.") variant('osmesa', default=True, description="Enable the OSMesa frontend.")

46
var/spack/repos/builtin/packages/mesa18/package.py
View File

@ -41,11 +41,18 @@ class Mesa18(AutotoolsPackage):
depends_on('ncurses+termlib') depends_on('ncurses+termlib')
# Internal options # Internal options
variant('llvm', default=False, description="Enable LLVM.") variant('llvm', default=True, description="Enable LLVM.")
_SWR_ENABLED_VALUES = ('avx', 'avx2', 'knl', 'skx') variant(
variant('swr', values=any_combination_of(*_SWR_ENABLED_VALUES), 'swr',
description="Enable the SWR driver.") values=spack.variant.DisjointSetsOfValues(
# conflicts('~llvm', when='~swr=none') ('none',), ('auto',), ('avx', 'avx2', 'knl', 'skx',),
)
.with_non_feature_values('auto')
.with_non_feature_values('none')
.with_default('auto'),
when='+llvm',
description="Enable the SWR driver.",
)
# Front ends # Front ends
variant('osmesa', default=True, description="Enable the OSMesa frontend.") variant('osmesa', default=True, description="Enable the OSMesa frontend.")
@ -148,17 +155,26 @@ def configure_args(self):
args.append('--disable-llvm') args.append('--disable-llvm')
args_swr_arches = [] args_swr_arches = []
if 'swr=avx' in spec: if 'swr=auto' in spec:
args_swr_arches.append('avx') if 'avx' in spec.target:
if 'swr=avx2' in spec: args_swr_arches.append('avx')
args_swr_arches.append('avx2') if 'avx2' in spec.target:
if 'swr=knl' in spec: args_swr_arches.append('avx2')
args_swr_arches.append('knl') if 'avx512f' in spec.target:
if 'swr=skx' in spec: if 'avx512er' in spec.target:
args_swr_arches.append('skx') args_swr_arches.append('knl')
if 'avx512bw' in spec.target:
args_swr_arches.append('skx')
else:
if 'swr=avx' in spec:
args_swr_arches.append('avx')
if 'swr=avx2' in spec:
args_swr_arches.append('avx2')
if 'swr=knl' in spec:
args_swr_arches.append('knl')
if 'swr=skx' in spec:
args_swr_arches.append('skx')
if args_swr_arches: if args_swr_arches:
if '+llvm' not in spec:
raise SpecError('Variant swr requires +llvm')
args_gallium_drivers.append('swr') args_gallium_drivers.append('swr')
args.append('--with-swr-archs=' + ','.join(args_swr_arches)) args.append('--with-swr-archs=' + ','.join(args_swr_arches))