Attachment #180792 for bug #217771




# $FreeBSD$

PORTNAME=	beignet
PORTVERSION=	1.3.1
PORTREVISION=	1
CATEGORIES=	lang
MASTER_SITES=	https://01.org/sites/default/files/
DISTVERSIONSUFFIX=	-source

MAINTAINER=	x11@FreeBSD.org
COMMENT=	OpenCL library for Intel GPUs

LICENSE=	LGPL21+
LICENSE_FILE=	${WRKSRC}/COPYING

BUILD_DEPENDS=	clang${LLVMVER}:devel/llvm${LLVMVER} \
		opencl>=0:devel/opencl
LIB_DEPENDS=	libOpenCL.so:devel/ocl-icd \

USE_XORG=	sm ice x11 xext xfixes
USE_GL=		gl egl
SHEBANG_FILES=	src/git_sha1.sh backend/kernels/compile.sh
ALL_TARGET=	all
LLVMVER=	39

CMAKE_ARGS+=	-DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config${LLVMVER}

ONLY_FOR_ARCHS=	i386 amd64
ONLY_FOR_ARCHS_REASON= Beignet needs a graphics driver supported by the Intel KMS driver

OPTIONS_DEFINE=		FP64 OPENCL20 TEST
OPTIONS_DEFAULT_amd64=	OPENCL20
OPTIONS_EXCLUDE=	${ARCH:Namd64:C/.+/OPENCL20/}
OPTIONS_SUB=		yes

FP64_DESC=		Double precision (experimental)
FP64_CMAKE_BOOL=	EXPERIMENTAL_DOUBLE

OPENCL20_DESC=		OpenCL 2.0 support
OPENCL20_CMAKE_BOOL=	ENABLE_OPENCL_20

TEST_ALL_TARGET=	flat_address_space utest_run

post-patch:
	@${REINPLACE_CMD} -e 's|llvm-dis|llvm-dis${LLVMVER}|g; \
		s|clang |clang${LLVMVER} |g' \
		${WRKSRC}/backend/kernels/compile.sh

# XXX bug 213732: compiler_fill_gl_image() [FAILED]
do-test-TEST-on:
	-@(cd ${TEST_WRKSRC}/utests; . ./setenv.sh; \
		./flat_address_space; \
		./utest_run; \
	)

pre-install-TEST-on: do-test-TEST-on

post-install:
	@${RM} -r ${STAGEDIR}${PREFIX}/include/CL

#post-install-TESTS-on:
#	@cd ${WRKSRC}/utests && sh ./setenv.sh && ./utest_run

.include <bsd.port.mk>

Lines 1-3 Link Here

(-)b/lang/beignet/distinfo (-3 / +3 lines)
1	TIMESTAMP = 1488314347	1	TIMESTAMP = 1489418793
2	SHA256 (beignet-1.3.0-source.tar.gz) = 63d98b4fe8fba3dbc0299d29fef84560625e5ac51b16b8fed453021d4afb5cd5	2	SHA256 (beignet-1.3.1-source.tar.gz) = 399b7bc64d674b3092683263f7c085c5592686b9d837817e77857248e5cb561f
3	SIZE (beignet-1.3.0-source.tar.gz) = 1133643	3	SIZE (beignet-1.3.1-source.tar.gz) = 1136608




--- utests/image_from_buffer.cpp.orig	2017-01-20 10:40:51 UTC
+++ utests/image_from_buffer.cpp
@@ -1,6 +1,6 @@
 #include <string.h>
 #include "utest_helper.hpp"
-#include <malloc.h>
+#include <cstdlib>
 #include <cstring>
 
 static void image_from_buffer(void)
@@ -33,7 +33,7 @@ static void image_from_buffer(void)
   // Setup kernel and images
   size_t buffer_sz = sizeof(uint32_t) * w * h;
   uint32_t* src_data;
