Page MenuHomeFreeBSD
Differential D11377

lang/beignet: update to 1.3.1.234 (snapshot) and switch to LLVM 4.0 by default
ClosedPublic
Actions

Authored by jbeich on Jun 27 2017, 8:00 AM.
Tags
None
Referenced Files
Unknown Object (File)
Tue, Apr 8, 10:27 AM
Unknown Object (File)
Thu, Mar 20, 3:37 PM
Unknown Object (File)
Mar 7 2025, 5:00 AM
Unknown Object (File)
Feb 22 2025, 6:09 PM
Unknown Object (File)
Feb 18 2025, 8:48 PM
Unknown Object (File)
Feb 9 2025, 1:19 AM
Unknown Object (File)
Feb 8 2025, 10:52 PM
Unknown Object (File)
Jan 29 2025, 8:18 PM
View All Files
Subscribers
rezny

Details

Reviewers
None
Group Reviewers
x11
Commits
rP454953: MFH: r451413 r453205
rP451414: lang/beignet: switch to LLVM 4.0 by default (like Mesa)
rP451413: lang/beignet: update to 1.3.1.52 (Release_v1.3 branch snapshot)
rP451412: lang/beignet: make OpenCL 2.0 optional on amd64
Summary

OpenCL on FreeBSD is unusable if we're not proactive in backporting a regression fix or newer llvm support from upstream. Given no one cared for months let's use a snapshot to avoid disaster on the next update.

Due to rP435144 fallout this is planned for MFH to 2017Q2 and 2017Q3

Test Plan
  • default options build fine on 10.3 i386/amd64, 11.0 i386/amd64, 12.0 amd64
  • FP64=on builds fine on 10.3 i386/amd64, 11.0 i386/amd64, 12.0 amd64
  • OCL20=off builds fine on 10.3 amd64, 11.0 amd64, 12.0 amd64
  • TEST=on builds fine on 10.3 i386/amd64, 11.0 i386/amd64, 12.0 amd64
  • OpenCL 2.0 runtime with drm-next@1f8dbbb2ab25 merged with rS323707 on Intel HD530 (Skylake GT2) works fine
  • OpenCL 1.2 runtime (default on i386) works fine as well

Diff Detail

Lint
No Lint Coverage
Unit
No Test Coverage
Build Status
Buildable 11265
Build 11635: arc lint + arc unit

Event Timeline

jbeich created this revision.Jun 27 2017, 8:00 AM
jbeich edited the summary of this revision. (Show Details)Jun 27 2017, 8:01 AM
jbeich set the repository for this revision to rP FreeBSD ports repository.
jbeich added a comment.Jul 13 2017, 11:31 PM

Maintainer timeout reached 3 days ago.

jbeich updated this revision to Diff 30803.Jul 14 2017, 11:08 PM
jbeich retitled this revision from lang/beignet: update to 1.3.1.205 (snapshot) and switch to LLVM 4.0 by default to lang/beignet: update to 1.3.1.218 (snapshot) and switch to LLVM 4.0 by default.
jbeich edited the summary of this revision. (Show Details)
jbeich edited the test plan for this revision. (Show Details)
  • New snapshot
  • Improved commit messages
jbeich set the repository for this revision to rP FreeBSD ports repository.Jul 14 2017, 11:11 PM
rezny added a subscriber: rezny.Jul 15 2017, 8:38 AM

Using a snapshot is a better solution than trying to backport support for LLVM 4.0 while we await the release of beignet 1.4.

