Attachment 181306 Details for Bug 217016 – v0.3 (Mesa 17.0.2 + LLVM 4.0 by default but allow down to 3.6)

[patch] v0.3 (Mesa 17.0.2 + LLVM 4.0 by default but allow down to 3.6)

Mesa-17.0.2.diff (text/plain), 13.40 KB, created by Jan Beich on 2017-03-30 04:59:59 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jan Beich

Created: 2017-03-30 04:59:59 UTC

Size: 13.40 KB

patch

obsolete

>Index: graphics/libGL/Makefile.common
>===================================================================
>--- graphics/libGL/Makefile.common	(revision 437268)
>+++ graphics/libGL/Makefile.common	(working copy)
>@@ -18,7 +18,7 @@
> MESAVERSION=	${MESABASEVERSION}${MESASUBVERSION:C/^(.)/.\1/}
> MESADISTVERSION=${MESABASEVERSION}${MESASUBVERSION:C/^(.)/-\1/}
> 
>-MESABASEVERSION=	13.0.6
>+MESABASEVERSION=	17.0.2
> # if there is a subversion, don't include the '-' between 7.11-rc2.
> MESASUBVERSION=
> 
>@@ -31,8 +31,6 @@ DISTFILES=	mesa-${MESADISTVERSION}${EXTRACT_SUFX}
> 
> MAINTAINER=	x11@FreeBSD.org
> 
>-BUILD_DEPENDS+=	makedepend:devel/makedepend
>-
> USES+=		compiler:c++11-lib bison gettext-tools gmake libtool \
> 		localbase pathfix pkgconfig python:2,build shebangfix tar:xz
> USE_LDCONFIG=	yes
>@@ -63,7 +61,7 @@ INSTALL_TARGET=		install-strip
> COMPONENT=		${PORTNAME:tl:C/^lib//:C/mesa-//}
> 
> .if (${ARCH} != sparc64 && ${ARCH} != ia64)	# no working LLVM
>-MESA_LLVM_VER?=	39
>+MESA_LLVM_VER?=	40
> LDFLAGS+=	-Wl,-rpath=${LOCALBASE}/llvm${MESA_LLVM_VER}/lib
> .endif
> 
>@@ -120,9 +118,9 @@ CONFIGURE_ARGS+=	--enable-osmesa --enable-xvmc
> 
> # gallium
> .if (${MESA_LLVM_VER} != "")
>-BUILD_DEPENDS+= llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
>+BUILD_DEPENDS+=	llvm${MESA_LLVM_VER}>=3.6:devel/llvm${MESA_LLVM_VER}
> .if ${COMPONENT:Mdri} != "" || ${COMPONENT:Mclover} != "" || ${COMPONENT:Megl} != ""
>-RUN_DEPENDS+=   llvm${MESA_LLVM_VER}>=3.9.0_4:devel/llvm${MESA_LLVM_VER}
>+RUN_DEPENDS+=	llvm${MESA_LLVM_VER}>=3.6:devel/llvm${MESA_LLVM_VER}
> .endif
> 
> CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${MESA_LLVM_VER}
>@@ -130,7 +128,7 @@ CONFIGURE_ENV+= LLVM_CONFIG=${LOCALBASE}/bin/llvm-
> CONFIGURE_ARGS+=	--enable-gallium-llvm --enable-llvm-shared-libs
> .else
> CONFIGURE_ARGS+=	--disable-gallium-llvm
>-.endif
>+.endif # ${MESA_LLVM_VER} != ""
> 
> .if ${PORT_OPTIONS:MTEXTURE}
> CONFIGURE_ARGS+=--enable-texture-float
>Index: graphics/libGL/Makefile.targets
>===================================================================
>--- graphics/libGL/Makefile.targets	(revision 437268)
>+++ graphics/libGL/Makefile.targets	(working copy)
>@@ -4,7 +4,7 @@
> 
> post-patch:
> .if ${OPSYS} == FreeBSD
>-	@${REINPLACE_CMD} -e 's|x86_64|amd64|' -e 's|\\S\*//|[:space:]* //|' \
>+	@${REINPLACE_CMD} -e 's|x86_64|amd64|' \
> 		${WRKSRC}/configure
> # Clang 3.4 in 10.x on i386 fails with the following error when using "GCC atomics"
> #
>@@ -16,8 +16,8 @@ post-patch:
> 	@${REINPLACE_CMD} -e 's|-DUSE_GCC_ATOMIC_BUILTINS||' ${WRKSRC}/configure
> .endif
> .else # ${OPSYS} == DragonFly
>-#	Sed on dragonfly doesn't support \< or \>
>-	@${REINPLACE_CMD} -e 's|\\>//|[[:>:]]//|' -e 's|\\S\*//|[:space:]* //|' \
>+#	DragonFly's sed lacks \< or \> while GNU sed lacks [[:<:]] or [[:>:]]
>+	@${REINPLACE_CMD} -e 's|\\>//|[[:>:]]//|' \
> 		${WRKSRC}/configure
> .endif # ${OPSYS}
> 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' \
>Index: graphics/libGL/distinfo
>===================================================================
>--- graphics/libGL/distinfo	(revision 437268)
>+++ graphics/libGL/distinfo	(working copy)
>@@ -1,3 +1,3 @@
>-TIMESTAMP = 1490202594
>-SHA256 (mesa-13.0.6.tar.xz) = 29ef104a7fc082d352b1599bd6cb1d040be424ccd22f5e0eb7ee9b0e9acd3597
>-SIZE (mesa-13.0.6.tar.xz) = 9179236
>+TIMESTAMP = 1490018937
>+SHA256 (mesa-17.0.2.tar.xz) = f8f191f909e01e65de38d5bdea5fb057f21649a3aed20948be02348e77a689d4
>+SIZE (mesa-17.0.2.tar.xz) = 9451056
>Index: graphics/libGL/files/configure.ac
>===================================================================
>--- graphics/libGL/files/configure.ac	(revision 437268)
>+++ graphics/libGL/files/configure.ac	(working copy)
>@@ -1,35 +1,53 @@
>---- configure.ac.orig	2016-06-21 14:31:09.000000000 +0200
>-+++ configure.ac	2016-07-08 13:05:53.236433000 +0200
>-@@ -871,7 +872,7 @@
>-     [enable_dri=yes])
>+--- configure.ac.orig	2017-03-04 15:46:53 UTC
>++++ configure.ac
>+@@ -943,18 +943,18 @@ llvm_add_target() {
>+ # $1 is the llvm-config command with arguments.
>+ strip_unwanted_llvm_flags() {
>+     # Use \> (marks the end of the word)
>+-    echo " `$1`" | sed \
>+-        -e 's/\s\+-m\S*//g' \
>+-        -e 's/\s\+-DNDEBUG\>//g' \
>+-        -e 's/\s\+-D_GNU_SOURCE\>//g' \
>+-        -e 's/\s\+-pedantic\>//g' \
>+-        -e 's/\s\+-W\S*//g' \
>+-        -e 's/\s\+-O\S*//g' \
>+-        -e 's/\s\+-g\S*//g' \
>++    echo " `$1`" | sed -E \
>++        -e 's/[[[:space:]]]+-m[[^[:space:]]]*//g' \
>++        -e 's/[[[:space:]]]+-DNDEBUG\>//g' \
>++        -e 's/[[[:space:]]]+-D_GNU_SOURCE\>//g' \
>++        -e 's/[[[:space:]]]+-pedantic\>//g' \
>++        -e 's/[[[:space:]]]+-W[[^[:space:]]]*//g' \
>++        -e 's/[[[:space:]]]+-O[[^[:space:]]]*//g' \
>++        -e 's/[[[:space:]]]+-g[[^[:space:]]]*//g' \
>+         -e 's/-fno-rtti\>/-Fno-rtti/g' \
>+-        -e 's/\s\+-f\S*//g' \
>++        -e 's/[[[:space:]]]+-f[[^[:space:]]]*//g' \
>+         -e 's/-Fno-rtti\>/-fno-rtti/g' \
>+-        -e 's/^ //'
>++        -e 's/^[[[:space:]]]//'
>+ }
>  
>+ llvm_set_environment_variables() {
>+@@ -1121,7 +1121,7 @@ fi
>+ AC_SUBST(LIBSENSORS_LIBS)
>+ 
>  case "$host_os" in
> -linux*)
>-+linux*|freebsd*)
>++linux* | freebsd*)
>      dri3_default=yes
>      ;;
>  *)
>-@@ -1540,6 +1548,19 @@
>-         ;;
>-     gnu*)
>-         DEFINES="$DEFINES -DHAVE_ALIAS"
>-+dnl not sure about dri3 support, just enable it for now.
>-+        if test "x$enable_dri3" = xyes; then
>-+            DEFINES="$DEFINES -DHAVE_DRI3"
>-+        fi
>-+
>-+        case "$host_cpu" in
>-+        powerpc* | sparc*)
>-+            # Build only the drivers for cards that exist on PowerPC/sparc
>-+            if test "x$with_dri_drivers" = "xyes"; then
>-+                with_dri_drivers="r200 radeon swrast"
>-+            fi
>-+            ;;
>-+        esac
>-         ;;
>-     cygwin*)
>-         if test "x$with_dri_drivers" = "xyes"; then
>-@@ -1921,9 +1948,19 @@
>+@@ -1631,7 +1631,7 @@ dnl platform checks. Set DEFINES and LIB
>+ if test "x$enable_dri" = xyes; then
>+     # Platform specific settings and drivers to build
>+     case "$host_os" in
>+-    linux*)
>++    linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*)
>+         if test "x$enable_dri3" = xyes; then
>+             DEFINES="$DEFINES -DHAVE_DRI3"
>+         fi
>+@@ -2002,9 +2002,19 @@ if test "x$enable_opencl" = xyes; then
>          AC_MSG_ERROR([cannot enable OpenCL without Gallium])
>      fi
>  
>@@ -49,25 +67,12 @@
>  
>      if test "x$have_libclc" = xno; then
>          AC_MSG_ERROR([pkg-config cannot find libclc.pc which is required to build clover.
>-@@ -2102,9 +2139,9 @@
>- strip_unwanted_llvm_flags() {
>-     # Use \> (marks the end of the word)
>-     echo `$1` | sed \
>--	-e 's/-march=\S*//g' \
>--	-e 's/-mtune=\S*//g' \
>--	-e 's/-mcpu=\S*//g' \
>-+	-e 's/-march=[[:graph:]]* //g' \
>-+	-e 's/-mtune=[[:graph:]]* //g' \
>-+	-e 's/-mcpu=[[:graph:]]* //g' \
>- 	-e 's/-DNDEBUG\>//g' \
>- 	-e 's/-D_GNU_SOURCE\>//g' \
>- 	-e 's/-pedantic\>//g' \
>-@@ -2196,8 +2233,6 @@
>-                 CLANG_LIBDIR=${LLVM_LIBDIR}
>-             fi
>-             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
>--            AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
>--                [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
>-         fi
>-     else
>-         MESA_LLVM=0
>+@@ -2047,8 +2057,6 @@ if test "x$enable_opencl" = xyes; then
>+         CLANG_LIBDIR=${LLVM_LIBDIR}
>+     fi
>+     CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
>+-    AS_IF([test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"],
>+-        [AC_MSG_ERROR([Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries.])])
>+ fi
>+ AM_CONDITIONAL(HAVE_CLOVER, test "x$enable_opencl" = xyes)
>+ AM_CONDITIONAL(HAVE_CLOVER_ICD, test "x$enable_opencl_icd" = xyes)
>Index: graphics/libGL/files/patch-configure
>===================================================================
>--- graphics/libGL/files/patch-configure	(revision 437268)
>+++ graphics/libGL/files/patch-configure	(working copy)
>@@ -1,34 +1,55 @@
>---- configure.orig	2017-01-05 15:52:21 UTC
>+Don't forget to keep files/configure.ac in sync
>+
>+--- configure.orig	2017-03-04 15:47:01 UTC
> +++ configure
>-@@ -21955,7 +21955,7 @@ fi
>+@@ -22307,18 +22307,18 @@ llvm_add_target() {
>+ # $1 is the llvm-config command with arguments.
>+ strip_unwanted_llvm_flags() {
>+     # Use \> (marks the end of the word)
>+-    echo " `$1`" | sed \
>+-        -e 's/\s\+-m\S*//g' \
>+-        -e 's/\s\+-DNDEBUG\>//g' \
>+-        -e 's/\s\+-D_GNU_SOURCE\>//g' \
>+-        -e 's/\s\+-pedantic\>//g' \
>+-        -e 's/\s\+-W\S*//g' \
>+-        -e 's/\s\+-O\S*//g' \
>+-        -e 's/\s\+-g\S*//g' \
>++    echo " `$1`" | sed -E \
>++        -e 's/[[:space:]]+-m[^[:space:]]*//g' \
>++        -e 's/[[:space:]]+-DNDEBUG\>//g' \
>++        -e 's/[[:space:]]+-D_GNU_SOURCE\>//g' \
>++        -e 's/[[:space:]]+-pedantic\>//g' \
>++        -e 's/[[:space:]]+-W[^[:space:]]*//g' \
>++        -e 's/[[:space:]]+-O[^[:space:]]*//g' \
>++        -e 's/[[:space:]]+-g[^[:space:]]*//g' \
>+         -e 's/-fno-rtti\>/-Fno-rtti/g' \
>+-        -e 's/\s\+-f\S*//g' \
>++        -e 's/[[:space:]]+-f[^[:space:]]*//g' \
>+         -e 's/-Fno-rtti\>/-fno-rtti/g' \
>+-        -e 's/^ //'
>++        -e 's/^[[:space:]]//'
>+ }
>  
>+ llvm_set_environment_variables() {
>+@@ -22516,7 +22516,7 @@ fi
>  
>+ 
>  case "$host_os" in
> -linux*)
>-+linux*|freebsd*)
>++linux* | freebsd*)
>      dri3_default=yes
>      ;;
>  *)
>-@@ -23968,6 +23968,18 @@ if test "x$enable_dri" = xyes; then
>-         ;;
>-     *freebsd* | dragonfly* | *netbsd* | openbsd*)
>-         DEFINES="$DEFINES -DHAVE_ALIAS"
>-+        if test "x$enable_dri3" = xyes; then
>-+            DEFINES="$DEFINES -DHAVE_DRI3"
>-+        fi
>-+
>-+        case "$host_cpu" in
>-+        powerpc* | sparc*)
>-+            # Build only the drivers for cards that exist on PowerPC/sparc
>-+            if test "x$with_dri_drivers" = "xyes"; then
>-+                with_dri_drivers="r200 radeon swrast"
>-+            fi
>-+            ;;
>-+        esac
>-         ;;
>-     gnu*)
>-         DEFINES="$DEFINES -DHAVE_ALIAS"
>-@@ -25849,9 +25861,19 @@ if test "x$enable_opencl" = xyes; then
>+@@ -24055,7 +24055,7 @@ fi
>+ if test "x$enable_dri" = xyes; then
>+     # Platform specific settings and drivers to build
>+     case "$host_os" in
>+-    linux*)
>++    linux* | *freebsd* | dragonfly* | *netbsd* | openbsd*)
>+         if test "x$enable_dri3" = xyes; then
>+             DEFINES="$DEFINES -DHAVE_DRI3"
>+         fi
>+@@ -25807,9 +25807,19 @@ if test "x$enable_opencl" = xyes; then
>          as_fn_error $? "cannot enable OpenCL without Gallium" "$LINENO" 5
>      fi
>  
>@@ -48,13 +69,13 @@
>  
>      if test "x$have_libclc" = xno; then
>          as_fn_error $? "pkg-config cannot find libclc.pc which is required to build clover.
>-@@ -26670,9 +26692,6 @@ fi
>-                 CLANG_LIBDIR=${LLVM_LIBDIR}
>-             fi
>-             CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
>--            if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
>+@@ -25851,9 +25861,6 @@ if test "x$enable_opencl" = xyes; then
>+         CLANG_LIBDIR=${LLVM_LIBDIR}
>+     fi
>+     CLANG_RESOURCE_DIR=$CLANG_LIBDIR/clang/${LLVM_VERSION}
>+-    if test ! -f "$CLANG_RESOURCE_DIR/include/stddef.h"; then :
> -  as_fn_error $? "Could not find clang internal header stddef.h in $CLANG_RESOURCE_DIR Use --with-clang-libdir to specify the correct path to the clang libraries." "$LINENO" 5
> -fi
>-         fi
>-     else
>-         MESA_LLVM=0
>+ fi
>+  if test "x$enable_opencl" = xyes; then
>+   HAVE_CLOVER_TRUE=
>Index: graphics/libGL/files/patch-src_amd_common_ac__llvm__util.c
>===================================================================
>--- graphics/libGL/files/patch-src_amd_common_ac__llvm__util.c	(nonexistent)
>+++ graphics/libGL/files/patch-src_amd_common_ac__llvm__util.c	(working copy)
>@@ -0,0 +1,48 @@
>+commit 7372e3cf5f2d
>+Author: Dave Airlie <airlied@redhat.com>
>+Date:   Wed Mar 15 07:15:50 2017 +1000
>+
>+    radv/ac: workaround regression in llvm 4.0 release
>+    
>+    LLVM 4.0 released with a pretty messy regression, that hopefully
>+    get fixed in the future.
>+    
>+    This work around was proposed by Tom, and it fixes the CTS regressions
>+    here at least, I'm not sure if this will cause any major side effects,
>+    but correctness over speed and all that.
>+    
>+    radeonsi should possibly consider the same workaround until an llvm
>+    fix can be found.
>+    
>+    Acked-by: Bas Nieuwenhuizen <bas@basnieuwenhuizen.nl>
>+    Signed-off-by: Dave Airlie <airlied@redhat.com>
>+
>+--- src/amd/common/ac_llvm_util.c.orig	2017-03-20 14:08:50 UTC
>++++ src/amd/common/ac_llvm_util.c
>+@@ -26,7 +26,7 @@
>+ #include "ac_llvm_util.h"
>+ 
>+ #include <llvm-c/Core.h>
>+-
>++#include <llvm-c/Support.h>
>+ #include "c11/threads.h"
>+ 
>+ #include <assert.h>
>+@@ -47,6 +47,17 @@ static void ac_init_llvm_target()
>+ 	LLVMInitializeAMDGPUTarget();
>+ 	LLVMInitializeAMDGPUTargetMC();
>+ 	LLVMInitializeAMDGPUAsmPrinter();
>++
>++	/*
>++	 * Workaround for bug in llvm 4.0 that causes image intrinsics
>++	 * to disappear.
>++	 * https://reviews.llvm.org/D26348
>++	 */
>++#if HAVE_LLVM >= 0x0400
>++	const char *argv[2] = {"mesa", "-simplifycfg-sink-common=false"};
>++	LLVMParseCommandLineOptions(2, argv, NULL);
>++#endif
>++
>+ #endif
>+ }
>+ 
>
>Property changes on: graphics/libGL/files/patch-src_amd_common_ac__llvm__util.c
>___________________________________________________________________
>Added: fbsd:nokeywords
>## -0,0 +1 ##
>+yes
>\ No newline at end of property
>Added: svn:eol-style
>## -0,0 +1 ##
>+native
>\ No newline at end of property
>Added: svn:mime-type
>## -0,0 +1 ##
>+text/plain
>\ No newline at end of property

Actions: View | Diff

Attachments on bug 217016: 179885 | 180574 | 180617 | 180618 | 181003 | 181302 | 181306 | 181391