--- b/lang/pocl/Makefile +++ b/lang/pocl/Makefile @@ -1,41 +1,43 @@ -PORTNAME= pocl -PORTVERSION= 1.6 -PORTREVISION= 1 +PORTNAME= pocl +PORTVERSION= 1.7 DISTVERSIONPREFIX= v -CATEGORIES= lang +CATEGORIES= lang -MAINTAINER= ohartmann@walstatt.org -COMMENT= POrtable Computing Language (POCL) +MAINTAINER= ohartmann@walstatt.org +COMMENT= POrtable Computing Language (POCL) -LICENSE= MIT +LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 -ONLY_FOR_ARCHS_REASON= only tested on x86 +ONLY_FOR_ARCHS_REASON= only tested on x86 architectures -BUILD_DEPENDS= llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION} \ - opencl>=2.2:devel/opencl -LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 libOpenCL.so:devel/ocl-icd -RUN_DEPENDS= ${BUILD_DEPENDS} +RUN_DEPENDS= llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION} \ + opencl>=2.2:devel/opencl +LIB_DEPENDS= libhwloc.so:devel/hwloc2 \ + libOpenCL.so:devel/ocl-icd -USES= cmake localbase:ldflags ncurses pkgconfig -USE_GITHUB= yes +LLVM_VERSION= ${MESA_LLVM_VER:U12} + +USES= cmake localbase:ldflags ncurses pkgconfig + +USE_GITHUB= yes USE_LDCONFIG= yes -LLVM_VERSION= ${MESA_LLVM_VER:U11} CMAKE_ARGS= -DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \ - -DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \ - -DKERNELLIB_HOST_CPU_VARIANTS="distro" \ - -DSINGLE_LLVM_LIB=ON + -DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \ + -DKERNELLIB_HOST_CPU_VARIANTS="distro" \ + -DSINGLE_LLVM_LIB=ON PLIST_SUB= CONFIGURE_TARGET=${CONFIGURE_TARGET:S/amd64/x86_64/} OPTIONS_DEFINE= DOCS +OPTIONS_SUB= YES -DOCS_DESC= Build documentation (needs sphinx) -DOCS_CMAKE_OFF= -DENABLE_DOCS=OFF -DOCS_CMAKE_ON= -DENABLE_DOCS=ON +DOCS_DESC= Build documentation (needs textproc/sphinx) +DOCS_CMAKE_OFF= -DENABLE_DOCS=OFF +DOCS_CMAKE_ON= -DENABLE_DOCS=ON DOCS_USES= python:3.6+ -DOCS_BUILD_DEPENDS= ${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} +DOCS_BUILD_DEPENDS= ${PY_FLAVOR}-sphinx>0:textproc/py-sphinx@${PY_FLAVOR} .include --- b/lang/pocl/distinfo +++ b/lang/pocl/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1608358712 -SHA256 (pocl-pocl-v1.6_GH0.tar.gz) = b0a4c0c056371b6f0db726b88fbb76bbee94948fb2abd4dbc8d958f7c42f766c -SIZE (pocl-pocl-v1.6_GH0.tar.gz) = 1595212 +TIMESTAMP = 1627275626 +SHA256 (pocl-pocl-v1.7_GH0.tar.gz) = 5f6bbc391ba144bc7becc3b90888b25468460d5aa6830f63a3b066137e7bfac3 +SIZE (pocl-pocl-v1.7_GH0.tar.gz) = 1577676 --- b/lang/pocl/files/patch-CMakeLists.txt +++ b/lang/pocl/files/patch-CMakeLists.txt @@ -1,8 +1,8 @@ ---- CMakeLists.txt.orig 2020-12-16 13:02:13 UTC +--- CMakeLists.txt.orig 2019-04-04 12:06:59 UTC +++ CMakeLists.txt -@@ -398,6 +398,9 @@ endif() - - +@@ -546,6 +546,9 @@ else() + set(HAVE_UTIME 0) + endif() +include(CheckIncludeFiles) +check_include_files("sys/types.h;sys/sysctl.h" HAVE_SYSCTL_H) --- b/lang/pocl/files/patch-config.h.in.cmake +++ b/lang/pocl/files/patch-config.h.in.cmake @@ -1,6 +1,6 @@ ---- config.h.in.cmake.orig 2020-12-16 13:02:13 UTC +--- config.h.in.cmake.orig 2019-04-04 12:06:59 UTC +++ config.h.in.cmake -@@ -39,6 +39,8 @@ +@@ -41,6 +41,8 @@ #cmakedefine HAVE_VFORK --- b/lang/pocl/files/patch-lib_CL_devices_cpuinfo.c +++ b/lang/pocl/files/patch-lib_CL_devices_cpuinfo.c @@ -1,5 +1,5 @@ ---- lib/CL/devices/cpuinfo.c.orig 2020-12-16 13:02:13 UTC -+++ lib/CL/devices/cpuinfo.c +--- lib/CL/devices/cpuinfo.c.orig 2020-12-16 14:02:13.000000000 +0100 ++++ lib/CL/devices/cpuinfo.c 2020-12-19 10:46:13.846666000 +0100 @@ -34,6 +34,12 @@ #include "config.h" #include "cpuinfo.h" @@ -13,7 +13,7 @@ static const char* cpuinfo = "/proc/cpuinfo"; #define MAX_CPUINFO_SIZE 64*1024 //#define DEBUG_POCL_CPUINFO -@@ -41,9 +47,6 @@ static const char* cpuinfo = "/proc/cpuinfo"; +@@ -41,9 +47,6 @@ //Linux' cpufrec interface static const char* cpufreq_file="/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"; @@ -23,7 +23,7 @@ /* Strings to parse in /proc/cpuinfo. Else branch is for x86, x86_64 */ #if defined __powerpc__ #define FREQSTRING "clock" -@@ -156,8 +159,51 @@ pocl_cpuinfo_detect_max_clock_frequency() +@@ -156,8 +159,51 @@ } return -1; } @@ -75,7 +75,7 @@ /** * Detects the number of parallel hardware threads supported by * the CPU by parsing the cpuinfo. -@@ -235,6 +281,19 @@ pocl_cpuinfo_detect_compute_unit_count() +@@ -235,6 +281,19 @@ } return -1; } @@ -95,7 +95,7 @@ #if __arm__ || __aarch64__ enum -@@ -302,6 +361,7 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_device_id devi +@@ -302,6 +361,7 @@ * short_name is in the .data anyways.*/ device->long_name = device->short_name; @@ -103,7 +103,7 @@ /* default vendor and vendor_id, in case it cannot be found by other means */ device->vendor = cpuvendor_default; if (device->vendor_id == 0) -@@ -404,7 +464,26 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_device_id devi +@@ -404,7 +464,26 @@ char *new_name = (char*)malloc (len); snprintf (new_name, len, "%s-%s", device->short_name, start); device->long_name = new_name; @@ -130,7 +130,7 @@ /* If the vendor_id field is still empty, we should get the PCI ID associated * with the CPU vendor (if there is one), to be ready for the (currently * provisional) OpenCL 3.0 specification that has finally clarified the -@@ -415,10 +494,20 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_device_id devi +@@ -415,10 +494,20 @@ */ if (!device->vendor_id) { --- /dev/null +++ b/lang/pocl/files/patch-lib_CL_pocl_timing.c @@ -0,0 +1,11 @@ +--- lib/CL/pocl_timing.c.orig 2021-07-26 09:46:46.292427000 +0200 ++++ lib/CL/pocl_timing.c 2021-07-26 09:49:46.393248000 +0200 +@@ -75,7 +75,7 @@ + clock_gettime(CLOCK_MONOTONIC, ×pec); + # endif + # elif defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__) || defined(__FreeBSD_kernel__) +- clock_gettime(CLOCK_UPTIME_FAST, ×pec); ++ clock_gettime(CLOCK_MONOTONIC_FAST, ×pec); + # else + # warning Using clock_gettime with CLOCK_REALTIME for monotonic clocks + clock_gettime(CLOCK_REALTIME, ×pec); --- b/lang/pocl/pkg-plist +++ b/lang/pocl/pkg-plist @@ -2,7 +2,7 @@ bin/poclcc etc/OpenCL/vendors/pocl.icd lib/libpocl.so lib/libpocl.so.2 -lib/libpocl.so.2.6.0 +lib/libpocl.so.2.7.0 lib/pocl/libllvmopencl.so lib/pocl/libpocl-devices-basic.so lib/pocl/libpocl-devices-pthread.so