lang/beignet/files/patch-backend_src_backend_gen__insn__selection__optimize.cpp
30 ↗(On Diff #30803)

This change looks incorrect. abs() should not just be removed to avoid the error. Instead, cast as necessary to get the correct abs(int).

37 ↗(On Diff #30803)

Same as above

jbeich added a comment.Jul 20 2017, 4:11 AM
In D11377#240323, @rezny wrote:

Using a snapshot is a better solution than trying to backport support for LLVM 4.0 while we await the release of beignet 1.4.

Maybe but someone reported a regression.

lang/beignet/files/patch-backend_src_backend_gen__insn__selection__optimize.cpp
30 ↗(On Diff #30803)

No[1][2] but upstream finally fixed it.

jbeich updated this revision to Diff 30991.Jul 20 2017, 5:52 AM
jbeich edited the test plan for this revision. (Show Details)
  • Add an option to disable OpenCL 2.0 on amd64 from bug 217771. OpenCL apps fail inside i386 jail on amd64 probably due to missing compatibility for DRM ioctls (at least on drm-next), so disabling OpenCL 2.0 on amd64 maybe the only way to provide an imitation of testing on i386. Besides, OpenCL 2.0 is still unstable even on amd64.
jbeich retitled this revision from lang/beignet: update to 1.3.1.218 (snapshot) and switch to LLVM 4.0 by default to lang/beignet: update to 1.3.1.221 (snapshot) and switch to LLVM 4.0 by default.Jul 20 2017, 5:52 AM
jbeich set the repository for this revision to rP FreeBSD ports repository.
jbeich edited the summary of this revision. (Show Details)Jul 20 2017, 5:55 AM
jbeich added a comment.Jul 20 2017, 6:13 AM
This comment was removed by jbeich.
jbeich updated this revision to Diff 32440.EditedAug 28 2017, 12:40 PM
jbeich retitled this revision from lang/beignet: update to 1.3.1.221 (snapshot) and switch to LLVM 4.0 by default to lang/beignet: update to 1.3.1.227 (snapshot) and switch to LLVM 4.0 by default.
jbeich edited the test plan for this revision. (Show Details)
  • New snapshot
  • Reported drm-next bug blocking proper QA inside i386 jail
jbeich set the repository for this revision to rP FreeBSD ports repository.Aug 28 2017, 12:44 PM
jbeich updated this revision to Diff 33269.Sep 21 2017, 4:29 PM
jbeich retitled this revision from lang/beignet: update to 1.3.1.227 (snapshot) and switch to LLVM 4.0 by default to lang/beignet: update to 1.3.1.234 (snapshot) and switch to LLVM 4.0 by default.
jbeich edited the test plan for this revision. (Show Details)

New snapshot. Building against devel/llvm50 via MESA_LLVM_VER=50 is now supported.

Harbormaster completed remote builds in B11654: Diff 33269.Sep 21 2017, 4:29 PM
jbeich set the repository for this revision to rP FreeBSD ports repository.Sep 21 2017, 4:29 PM
Closed by commit rP451412: lang/beignet: make OpenCL 2.0 optional on amd64 (authored by jbeich). · Explain WhyOct 6 2017, 10:05 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathSize
lang/
beignet/
30 lines
6 lines
files/
20 lines
24 lines
2 lines

Diff 32440

View Options

lang/beignet/Makefile

# Created by: Koop Mast <kwm@FreeBSD.org> # Created by: Koop Mast <kwm@FreeBSD.org>
# $FreeBSD$ # $FreeBSD$
PORTNAME= beignet PORTNAME= beignet
PORTVERSION= 1.3.1 DISTVERSIONPREFIX= Release_v
PORTREVISION= 1 DISTVERSION= 1.3.1-227
DISTVERSIONSUFFIX= -source DISTVERSIONSUFFIX= -g757ccf02
CATEGORIES= lang CATEGORIES= lang
MASTER_SITES= https://01.org/sites/default/files/
MAINTAINER= x11@FreeBSD.org MAINTAINER= x11@FreeBSD.org
COMMENT= OpenCL library for Intel GPUs COMMENT= OpenCL library for Intel GPUs
LICENSE= LGPL21+ LICENSE= LGPL21+
LICENSE_FILE= ${WRKSRC}/COPYING LICENSE_FILE= ${WRKSRC}/COPYING
BUILD_DEPENDS= clang${LLVMVER}:devel/llvm${LLVMVER} \ BUILD_DEPENDS= clang${LLVMVER}:devel/llvm${LLVMVER} \
opencl>=0:devel/opencl opencl>=0:devel/opencl
LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \ LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \
libdrm.so:graphics/libdrm libdrm.so:graphics/libdrm
RUN_DEPENDS= opencl>=0:devel/opencl \ RUN_DEPENDS= opencl>=0:devel/opencl \
clang${LLVMVER}:devel/llvm${LLVMVER} clang${LLVMVER}:devel/llvm${LLVMVER}
WRKSRC= ${WRKDIR}/Beignet-${PORTVERSION}-Source USE_GITHUB= yes
GH_ACCOUNT= intel
USES= cmake ncurses pkgconfig shebangfix USES= cmake ncurses pkgconfig shebangfix
USE_XORG= sm ice x11 xext xfixes USE_XORG= sm ice x11 xext xfixes
USE_GL= gl egl USE_GL= gl egl
USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME} USE_LDCONFIG= ${LOCALBASE}/lib/${PORTNAME}
SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh
ALL_TARGET= all ALL_TARGET= all
LLVMVER= ${MESA_LLVM_VER:U39} LLVMVER= ${MESA_LLVM_VER:U40}
CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config${LLVMVER} CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config${LLVMVER}
PLIST_SUB= OCL20=${"${ARCH:Mamd64}" != "":?"":"@comment "}
ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS= i386 amd64
ONLY_FOR_ARCHS_REASON= Beignet needs a graphics driver supported by the Intel KMS driver ONLY_FOR_ARCHS_REASON= Beignet needs a graphics driver supported by the Intel KMS driver
OPTIONS_DEFINE= FP64 TEST OPTIONS_DEFINE= FP64 OCL20 TEST
FP64_DESC= Double precision (experimental) OPTIONS_DEFAULT= OCL20
OPTIONS_EXCLUDE_i386= OCL20
OPTIONS_SUB= yes
FP64_DESC= Double precision (experimental)
FP64_CMAKE_BOOL= EXPERIMENTAL_DOUBLE FP64_CMAKE_BOOL= EXPERIMENTAL_DOUBLE
OCL20_DESC= OpenCL 2.0 support
OCL20_CMAKE_BOOL= ENABLE_OPENCL_20
TEST_ALL_TARGET= flat_address_space utest_run TEST_ALL_TARGET= flat_address_space utest_run
post-patch: post-patch:
@${REINPLACE_CMD} -e 's|llvm-dis|llvm-dis${LLVMVER}|g; \ @${REINPLACE_CMD} -e 's|llvm-dis|llvm-dis${LLVMVER}|g; \
s|clang |clang${LLVMVER} |g' \ s|clang |clang${LLVMVER} |g' \
${WRKSRC}/backend/kernels/compile.sh ${WRKSRC}/backend/kernels/compile.sh
# BSD mkdir(1) doesn't support -p flag after arguments
@${REINPLACE_CMD} -e 's/\(mkdir\)\(.*\)\( -p\)/\1\3\2/' \
${WRKSRC}/utests/CMakeLists.txt
# XXX bug 213732: compiler_fill_gl_image() [FAILED] # XXX bug 213732: compiler_device_enqueue() Interrupt signal (SIGSEGV) received.
do-test-TEST-on: do-test-TEST-on:
-@(cd ${TEST_WRKSRC}/utests; . ./setenv.sh; \ -@(cd ${TEST_WRKSRC}/utests; . ./setenv.sh; \
./flat_address_space; ./utest_run; ) ./flat_address_space; ./utest_run; )
pre-install-TEST-on: do-test-TEST-on pre-install-TEST-on: do-test-TEST-on
post-install: post-install:
@${RM} -r ${STAGEDIR}${PREFIX}/include/CL @${RM} -r ${STAGEDIR}${PREFIX}/include/CL
.include <bsd.port.mk> .include <bsd.port.mk>
View Options

lang/beignet/distinfo

TIMESTAMP = 1489436686 TIMESTAMP = 1501477522
SHA256 (beignet-1.3.1-source.tar.gz) = 399b7bc64d674b3092683263f7c085c5592686b9d837817e77857248e5cb561f SHA256 (intel-beignet-Release_v1.3.1-227-g757ccf02_GH0.tar.gz) = 7cec10015696ace9a150c3fa12dc63abb55cf66719cfeeef4325e5e6643c5738
SIZE (beignet-1.3.1-source.tar.gz) = 1136608 SIZE (intel-beignet-Release_v1.3.1-227-g757ccf02_GH0.tar.gz) = 1156701
View Options

lang/beignet/files/patch-CMakeLists.txt

--- CMakeLists.txt.orig 2017-01-20 10:44:56 UTC --- CMakeLists.txt.orig 2017-07-31 05:05:22 UTC
+++ CMakeLists.txt +++ CMakeLists.txt
@@ -31,7 +31,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA @@ -31,7 +31,6 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
INCLUDE (FindPkgConfig) INCLUDE (FindPkgConfig)
-SET(CMAKE_VERBOSE_MAKEFILE "false") -SET(CMAKE_VERBOSE_MAKEFILE "false")
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/") set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_SOURCE_DIR}/CMake/")
INCLUDE (GNUInstallDirs OPTIONAL) INCLUDE (GNUInstallDirs OPTIONAL)
# support old CMake without GNUInstallDirs # support old CMake without GNUInstallDirs
@@ -101,7 +100,7 @@ ELSE (USE_STANDALONE_GBE_COMPILER STREQU @@ -101,7 +100,7 @@ ELSE (USE_STANDALONE_GBE_COMPILER STREQU
ENDIF (USE_STANDALONE_GBE_COMPILER STREQUAL "true") ENDIF (USE_STANDALONE_GBE_COMPILER STREQUAL "true")
-set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic -Wl,--no-undefined ${LLVM_LDFLAGS}") -set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic -Wl,--no-undefined ${LLVM_LDFLAGS}")
+set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic ${LLVM_LDFLAGS}") +set (CMAKE_SHARED_LINKER_FLAGS "${CMAKE_SHARED_LINKER_FLAGS} -Wl,-Bsymbolic ${LLVM_LDFLAGS}")
# XLib # XLib
Find_Package(X11) Find_Package(X11)
@@ -219,7 +218,7 @@ IF(OCLIcd_FOUND) @@ -219,7 +218,7 @@ IF(OCLICD_COMPAT)
"intel-beignet.icd.in"
"${ICD_FILE_NAME}" "${ICD_FILE_NAME}"
) )
- install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION /etc/OpenCL/vendors) IF(NOT OCL_ICD_INSTALL_PREFIX)
+ install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors) - set(OCL_ICD_INSTALL_PREFIX "/etc/OpenCL/vendors")
+ set(OCL_ICD_INSTALL_PREFIX "${CMAKE_INSTALL_PREFIX}/etc/OpenCL/vendors")
ENDIF(NOT OCL_ICD_INSTALL_PREFIX)
install (FILES ${CMAKE_CURRENT_BINARY_DIR}/${ICD_FILE_NAME} DESTINATION ${OCL_ICD_INSTALL_PREFIX})
ELSE(OCLIcd_FOUND) ELSE(OCLIcd_FOUND)
MESSAGE(STATUS "Looking for OCL ICD header file - not found")
ENDIF(OCLIcd_FOUND)
View Options

