Index: head/lang/pocl/Makefile =================================================================== --- head/lang/pocl/Makefile (revision 565223) +++ head/lang/pocl/Makefile (revision 565224) @@ -1,45 +1,42 @@ # $FreeBSD$ -PORTNAME= pocl +PORTNAME= pocl PORTVERSION= 1.6 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 BUILD_DEPENDS= llvm${LLVM_VERSION}>=0:devel/llvm${LLVM_VERSION} \ - opencl>=2.2:devel/opencl -LIB_DEPENDS= libhwloc.so:devel/hwloc \ - libOpenCL.so:devel/ocl-icd -RUN_DEPENDS= ${BUILD_DEPENDS} + opencl>=2.2:devel/opencl +LIB_DEPENDS= libhwloc.so.15:devel/hwloc2 libOpenCL.so:devel/ocl-icd +RUN_DEPENDS= libhwloc.so.15:devel/hwloc2 libOpenCL.so:devel/ocl-icd -LLVM_VERSION= ${MESA_LLVM_VER:U11} - -USES= cmake localbase:ldflags ncurses pkgconfig - -USE_GITHUB= yes +USES= cmake localbase:ldflags ncurses pkgconfig +USE_GITHUB= yes USE_LDCONFIG= yes -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 +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 -PLIST_SUB= CONFIGURE_TARGET=${CONFIGURE_TARGET:S/amd64/x86_64/} +PLIST_SUB= CONFIGURE_TARGET=${CONFIGURE_TARGET:S/amd64/x86_64/} OPTIONS_DEFINE= DOCS DOCS_DESC= Build documentation (needs sphinx) -DOCS_CMAKE_OFF= -DENABLE_DOCS=OFF -DOCS_CMAKE_ON= -DENABLE_DOCS=ON +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} .include Index: head/lang/pocl/files/patch-CMakeLists.txt =================================================================== --- head/lang/pocl/files/patch-CMakeLists.txt (revision 565223) +++ head/lang/pocl/files/patch-CMakeLists.txt (revision 565224) @@ -1,12 +1,12 @@ ---- CMakeLists.txt.orig 2019-04-04 12:06:59 UTC +--- CMakeLists.txt.orig 2020-12-16 13:02:13 UTC +++ CMakeLists.txt -@@ -546,6 +546,9 @@ else() - set(HAVE_UTIME 0) - endif() +@@ -398,6 +398,9 @@ endif() + + +include(CheckIncludeFiles) +check_include_files("sys/types.h;sys/sysctl.h" HAVE_SYSCTL_H) + ###################################################################################### Index: head/lang/pocl/files/patch-config.h.in.cmake =================================================================== --- head/lang/pocl/files/patch-config.h.in.cmake (revision 565223) +++ head/lang/pocl/files/patch-config.h.in.cmake (revision 565224) @@ -1,11 +1,11 @@ ---- config.h.in.cmake.orig 2019-04-04 12:06:59 UTC +--- config.h.in.cmake.orig 2020-12-16 13:02:13 UTC +++ config.h.in.cmake -@@ -41,6 +41,8 @@ +@@ -39,6 +39,8 @@ #cmakedefine HAVE_VFORK +#cmakedefine HAVE_SYSCTL_H + #cmakedefine HAVE_CLOCK_GETTIME #cmakedefine HAVE_FDATASYNC Index: head/lang/pocl/files/patch-lib_CL_devices_cpuinfo.c =================================================================== --- head/lang/pocl/files/patch-lib_CL_devices_cpuinfo.c (revision 565223) +++ head/lang/pocl/files/patch-lib_CL_devices_cpuinfo.c (revision 565224) @@ -1,155 +1,155 @@ ---- 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 +--- lib/CL/devices/cpuinfo.c.orig 2020-12-16 13:02:13 UTC ++++ lib/CL/devices/cpuinfo.c @@ -34,6 +34,12 @@ #include "config.h" #include "cpuinfo.h" +#ifdef HAVE_SYSCTL_H +# include +# include +#endif + +#ifdef __linux__ static const char* cpuinfo = "/proc/cpuinfo"; #define MAX_CPUINFO_SIZE 64*1024 //#define DEBUG_POCL_CPUINFO -@@ -41,9 +47,6 @@ +@@ -41,9 +47,6 @@ static const char* cpuinfo = "/proc/cpuinfo"; //Linux' cpufrec interface static const char* cpufreq_file="/sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq"; -// Vendor of PCI root bus -static const char *pci_bus_root_vendor_file = "/sys/bus/pci/devices/0000:00:00.0/vendor"; - /* Strings to parse in /proc/cpuinfo. Else branch is for x86, x86_64 */ #if defined __powerpc__ #define FREQSTRING "clock" -@@ -156,8 +159,51 @@ +@@ -156,8 +159,51 @@ pocl_cpuinfo_detect_max_clock_frequency() } return -1; } +#elif defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) +/** + * Detects the maximum clock frequency of the CPU. + * + * Assumes all cores have the same max clock freq. + * + * @return The clock frequency in MHz. + */ +int +pocl_cpuinfo_detect_max_clock_frequency() +{ + const char mib1[] = "dev.cpu.0.freq_levels"; + const char mib2[] = "hw.clockrate"; + int clockrate = 0; + size_t size = 0; + char *value = NULL; + if (!sysctlbyname(mib1, NULL, &size, NULL, 0) && + (value = (char*)malloc(++size)) && + !sysctlbyname(mib1, (void*)value, &size, NULL, 0)) + { + value[size] = '\0'; + sscanf(value, "%d/%*d", &clockrate); + } + else + { + size = sizeof(clockrate); + sysctlbyname(mib2, (void*)&clockrate, &size, NULL, 0); + } + if (value) + free(value); + return clockrate; +} +#else +/** + * Unimplemented for other platforms. + */ +int +pocl_cpuinfo_detect_max_clock_frequency() +{ + return 0; +} +#endif +#ifdef __linux__ /** * Detects the number of parallel hardware threads supported by * the CPU by parsing the cpuinfo. -@@ -235,6 +281,19 @@ +@@ -235,6 +281,19 @@ pocl_cpuinfo_detect_compute_unit_count() } return -1; } +#else +/** + * Detects the number of parallel hardware threads supported by + * the CPU. + * + * @return The number of hardware threads. + */ + int +pocl_cpuinfo_detect_compute_unit_count() +{ + return sysconf(_SC_NPROCESSORS_ONLN); +} +#endif #if __arm__ || __aarch64__ enum -@@ -302,6 +361,7 @@ +@@ -302,6 +361,7 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_device_id devi * short_name is in the .data anyways.*/ device->long_name = device->short_name; +#ifdef __linux__ /* 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 @@ +@@ -404,7 +464,26 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_device_id devi char *new_name = (char*)malloc (len); snprintf (new_name, len, "%s-%s", device->short_name, start); device->long_name = new_name; +#elif defined(HAVE_SYSCTL_H) + 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)) + return; + if (!(model = (char*)malloc(++len))) + return; + if (sysctl(mib, 2, (void*)model, &len, NULL, 0)) + free(model); + else + { + model[len] = '\0'; + device->long_name = model; + } +#endif + /* 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 @@ +@@ -415,10 +494,20 @@ pocl_cpuinfo_get_cpu_name_and_vendor(cl_device_id devi */ if (!device->vendor_id) { - f = fopen (pci_bus_root_vendor_file, "r"); - num_read = fscanf (f, "%x", &device->vendor_id); +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) || defined(__DragonFly__) + /* + * Future work: try to extract vendor ID from PCI root bus from MIB + */ +#elif defined(__linux__) + FILE *f = fopen (pci_bus_root_vendor_file, "r"); + int num_read = fscanf (f, "%x", &device->vendor_id); fclose (f); /* no error checking, if it failed we just won't have the info */ +#else + /* + * Other aliens ... + */ +#endif } }