Index: lang/pocl/Makefile =================================================================== --- lang/pocl/Makefile (revision 481004) +++ lang/pocl/Makefile (working copy) @@ -1,46 +1,52 @@ # $FreeBSD$ -PORTNAME= pocl -PORTVERSION= 0.14 -CATEGORIES= lang -MASTER_SITES= SF/pocl \ - http://portablecl.org/downloads/ +PORTNAME= pocl +PORTVERSION= 1.2 +DISTVERSIONPREFIX= v +CATEGORIES= lang -MAINTAINER= ohartman@zedat.fu-berlin.de -COMMENT= POrtable Computing Language (POCL) +MAINTAINER= ohartmann@walstatt.org +COMMENT= POrtable Computing Language (POCL) -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE +LICENSE= MIT +LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_FreeBSD_10= pocl is not supported on 10.x -ONLY_FOR_ARCHS= amd64 i386 + +ONLY_FOR_ARCHS= i386 amd64 ONLY_FOR_ARCHS_REASON= only tested on x86 BUILD_DEPENDS= llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION} \ - opencl>=2.1:devel/opencl + opencl>=2.1:devel/opencl LIB_DEPENDS= libhwloc.so:devel/hwloc \ - libOpenCL.so:devel/ocl-icd \ - libltdl.so:devel/libltdl + libOpenCL.so:devel/ocl-icd \ + libltdl.so:devel/libltdl RUN_DEPENDS= llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION} -LLVM_VERSION= ${MESA_LLVM_VER:U40} +LLVM_VERSION= ${MESA_LLVM_VER:U60} -USES= cmake:outsource localbase:ldflags ncurses pkgconfig -USE_CXXSTD= gnu++11 +USES= cmake localbase:ldflags ncurses pkgconfig + +USE_GITHUB= yes USE_LDCONFIG= yes +USE_CXXSTD= gnu++11 -CMAKE_ARGS= -DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \ - -DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \ - -DKERNELLIB_HOST_CPU_VARIANTS="distro" -PLIST_SUB= OPSYS=${OPSYS:tl} ARCH=${ARCH:S/amd64/x86_64/} +CMAKE_ARGS= -DWITH_LLVM_CONFIG="${LOCALBASE}/llvm${LLVM_VERSION}/bin/llvm-config" \ + -DPOCL_INSTALL_PKGCONFIG_DIR="${PREFIX}/libdata/pkgconfig" \ + -DKERNELLIB_HOST_CPU_VARIANTS="distro" +PLIST_SUB= OPSYS=${OPSYS:tl} ARCH=${ARCH:S/amd64/x86_64/} -OPTIONS_DEFINE= TEST +OPTIONS_DEFINE= TEST CUDA -TEST_DESC= Tests from the OpenCL book +TEST_DESC= Tests from the OpenCL book TEST_CMAKE_OFF= -DENABLE_TESTSUITES="" TEST_CMAKE_ON= -DENABLE_TESTSUITES="all" TEST_TARGET= test +CUDA_DESC= Enable CUDA backend (req. LLVM NVPTX supp., EXPERIMENTAL!) +CUDA_CMAKE_OFF= -DENABLE_CUDA=OFF +CUDA_CMAKE_ON= -DENABLE_CUDA=ON + pre-install-TEST-on: do-test .include Index: lang/pocl/distinfo =================================================================== --- lang/pocl/distinfo (revision 481004) +++ lang/pocl/distinfo (working copy) @@ -1,3 +1,3 @@ -TIMESTAMP = 1491868935 -SHA256 (pocl-0.14.tar.gz) = 2127bf925a91fbbe3daf2f1bac0da5c8aceb16e2a9434977a3057eade974106a -SIZE (pocl-0.14.tar.gz) = 1231630 +TIMESTAMP = 1538380921 +SHA256 (pocl-pocl-v1.2_GH0.tar.gz) = 0c43e68f336892f3a64cba19beb99d9212f529bedb77f7879c0331450b982d46 +SIZE (pocl-pocl-v1.2_GH0.tar.gz) = 1603374 Index: lang/pocl/files/patch-CMakeLists.txt =================================================================== --- lang/pocl/files/patch-CMakeLists.txt (revision 481004) +++ lang/pocl/files/patch-CMakeLists.txt (working copy) @@ -1,21 +1,12 @@ ---- CMakeLists.txt.orig 2017-04-05 14:15:40 UTC -+++ CMakeLists.txt -@@ -70,7 +70,7 @@ elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "a - set(ARMV6 1) - elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64") - set(ARM64 1) --elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(i.86|AMD64|x86_64)") -+elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "(i.86|amd64|AMD64|x86_64)") - if(POCL_DEVICE_ADDRESS_BITS MATCHES "32") - set(I386 1) - else() -@@ -318,6 +318,9 @@ include(CheckFunctionExists) - check_function_exists(fork HAVE_FORK) - check_function_exists(vfork HAVE_VFORK) +--- CMakeLists.txt.orig 2018-09-04 14:56:24.344580000 +0200 ++++ CMakeLists.txt 2018-09-04 14:57:13.570910000 +0200 +@@ -546,6 +546,9 @@ + set(HAVE_UTIME 0) + endif() +include(CheckIncludeFiles) +check_include_files("sys/types.h;sys/sysctl.h" HAVE_SYSCTL_H) + + ###################################################################################### - if(NOT DEFINED DEFAULT_USE_VECMATHLIB) Index: lang/pocl/files/patch-lib_CL_devices_cpuinfo.c =================================================================== --- lang/pocl/files/patch-lib_CL_devices_cpuinfo.c (revision 481004) +++ lang/pocl/files/patch-lib_CL_devices_cpuinfo.c (working copy) @@ -1,5 +1,5 @@ ---- lib/CL/devices/cpuinfo.c.orig 2017-04-05 14:15:40 UTC -+++ lib/CL/devices/cpuinfo.c +--- lib/CL/devices/cpuinfo.c.orig 2017-12-18 19:45:26.000000000 +0100 ++++ lib/CL/devices/cpuinfo.c 2017-12-23 03:18:38.821984000 +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 -@@ -153,8 +159,51 @@ pocl_cpuinfo_detect_max_clock_frequency( +@@ -153,8 +159,51 @@ } return -1; } @@ -65,7 +65,7 @@ /** * Detects the number of parallel hardware threads supported by * the CPU by parsing the cpuinfo. -@@ -232,6 +281,19 @@ pocl_cpuinfo_detect_compute_unit_count() +@@ -232,6 +281,19 @@ } return -1; } @@ -85,7 +85,7 @@ #ifdef POCL_ANDROID -@@ -270,6 +332,7 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_ +@@ -326,6 +388,7 @@ * short_name is in the .data anyways.*/ device->long_name = device->short_name; @@ -93,7 +93,7 @@ /* default vendor and vendor_id, in case it cannot be found by other means */ device->vendor = cpuvendor_default; if (device->vendor_id == 0) -@@ -318,7 +381,25 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_ +@@ -425,6 +488,25 @@ char *new_name = (char*)malloc (len); snprintf (new_name, len, "%s-%s", device->short_name, start); device->long_name = new_name; @@ -101,7 +101,7 @@ + int mib[2]; + size_t len = 0; + char *model; - ++ + mib[0] = CTL_HW; + mib[1] = HW_MODEL; + if (sysctl(mib, 2, NULL, &len, NULL, 0)) Index: lang/pocl/files/patch-tests_regression_test__issue__445.cpp =================================================================== --- lang/pocl/files/patch-tests_regression_test__issue__445.cpp (revision 481004) +++ lang/pocl/files/patch-tests_regression_test__issue__445.cpp (nonexistent) @@ -1,11 +0,0 @@ ---- tests/regression/test_issue_445.cpp.orig 2017-04-05 14:15:40 UTC -+++ tests/regression/test_issue_445.cpp -@@ -29,7 +29,7 @@ private_local_array(__global int *__rest - } - )CLC"; - --int main(int, char *) -+int main(int, char **) - { - try { - int N = 9; Property changes on: lang/pocl/files/patch-tests_regression_test__issue__445.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: lang/pocl/pkg-plist =================================================================== --- lang/pocl/pkg-plist (revision 481004) +++ lang/pocl/pkg-plist (working copy) @@ -1,14 +1,11 @@ bin/poclcc etc/OpenCL/vendors/pocl.icd -include/poclu.h lib/libpocl.so -lib/libpocl.so.1 -lib/libpocl.so.1.7.0 -lib/libpoclu.so -lib/libpoclu.so.1 -lib/libpoclu.so.1.7.0 +lib/libpocl.so.2 +lib/libpocl.so.2.2.0 lib/pocl/libllvmopencl.so libdata/pkgconfig/pocl.pc +%%DATADIR%%/include/_builtin_renames.h %%DATADIR%%/include/_enable_all_exts.h %%DATADIR%%/include/_kernel.h %%DATADIR%%/include/_kernel_c.h @@ -19,6 +16,7 @@ %%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx.bc %%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx2.bc %%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx512.bc +%%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx_f16c.bc %%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-avx_fma4.bc %%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-sse2.bc %%DATADIR%%/kernel-%%ARCH%%-portbld-%%OPSYS%%%%OSREL%%-sse41.bc