Date: Thu, 1 Sep 2016 18:53:53 +0000 (UTC) From: Koop Mast <kwm@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r421241 - in head/lang/beignet: . files Message-ID: <201609011853.u81IrrT0009479@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kwm Date: Thu Sep 1 18:53:53 2016 New Revision: 421241 URL: https://svnweb.freebsd.org/changeset/ports/421241 Log: Update beignet to 1.2.0. Deleted: head/lang/beignet/files/patch-src_cl__api.c head/lang/beignet/files/patch-src_cl__program.c Modified: head/lang/beignet/Makefile head/lang/beignet/distinfo head/lang/beignet/files/patch-backend_src_backend_gen-insn-selection.cpp head/lang/beignet/files/patch-src_cl__device__id.c head/lang/beignet/files/patch-src_cl__event.c head/lang/beignet/pkg-plist Modified: head/lang/beignet/Makefile ============================================================================== --- head/lang/beignet/Makefile Thu Sep 1 17:41:38 2016 (r421240) +++ head/lang/beignet/Makefile Thu Sep 1 18:53:53 2016 (r421241) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= beignet -PORTVERSION= 1.1.2 +PORTVERSION= 1.2.0 CATEGORIES= lang MASTER_SITES= https://01.org/sites/default/files/ DISTVERSIONSUFFIX= -source @@ -19,7 +19,7 @@ RUN_DEPENDS= opencl>=0:devel/opencl \ WRKSRC= ${WRKDIR}/Beignet-${PORTVERSION}-Source -USES= cmake gmake pkgconfig shebangfix +USES= cmake gmake ncurses pkgconfig shebangfix USE_XORG= sm ice x11 xext xfixes USE_GL= gl SHEBANG_FILES= src/git_sha1.sh backend/kernels/compile.sh Modified: head/lang/beignet/distinfo ============================================================================== --- head/lang/beignet/distinfo Thu Sep 1 17:41:38 2016 (r421240) +++ head/lang/beignet/distinfo Thu Sep 1 18:53:53 2016 (r421241) @@ -1,3 +1,3 @@ -TIMESTAMP = 1463781667 -SHA256 (beignet-1.1.2-source.tar.gz) = 6a8d875afbb5e3c4fc57da1ea80f79abadd9136bfd87ab1f83c02784659f1d96 -SIZE (beignet-1.1.2-source.tar.gz) = 948241 +TIMESTAMP = 1472595672 +SHA256 (beignet-1.2.0-source.tar.gz) = fc7af19efb7596b04510d26c558a576eba3e95e1ef86fd6951213c6a4bf58bff +SIZE (beignet-1.2.0-source.tar.gz) = 1076674 Modified: head/lang/beignet/files/patch-backend_src_backend_gen-insn-selection.cpp ============================================================================== --- head/lang/beignet/files/patch-backend_src_backend_gen-insn-selection.cpp Thu Sep 1 17:41:38 2016 (r421240) +++ head/lang/beignet/files/patch-backend_src_backend_gen-insn-selection.cpp Thu Sep 1 18:53:53 2016 (r421241) @@ -1,15 +1,6 @@ Error: No word lists can be found for the language "en_US". --- backend/src/backend/gen_insn_selection.cpp.orig 2015-12-18 07:34:19.000000000 +0000 +++ backend/src/backend/gen_insn_selection.cpp 2016-06-13 17:37:52.540024000 +0000 -@@ -1153,7 +1153,7 @@ - SelectionInstruction *insn = this->appendInsn(SEL_OP_JMPI, 0, 1); - insn->src(0) = src; - insn->index = index.value(); -- insn->extra.longjmp = abs(index - origin) > 800; -+ insn->extra.longjmp = index.value() > origin.value() ? (index - origin) > 800 : (origin - index) > 800; - return insn->extra.longjmp ? 2 : 1; - } - @@ -1752,11 +1752,11 @@ // Boiler plate to initialize the selection library at c++ pre-main Modified: head/lang/beignet/files/patch-src_cl__device__id.c ============================================================================== --- head/lang/beignet/files/patch-src_cl__device__id.c Thu Sep 1 17:41:38 2016 (r421240) +++ head/lang/beignet/files/patch-src_cl__device__id.c Thu Sep 1 18:53:53 2016 (r421241) @@ -1,8 +1,6 @@ -diff --git a/src/cl_device_id.c b/src/cl_device_id.c -index e9e2c16..5f35248 100644 ---- src/cl_device_id.c -+++ src/cl_device_id.c -@@ -34,7 +34,12 @@ +--- src/cl_device_id.c.orig 2016-08-23 12:16:02.000000000 +0200 ++++ src/cl_device_id.c 2016-08-31 17:50:49.806646000 +0200 +@@ -35,7 +35,12 @@ #include <stdio.h> #include <string.h> #include <stdlib.h> @@ -15,7 +13,7 @@ index e9e2c16..5f35248 100644 #ifndef CL_VERSION_1_2 #define CL_DEVICE_BUILT_IN_KERNELS 0x103F -@@ -202,6 +207,7 @@ LOCAL cl_device_id +@@ -269,6 +274,7 @@ LOCAL cl_device_id cl_get_gt_device(void) { cl_device_id ret = NULL; @@ -23,7 +21,7 @@ index e9e2c16..5f35248 100644 const int device_id = cl_driver_get_device_id(); cl_device_id device = NULL; -@@ -526,7 +532,7 @@ skl_gt4_break: +@@ -737,7 +743,7 @@ kbl_gt4_break: case PCI_CHIP_SANDYBRIDGE_M_GT2_PLUS: case PCI_CHIP_SANDYBRIDGE_BRIDGE_S: case PCI_CHIP_SANDYBRIDGE_S_GT: @@ -32,17 +30,17 @@ index e9e2c16..5f35248 100644 ret = NULL; break; default: -@@ -546,6 +552,7 @@ skl_gt4_break: +@@ -757,6 +763,7 @@ kbl_gt4_break: /* Apply any driver-dependent updates to the device info */ cl_driver_update_device_info(ret); +#if defined(__linux__) - struct sysinfo info; - if (sysinfo(&info) == 0) { - uint64_t two_gb = 2 * 1024 * 1024 * 1024ul; -@@ -554,6 +561,24 @@ skl_gt4_break: - two_gb : info.totalram; - ret->max_mem_alloc_size = ret->global_mem_size / 2; + #define toMB(size) (size)&(0xfffffffffffffff<<20) + /* Get the global_mem_size and max_mem_alloc size from + * driver, system ram and hardware*/ +@@ -776,6 +783,24 @@ kbl_gt4_break: + ret->max_mem_alloc_size = toMB((ret->global_mem_size * 3 / 4 > maxallocmem) ? + maxallocmem: ret->global_mem_size * 3 / 4); } +#elif defined(__FreeBSD__) || defined(__DragonFly__) + int mib[2]; Modified: head/lang/beignet/files/patch-src_cl__event.c ============================================================================== --- head/lang/beignet/files/patch-src_cl__event.c Thu Sep 1 17:41:38 2016 (r421240) +++ head/lang/beignet/files/patch-src_cl__event.c Thu Sep 1 18:53:53 2016 (r421241) @@ -1,5 +1,5 @@ ---- src/cl_event.c.orig 2015-12-18 07:57:09.000000000 +0100 -+++ src/cl_event.c 2016-05-21 00:04:34.412251000 +0200 +--- src/cl_event.c.orig 2016-08-23 12:16:02.000000000 +0200 ++++ src/cl_event.c 2016-08-31 17:43:49.430217000 +0200 @@ -27,6 +27,7 @@ #include <assert.h> @@ -8,16 +8,7 @@ void cl_event_update_last_events(cl_command_queue queue, int wait) { -@@ -55,7 +56,7 @@ void cl_event_insert_last_events(cl_comm - else set_last_event(queue,event); - } - --inline cl_bool -+static inline cl_bool - cl_event_is_gpu_command_type(cl_command_type type) - { - switch(type) { -@@ -649,7 +650,7 @@ cl_ulong cl_event_get_cpu_timestamp(cl_u +@@ -657,7 +658,7 @@ cl_ulong cl_event_get_cpu_timestamp(cl_u { struct timespec ts; Modified: head/lang/beignet/pkg-plist ============================================================================== --- head/lang/beignet/pkg-plist Thu Sep 1 17:41:38 2016 (r421240) +++ head/lang/beignet/pkg-plist Thu Sep 1 18:53:53 2016 (r421241) @@ -22,6 +22,7 @@ lib/beignet/include/ocl_simd.h lib/beignet/include/ocl_sync.h lib/beignet/include/ocl_types.h lib/beignet/include/ocl_vload.h +lib/beignet/include/ocl_work_group.h lib/beignet/include/ocl_workitem.h lib/beignet/libcl.so lib/beignet/libgbe.so
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201609011853.u81IrrT0009479>