2016-10-05 2:48 GMT+02:00 Dave Airlie <airl...@gmail.com>:
> From: Dave Airlie <airl...@redhat.com>
>
> This moves some of the llvm checks around to allow them
> to be used for non-gallium drivers as well.
>
> radv requires llvm 3.9.0 as vulkan requires compute shaders.
>
> v1.1: add all make infrastructure to this patch for easier
> review.
>
> Authors: Bas Nieuwenhuizen and Dave Airlie
> Signed-off-by: Dave Airlie <airl...@redhat.com>
> ---
> configure.ac | 33 ++++++--
> src/Makefile.am | 8 +-
> src/amd/common/Makefile.am | 51 +++++++++++++
> src/amd/common/Makefile.sources | 29 +++++++
> src/amd/vulkan/Makefile.am | 165
> ++++++++++++++++++++++++++++++++++++++++
> src/amd/vulkan/Makefile.sources | 67 ++++++++++++++++
> 6 files changed, 345 insertions(+), 8 deletions(-)
> create mode 100644 src/amd/common/Makefile.am
> create mode 100644 src/amd/common/Makefile.sources
> create mode 100644 src/amd/vulkan/Makefile.am
> create mode 100644 src/amd/vulkan/Makefile.sources
>
> diff --git a/configure.ac b/configure.ac
> index 1bfac3b..634f3c3 100644
> --- a/configure.ac
> +++ b/configure.ac
> @@ -1704,6 +1704,10 @@ if test -n "$with_vulkan_drivers"; then
> HAVE_INTEL_VULKAN=yes;
>
> ;;
> + xradeon)
> + PKG_CHECK_MODULES([AMDGPU], [libdrm_amdgpu >=
> $LIBDRM_AMDGPU_REQUIRED])
> + HAVE_RADEON_VULKAN=yes;
> + ;;
> *)
> AC_MSG_ERROR([Vulkan driver '$driver' does not exist])
> ;;
> @@ -2187,7 +2191,7 @@ if test "x$enable_gallium_llvm" = xauto; then
> i*86|x86_64|amd64) enable_gallium_llvm=yes;;
> esac
> fi
> -if test "x$enable_gallium_llvm" = xyes; then
> +if test "x$enable_gallium_llvm" = xyes || test "x$HAVE_RADEON_VULKAN" =
> xyes; then
> if test -n "$llvm_prefix"; then
> AC_PATH_TOOL([LLVM_CONFIG], [llvm-config], [no],
> ["$llvm_prefix/bin"])
> else
> @@ -2357,10 +2361,7 @@ radeon_llvm_check() {
> else
> amdgpu_llvm_target_name='amdgpu'
> fi
> - if test "x$enable_gallium_llvm" != "xyes"; then
> - AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
> - fi
> - llvm_check_version_for "3" "6" "0" $1
> + llvm_check_version_for $2 $3 $4 $1
> if test true && $LLVM_CONFIG --targets-built | grep -iqvw
> $amdgpu_llvm_target_name ; then
> AC_MSG_ERROR([LLVM $amdgpu_llvm_target_name not enabled in your LLVM
> build.])
> fi
> @@ -2371,6 +2372,13 @@ radeon_llvm_check() {
> fi
> }
>
> +radeon_gallium_llvm_check() {
> + if test "x$enable_gallium_llvm" != "xyes"; then
> + AC_MSG_ERROR([--enable-gallium-llvm is required when building $1])
> + fi
> + radeon_llvm_check $*
> +}
> +
> swr_llvm_check() {
> gallium_require_llvm $1
> if test ${LLVM_VERSION_INT} -lt 306; then
> @@ -2455,7 +2463,7 @@ if test -n "$with_gallium_drivers"; then
> gallium_require_drm "Gallium R600"
> gallium_require_drm_loader
> if test "x$enable_opencl" = xyes; then
> - radeon_llvm_check "r600g"
> + radeon_gallium_llvm_check "r600g" "3" "6" "0"
> LLVM_COMPONENTS="${LLVM_COMPONENTS} bitreader asmparser"
> fi
> ;;
> @@ -2465,7 +2473,7 @@ if test -n "$with_gallium_drivers"; then
> PKG_CHECK_MODULES([AMDGPU], [libdrm_amdgpu >=
> $LIBDRM_AMDGPU_REQUIRED])
> gallium_require_drm "radeonsi"
> gallium_require_drm_loader
> - radeon_llvm_check "radeonsi"
> + radeon_gallium_llvm_check "radeonsi" "3" "6" "0"
> require_egl_drm "radeonsi"
> ;;
> xnouveau)
> @@ -2584,6 +2592,10 @@ if test "x$MESA_LLVM" != x0; then
> fi
> fi
>
> +if test "x$HAVE_RADEON_VULKAN" != "x0"; then
> + radeon_llvm_check "radv" "3" "9" "0"
> +fi
Hello,
It seems that this is not the correct place to put this check. At this
point we are after calling llvm-config and radeon_llvm_check modifies
LLVM_COMPONENTS. This means that radeon_llvm_check will not be able to
add AMDGPU llvm component.
This works if you build both radeonsi and radv, since radeonsi will
call radeon_llvm_check at the right time. If you only build radv, it
fails during libvulkan_radeon.so linking.
I moved it just above llvm-config call and it built for me successfully.
Regards,
Gustaw
> +
> AM_CONDITIONAL(HAVE_GALLIUM_SVGA, test "x$HAVE_GALLIUM_SVGA" = xyes)
> AM_CONDITIONAL(HAVE_GALLIUM_I915, test "x$HAVE_GALLIUM_I915" = xyes)
> AM_CONDITIONAL(HAVE_GALLIUM_ILO, test "x$HAVE_GALLIUM_ILO" = xyes)
> @@ -2621,8 +2633,13 @@ AM_CONDITIONAL(HAVE_R200_DRI, test x$HAVE_R200_DRI =
> xyes)
> AM_CONDITIONAL(HAVE_RADEON_DRI, test x$HAVE_RADEON_DRI = xyes)
> AM_CONDITIONAL(HAVE_SWRAST_DRI, test x$HAVE_SWRAST_DRI = xyes)
>
> +AM_CONDITIONAL(HAVE_RADEON_VULKAN, test "x$HAVE_RADEON_VULKAN" = xyes)
> AM_CONDITIONAL(HAVE_INTEL_VULKAN, test "x$HAVE_INTEL_VULKAN" = xyes)
>
> +AM_CONDITIONAL(HAVE_AMD_DRIVERS, test "x$HAVE_GALLIUM_R600" = xyes -o \
> + "x$HAVE_GALLIUM_RADEONSI" = xyes -o \
> + "x$HAVE_RADEON_VULKAN" = xyes)
> +
> AM_CONDITIONAL(HAVE_INTEL_DRIVERS, test "x$HAVE_INTEL_VULKAN" = xyes -o \
> "x$HAVE_I965_DRI" = xyes)
>
> @@ -2713,6 +2730,8 @@ dnl Substitute the config
> AC_CONFIG_FILES([Makefile
> src/Makefile
> src/amd/Makefile
> + src/amd/common/Makefile
> + src/amd/vulkan/Makefile
> src/compiler/Makefile
> src/egl/Makefile
> src/egl/main/egl.pc
> diff --git a/src/Makefile.am b/src/Makefile.am
> index 551f431..1cb02c6 100644
> --- a/src/Makefile.am
> +++ b/src/Makefile.am
> @@ -50,8 +50,14 @@ SUBDIRS = . gtest util mapi/glapi/gen mapi
> # include only conditionally ?
> SUBDIRS += compiler
>
> -if HAVE_GALLIUM_RADEON_COMMON
> +if HAVE_AMD_DRIVERS
> SUBDIRS += amd
> +
> +if HAVE_RADEON_VULKAN
> +SUBDIRS += amd/common
> +SUBDIRS += amd/vulkan
> +endif
> +
> endif
>
> if HAVE_INTEL_DRIVERS
> diff --git a/src/amd/common/Makefile.am b/src/amd/common/Makefile.am
> new file mode 100644
> index 0000000..788152d
> --- /dev/null
> +++ b/src/amd/common/Makefile.am
> @@ -0,0 +1,51 @@
> +# Copyright © 2016 Bas Nieuwenhuizen
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the "Software"),
> +# to deal in the Software without restriction, including without limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice (including the next
> +# paragraph) shall be included in all copies or substantial portions of the
> +# Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> +# IN THE SOFTWARE.
> +
> +include Makefile.sources
> +
> +# TODO cleanup these
> +AM_CPPFLAGS = \
> + $(VALGRIND_CFLAGS) \
> + $(DEFINES) \
> + -I$(top_srcdir)/include \
> + -I$(top_builddir)/src \
> + -I$(top_srcdir)/src \
> + -I$(top_builddir)/src/compiler \
> + -I$(top_builddir)/src/compiler/nir \
> + -I$(top_srcdir)/src/compiler \
> + -I$(top_srcdir)/src/mapi \
> + -I$(top_srcdir)/src/mesa \
> + -I$(top_srcdir)/src/mesa/drivers/dri/common \
> + -I$(top_srcdir)/src/gallium/auxiliary \
> + -I$(top_srcdir)/src/gallium/include
> +
> +AM_CFLAGS = $(VISIBILITY_CFLAGS) \
> + $(PTHREAD_CFLAGS) \
> + $(LLVM_CFLAGS) \
> + $(LIBELF_CFLAGS)
> +
> +AM_CXXFLAGS = \
> + $(VISIBILITY_CXXFLAGS) \
> + $(LLVM_CXXFLAGS)
> +
> +noinst_LTLIBRARIES = libamd_common.la
> +
> +libamd_common_la_SOURCES = $(AMD_COMPILER_SOURCES)
> diff --git a/src/amd/common/Makefile.sources b/src/amd/common/Makefile.sources
> new file mode 100644
> index 0000000..380dba0
> --- /dev/null
> +++ b/src/amd/common/Makefile.sources
> @@ -0,0 +1,29 @@
> +# Copyright © 2016 Bas Nieuwenhuizen
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the "Software"),
> +# to deal in the Software without restriction, including without limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice (including the next
> +# paragraph) shall be included in all copies or substantial portions of the
> +# Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> +# IN THE SOFTWARE.
> +
> +AMD_COMPILER_SOURCES := \
> + ac_binary.c \
> + ac_binary.h \
> + ac_llvm_helper.cpp \
> + ac_llvm_util.c \
> + ac_llvm_util.h \
> + ac_nir_to_llvm.c \
> + ac_nir_to_llvm.h
> diff --git a/src/amd/vulkan/Makefile.am b/src/amd/vulkan/Makefile.am
> new file mode 100644
> index 0000000..387ba4d
> --- /dev/null
> +++ b/src/amd/vulkan/Makefile.am
> @@ -0,0 +1,165 @@
> +# Copyright © 2016 Red Hat
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the "Software"),
> +# to deal in the Software without restriction, including without limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice (including the next
> +# paragraph) shall be included in all copies or substantial portions of the
> +# Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> +# IN THE SOFTWARE.
> +
> +include Makefile.sources
> +
> +vulkan_includedir = $(includedir)/vulkan
> +
> +vulkan_include_HEADERS = \
> + $(top_srcdir)/include/vulkan/vk_platform.h \
> + $(top_srcdir)/include/vulkan/vulkan.h
> +
> +lib_LTLIBRARIES = libvulkan_radeon.la
> +
> +# The gallium includes are for the util/u_math.h include from main/macros.h
> +
> +AM_CPPFLAGS = \
> + $(AMDGPU_CFLAGS) \
> + $(VALGRIND_CFLAGS) \
> + $(DEFINES) \
> + -I$(top_srcdir)/include \
> + -I$(top_builddir)/src \
> + -I$(top_srcdir)/src \
> + -I$(top_srcdir)/src/amd \
> + -I$(top_srcdir)/src/amd/common \
> + -I$(top_builddir)/src/compiler \
> + -I$(top_builddir)/src/compiler/nir \
> + -I$(top_srcdir)/src/compiler \
> + -I$(top_srcdir)/src/mapi \
> + -I$(top_srcdir)/src/mesa \
> + -I$(top_srcdir)/src/mesa/drivers/dri/common \
> + -I$(top_srcdir)/src/gallium/auxiliary \
> + -I$(top_srcdir)/src/gallium/include
> +
> +AM_CFLAGS = $(VISIBILITY_FLAGS) \
> + $(PTHREAD_CFLAGS) \
> + $(LLVM_CFLAGS)
> +
> +VULKAN_SOURCES = \
> + $(VULKAN_GENERATED_FILES) \
> + $(VULKAN_FILES)
> +
> +VULKAN_LIB_DEPS = $(AMDGPU_LIBS)
> +
> +
> +if HAVE_PLATFORM_X11
> +AM_CPPFLAGS += \
> + $(XCB_DRI3_CFLAGS) \
> + -DVK_USE_PLATFORM_XCB_KHR \
> + -DVK_USE_PLATFORM_XLIB_KHR
> +
> +VULKAN_SOURCES += $(VULKAN_WSI_X11_FILES)
> +
> +# FIXME: Use pkg-config for X11-xcb ldflags.
> +VULKAN_LIB_DEPS += $(XCB_DRI3_LIBS) -lX11-xcb
> +endif
> +
> +
> +if HAVE_PLATFORM_WAYLAND
> +AM_CPPFLAGS += \
> + -I$(top_builddir)/src/egl/wayland/wayland-drm \
> + -I$(top_srcdir)/src/egl/wayland/wayland-drm \
> + $(WAYLAND_CFLAGS) \
> + -DVK_USE_PLATFORM_WAYLAND_KHR
> +
> +VULKAN_SOURCES += $(VULKAN_WSI_WAYLAND_FILES)
> +
> +VULKAN_LIB_DEPS += \
> + $(top_builddir)/src/egl/wayland/wayland-drm/libwayland-drm.la \
> + $(WAYLAND_LIBS)
> +endif
> +
> +noinst_LTLIBRARIES = libvulkan_common.la
> +libvulkan_common_la_SOURCES = $(VULKAN_SOURCES)
> +
> +VULKAN_LIB_DEPS += \
> + libvulkan_common.la \
> + $(top_builddir)/src/amd/common/libamd_common.la \
> + $(top_builddir)/src/compiler/nir/libnir.la \
> + $(top_builddir)/src/util/libmesautil.la \
> + $(LLVM_LIBS) \
> + $(LIBELF_LIBS) \
> + $(PTHREAD_LIBS) \
> + $(LIBDRM_LIBS) \
> + $(PTHREAD_LIBS) \
> + $(DLOPEN_LIBS) \
> + -lm
> +
> +nodist_EXTRA_libvulkan_radeon_la_SOURCES = dummy.cpp
> +libvulkan_radeon_la_SOURCES = $(VULKAN_GEM_FILES)
> +
> +radv_entrypoints.h : radv_entrypoints_gen.py $(vulkan_include_HEADERS)
> + $(AM_V_GEN) cat $(vulkan_include_HEADERS) |\
> + $(PYTHON2) $(srcdir)/radv_entrypoints_gen.py header > $@
> +
> +radv_entrypoints.c : radv_entrypoints_gen.py $(vulkan_include_HEADERS)
> + $(AM_V_GEN) cat $(vulkan_include_HEADERS) |\
> + $(PYTHON2) $(srcdir)/radv_entrypoints_gen.py code > $@
> +
> +.PHONY: radv_timestamp.h
> +
> +radv_timestamp.h:
> + @echo "Updating radv_timestamp.h"
> + $(AM_V_GEN) echo "#define RADV_TIMESTAMP \"$(TIMESTAMP_CMD)\"" > $@
> +
> +vk_format_table.c: vk_format_table.py \
> + vk_format_parse.py \
> + vk_format_layout.csv
> + $(PYTHON2) $(srcdir)/vk_format_table.py
> $(srcdir)/vk_format_layout.csv > $@
> +
> +BUILT_SOURCES = $(VULKAN_GENERATED_FILES)
> +CLEANFILES = $(BUILT_SOURCES) dev_icd.json radv_timestamp.h
> +EXTRA_DIST = \
> + $(top_srcdir)/include/vulkan/vk_icd.h \
> + radv_entrypoints_gen.py \
> + dev_icd.json.in \
> + radeon_icd.json
> +
> +libvulkan_radeon_la_LIBADD = $(VULKAN_LIB_DEPS)
> $(top_builddir)/src/amd/addrlib/libamdgpu_addrlib.la
> +
> +libvulkan_radeon_la_LDFLAGS = \
> + -shared \
> + -module \
> + -no-undefined \
> + -avoid-version \
> + $(BSYMBOLIC) \
> + $(LLVM_LDFLAGS) \
> + $(GC_SECTIONS) \
> + $(LD_NO_UNDEFINED)
> +
> +
> +icdconfdir = @VULKAN_ICD_INSTALL_DIR@
> +icdconf_DATA = radeon_icd.json
> +# The following is used for development purposes, by setting
> VK_ICD_FILENAMES.
> +noinst_DATA = dev_icd.json
> +
> +dev_icd.json : dev_icd.json.in
> + $(AM_V_GEN) $(SED) \
> + -e "s#@build_libdir@#${abs_top_builddir}/${LIB_DIR}#" \
> + < $(srcdir)/dev_icd.json.in > $@
> +
> +include $(top_srcdir)/install-lib-links.mk
> +
> +noinst_HEADERS =
> +
> +LDADD = \
> + $(PTHREAD_LIBS) -lm -lstdc++
> +
> diff --git a/src/amd/vulkan/Makefile.sources b/src/amd/vulkan/Makefile.sources
> new file mode 100644
> index 0000000..97fd0b6
> --- /dev/null
> +++ b/src/amd/vulkan/Makefile.sources
> @@ -0,0 +1,67 @@
> +# Copyright © 2016 Red Hat
> +#
> +# Permission is hereby granted, free of charge, to any person obtaining a
> +# copy of this software and associated documentation files (the "Software"),
> +# to deal in the Software without restriction, including without limitation
> +# the rights to use, copy, modify, merge, publish, distribute, sublicense,
> +# and/or sell copies of the Software, and to permit persons to whom the
> +# Software is furnished to do so, subject to the following conditions:
> +#
> +# The above copyright notice and this permission notice (including the next
> +# paragraph) shall be included in all copies or substantial portions of the
> +# Software.
> +#
> +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
> +# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
> +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL
> +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
> +# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
> +# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
> DEALINGS
> +# IN THE SOFTWARE.
> +
> +RADV_WS_AMDGPU_FILES := \
> + winsys/amdgpu/radv_amdgpu_bo.c \
> + winsys/amdgpu/radv_amdgpu_cs.c \
> + winsys/amdgpu/radv_amdgpu_surface.c \
> + winsys/amdgpu/radv_amdgpu_winsys.c \
> + winsys/amdgpu/radv_amdgpu_winsys.h
> +
> +VULKAN_FILES := \
> + radv_cmd_buffer.c \
> + radv_device.c \
> + radv_descriptor_set.c \
> + radv_formats.c \
> + radv_image.c \
> + radv_meta.c \
> + radv_meta.h \
> + radv_meta_blit.c \
> + radv_meta_blit2d.c \
> + radv_meta_buffer.c \
> + radv_meta_bufimage.c \
> + radv_meta_clear.c \
> + radv_meta_copy.c \
> + radv_meta_decompress.c \
> + radv_meta_fast_clear.c \
> + radv_meta_resolve.c \
> + radv_meta_resolve_cs.c \
> + radv_pass.c \
> + radv_pipeline.c \
> + radv_pipeline_cache.c \
> + radv_query.c \
> + radv_util.c \
> + radv_wsi.c \
> + si_cmd_buffer.c \
> + vk_format_table.c \
> + $(RADV_WS_AMDGPU_FILES)
> +
> +VULKAN_WSI_WAYLAND_FILES := \
> + radv_wsi_wayland.c
> +
> +VULKAN_WSI_X11_FILES := \
> + radv_wsi_x11.c
> +
> +VULKAN_GENERATED_FILES := \
> + radv_entrypoints.c \
> + radv_entrypoints.h \
> + radv_timestamp.h
> +
> --
> 2.5.5
>
> _______________________________________________
> mesa-dev mailing list
> mesa-dev@lists.freedesktop.org
> https://lists.freedesktop.org/mailman/listinfo/mesa-dev
_______________________________________________
mesa-dev mailing list
mesa-dev@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/mesa-dev
