swr: bump minimum supported LLVM version to 6.0

RADV now requires LLVM 6.0 or greater, and thus we can't build dist
tarball because swr requires LLVM 5.0.

Let's bump required LLVM to 6.0 in swr too.

v2: bump also in meson.build (Eric)

Fixes: fd1121e839 ("amd: remove support for LLVM 5.0")
Cc: Tim Rowley <timothy.o.rowley@intel.com>
Cc: Emil Velikov <emil.velikov@collabora.com>
Cc: Dylan Baker <dylan@pnwbakers.com>
Cc: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Eric Engestrom <eric.engestrom@intel.com>
Reviewed-by: Bruce Cherniak <bruce.cherniak@intel.com>

diff --git a/configure.ac b/configure.ac
index 2f1d13ce6ef90281b6d36664f47851908432cd80..4d9d9e5928012efd7591f7dd6f547ebf25073e33 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -110,7 +110,7 @@ LLVM_REQUIRED_OPENCL=3.9.0
 LLVM_REQUIRED_R600=3.9.0
 LLVM_REQUIRED_RADEONSI=6.0.0
 LLVM_REQUIRED_RADV=6.0.0
-LLVM_REQUIRED_SWR=5.0.0
+LLVM_REQUIRED_SWR=6.0.0
 
 dnl Check for progs
 AC_PROG_CPP
@@ -2816,9 +2816,8 @@ if test -n "$with_gallium_drivers"; then
 fi
 
 # XXX: Keep in sync with LLVM_REQUIRED_SWR
-AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x5.0.0 -a \
-                                              "x$LLVM_VERSION" != x5.0.1 -a \
-                                              "x$LLVM_VERSION" != x5.0.2)
+AM_CONDITIONAL(SWR_INVALID_LLVM_VERSION, test "x$LLVM_VERSION" != x6.0.0 -a \
+                                              "x$LLVM_VERSION" != x6.0.1)
 
 if test "x$enable_llvm" = "xyes" -a "$with_gallium_drivers"; then
     llvm_require_version $LLVM_REQUIRED_GALLIUM "gallium"

diff --git a/meson.build b/meson.build
index fa3367d1fa7f606fc0f046f1acf5c32ac0c6dcd6..1b3dfa221c91893a6ab05b7d57ce2fc23ac2a217 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -1160,7 +1160,7 @@ endif
 if with_amd_vk or with_gallium_radeonsi
   _llvm_version = '>= 6.0.0'
 elif with_gallium_swr
-  _llvm_version = '>= 5.0.0'
+  _llvm_version = '>= 6.0.0'
 elif with_gallium_opencl or with_gallium_r600
   _llvm_version = '>= 3.9.0'
 else

diff --git a/src/gallium/drivers/swr/Makefile.am b/src/gallium/drivers/swr/Makefile.am
index 5cc3f77478a99b8681ad2ae7ab391e06f536bf33..d20a6bdbed38a1efd8573cf26724211492b7da37 100644 (file)
--- a/src/gallium/drivers/swr/Makefile.am
+++ b/src/gallium/drivers/swr/Makefile.am
@@ -375,7 +375,7 @@ include $(top_srcdir)/install-gallium-links.mk
 dist-hook:
 if SWR_INVALID_LLVM_VERSION
        @echo "*****************************************"
-       @echo "LLVM 5.0.x required to create the tarball"
+       @echo "LLVM 6.0.x required to create the tarball"
        @echo "*****************************************"
        @test
 endif

diff --git a/src/gallium/drivers/swr/SConscript b/src/gallium/drivers/swr/SConscript
index 224372eb3f59908a90252a6c03dbd93d5147b86f..a89d02c5db0828b8acf6013907cc90489ea69f15 100644 (file)
--- a/src/gallium/drivers/swr/SConscript
+++ b/src/gallium/drivers/swr/SConscript
@@ -12,8 +12,8 @@ if not env['llvm']:
     env['swr'] = False
     Return()
 
-if env['LLVM_VERSION'] < distutils.version.LooseVersion('5.0'):
-    print("warning: swr requires LLVM >= 5.0: not building swr")
+if env['LLVM_VERSION'] < distutils.version.LooseVersion('6.0'):
+    print("warning: swr requires LLVM >= 6.0: not building swr")
     env['swr'] = False
     Return()