-  src_data = (uint32_t*)memalign(base_address_alignment, buffer_sz);
+  src_data = (uint32_t*)aligned_alloc(base_address_alignment, buffer_sz);
   if(!src_data) {
     fprintf(stderr, "run out of memory\n");
     return;

Lines 1-6 Link Here

(-)b/lang/beignet/pkg-plist (+2 lines)
1	etc/OpenCL/vendors/intel-beignet.icd	1	etc/OpenCL/vendors/intel-beignet.icd
2	lib/beignet/beignet.bc	2	lib/beignet/beignet.bc
3	lib/beignet/beignet.pch	3	lib/beignet/beignet.pch
		4	%%OPENCL20%%lib/beignet/beignet_20.bc
		5	%%OPENCL20%%lib/beignet/beignet_20.pch
4	lib/beignet/include/ocl.h	6	lib/beignet/include/ocl.h
5	lib/beignet/include/ocl_as.h	7	lib/beignet/include/ocl_as.h
6	lib/beignet/include/ocl_async.h	8	lib/beignet/include/ocl_async.h

Return to bug 217771

Lines 2-9 Link Here

(-)b/lang/beignet/Makefile (-11 / +26 lines)
2	# $FreeBSD$	2	# $FreeBSD$
3		3
4	PORTNAME= beignet	4	PORTNAME= beignet
5	PORTVERSION= 1.3.0	5	PORTVERSION= 1.3.1
6	PORTREVISION= 1
7	CATEGORIES= lang	6	CATEGORIES= lang
8	MASTER_SITES= https://01.org/sites/default/files/	7	MASTER_SITES= https://01.org/sites/default/files/
9	DISTVERSIONSUFFIX= -source	8	DISTVERSIONSUFFIX= -source
Lines 11-16 DISTVERSIONSUFFIX= -source Link Here
11	MAINTAINER= x11@FreeBSD.org	10	MAINTAINER= x11@FreeBSD.org
12	COMMENT= OpenCL library for Intel GPUs	11	COMMENT= OpenCL library for Intel GPUs
13		12
		13	LICENSE= LGPL21+
		14	LICENSE_FILE= ${WRKSRC}/COPYING
		15
14	BUILD_DEPENDS= clang${LLVMVER}:devel/llvm${LLVMVER} \	16	BUILD_DEPENDS= clang${LLVMVER}:devel/llvm${LLVMVER} \
15	opencl>=0:devel/opencl	17	opencl>=0:devel/opencl
16	LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \	18	LIB_DEPENDS= libOpenCL.so:devel/ocl-icd \
Lines 24-29 USES= cmake gmake ncurses pkgconfig shebangfix Link Here
24	USE_XORG= sm ice x11 xext xfixes	26	USE_XORG= sm ice x11 xext xfixes
25	USE_GL= gl egl	27	USE_GL= gl egl
26	SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh	28	SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh
		29	ALL_TARGET= all
27	LLVMVER= 39	30	LLVMVER= 39
28		31
29	CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config${LLVMVER}	32	CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config${LLVMVER}
Lines 31-52 CMAKE_ARGS+= -DLLVM_CONFIG_EXECUTABLE=${LOCALBASE}/bin/llvm-config${LLVMVER} Link Here
31	ONLY_FOR_ARCHS= i386 amd64	34	ONLY_FOR_ARCHS= i386 amd64
32	ONLY_FOR_ARCHS_REASON= Beignet needs a graphics driver supported by the Intel KMS driver	35	ONLY_FOR_ARCHS_REASON= Beignet needs a graphics driver supported by the Intel KMS driver
33		36
34	# running tests from makefile doesn't work quite yet, so comment them out for now.	37	OPTIONS_DEFINE= FP64 OPENCL20 TEST
35	#OPTIONS_DEFINE= TESTS	38	OPTIONS_DEFAULT_amd64= OPENCL20
36	#TESTS_DESC= Build and run the test suite	39	OPTIONS_EXCLUDE= ${ARCH:Namd64:C/.+/OPENCL20/}
		40	OPTIONS_SUB= yes
		41
		42	FP64_DESC= Double precision (experimental)
		43	FP64_CMAKE_BOOL= EXPERIMENTAL_DOUBLE
		44
		45	OPENCL20_DESC= OpenCL 2.0 support
		46	OPENCL20_CMAKE_BOOL= ENABLE_OPENCL_20
		47
		48	TEST_ALL_TARGET= flat_address_space utest_run
37		49
38	post-patch:	50	post-patch:
39	@${REINPLACE_CMD} -e 's\|llvm-dis\|llvm-dis${LLVMVER}\|g; \	51	@${REINPLACE_CMD} -e 's\|llvm-dis\|llvm-dis${LLVMVER}\|g; \
40	s\|clang \|clang${LLVMVER} \|g' \	52	s\|clang \|clang${LLVMVER} \|g' \
41	${WRKSRC}/backend/kernels/compile.sh	53	${WRKSRC}/backend/kernels/compile.sh
42	#post-patch-TESTS-off:	54
43	@${REINPLACE_CMD} -e 's\|ADD_SUBDIRECTORY(utests)\|\|g' \	55	# XXX bug 213732: compiler_fill_gl_image() [FAILED]
44	${WRKSRC}/CMakeLists.txt	56	do-test-TEST-on:
		57	-@(cd ${TEST_WRKSRC}/utests; . ./setenv.sh; \
		58	./flat_address_space; \
		59	./utest_run; \
		60	)
		61
		62	pre-install-TEST-on: do-test-TEST-on
45		63
46	post-install:	64	post-install:
47	@${RM} -r ${STAGEDIR}${PREFIX}/include/CL	65	@${RM} -r ${STAGEDIR}${PREFIX}/include/CL
48		66
49	#post-install-TESTS-on:
50	# @cd ${WRKSRC}/utests && sh ./setenv.sh && ./utest_run
51
52	.include <bsd.port.mk>	67	.include <bsd.port.mk>

Added Link Here

(-)b/lang/beignet/files/patch-utests_image__from__buffer.cpp (+19 lines)
1	--- utests/image_from_buffer.cpp.orig 2017-01-20 10:40:51 UTC
2	+++ utests/image_from_buffer.cpp
3	@@ -1,6 +1,6 @@
4	#include <string.h>
5	#include "utest_helper.hpp"
6	-#include <malloc.h>
7	+#include <cstdlib>
8	#include <cstring>
9
10	static void image_from_buffer(void)
11	@@ -33,7 +33,7 @@ static void image_from_buffer(void)
12	// Setup kernel and images
13	size_t buffer_sz = sizeof(uint32_t) * w * h;
14	uint32_t* src_data;
15	- src_data = (uint32_t*)memalign(base_address_alignment, buffer_sz);
16	+ src_data = (uint32_t*)aligned_alloc(base_address_alignment, buffer_sz);
17	if(!src_data) {
18	fprintf(stderr, "run out of memory\n");
19	return;