lang/beignet/files/patch-utests_image__planar__yuv.cpp

  • This file was added.
--- utests/image_planar_yuv.cpp.orig 2017-06-23 08:05:54 UTC
+++ utests/image_planar_yuv.cpp
@@ -1,6 +1,6 @@
#include <string.h>
#include "utest_helper.hpp"
-#include <malloc.h>
+#include <cstdlib>
#include <cstring>
static void image_planar_yuv(void)
@@ -28,10 +28,9 @@ static void image_planar_yuv(void)
uint8_t* src_data;
uint8_t* yplane_data;
uint8_t* uvplane_data;
- src_data = (uint8_t*)memalign(base_address_alignment, buffer_sz);
- yplane_data = (uint8_t*)memalign(base_address_alignment, yplane_sz);
- uvplane_data = (uint8_t*)memalign(base_address_alignment, uvplane_sz);
- if (!src_data || !yplane_data || !uvplane_data) {
+ if (posix_memalign((void **)&src_data, base_address_alignment, buffer_sz) ||
+ posix_memalign((void **)&yplane_data, base_address_alignment, yplane_sz) ||
+ posix_memalign((void **)&uvplane_data, base_address_alignment, uvplane_sz)) {
fprintf(stderr, "run out of memory\n");
return;
}
View Options

lang/beignet/pkg-plist

Loading...