Date: Fri, 6 Mar 2020 23:23:00 +0000 (UTC) From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r527902 - in head/lang/intel-compute-runtime: . files Message-ID: <202003062323.026NN0J8045069@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jbeich Date: Fri Mar 6 23:23:00 2020 New Revision: 527902 URL: https://svnweb.freebsd.org/changeset/ports/527902 Log: lang/intel-compute-runtime: update to 20.09.15980 Changes: https://github.com/intel/compute-runtime/compare/20.08.15750...20.09.15980 Reported by: GitHub (watch releases) Added: head/lang/intel-compute-runtime/files/patch-getPath (contents, props changed) head/lang/intel-compute-runtime/files/patch-ocloc-no-dlsym (contents, props changed) Modified: head/lang/intel-compute-runtime/Makefile (contents, props changed) head/lang/intel-compute-runtime/distinfo (contents, props changed) head/lang/intel-compute-runtime/files/patch-backtrace (contents, props changed) head/lang/intel-compute-runtime/files/patch-clock_gettime (contents, props changed) head/lang/intel-compute-runtime/files/patch-i386 (contents, props changed) head/lang/intel-compute-runtime/files/patch-includes (contents, props changed) head/lang/intel-compute-runtime/files/patch-max_freq (contents, props changed) head/lang/intel-compute-runtime/files/patch-mmap (contents, props changed) head/lang/intel-compute-runtime/files/patch-rtld (contents, props changed) head/lang/intel-compute-runtime/files/patch-unix (contents, props changed) head/lang/intel-compute-runtime/files/patch-userptr (contents, props changed) Modified: head/lang/intel-compute-runtime/Makefile ============================================================================== --- head/lang/intel-compute-runtime/Makefile Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/Makefile Fri Mar 6 23:23:00 2020 (r527902) @@ -1,10 +1,13 @@ # $FreeBSD$ PORTNAME= compute-runtime -DISTVERSION= 20.08.15750 +DISTVERSION= 20.09.15980 CATEGORIES= lang PKGNAMEPREFIX= intel- +PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ +PATCHFILES+= 612f47ced386.patch:-p1 + MAINTAINER= jbeich@FreeBSD.org COMMENT= OpenCL implementation for Intel HD 5000 (Gen8) or newer @@ -25,7 +28,8 @@ CMAKE_ON= SKIP_UNIT_TESTS CMAKE_ARGS= -DNEO_DRIVER_VERSION:STRING="${DISTVERSIONFULL}" PLIST_FILES= etc/OpenCL/vendors/intel.icd \ bin/ocloc \ - lib/intel-opencl/libigdrcl.so + lib/intel-opencl/libigdrcl.so \ + lib/intel-opencl/libocloc.so post-patch: @${REINPLACE_CMD} -e '/-Werror/d' \ Modified: head/lang/intel-compute-runtime/distinfo ============================================================================== --- head/lang/intel-compute-runtime/distinfo Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/distinfo Fri Mar 6 23:23:00 2020 (r527902) @@ -1,3 +1,5 @@ -TIMESTAMP = 1582024564 -SHA256 (intel-compute-runtime-20.08.15750_GH0.tar.gz) = 0e7846bcae93f65c766914fe96592e449a64574c3d5b9fd7c0b69ad01dae5fd4 -SIZE (intel-compute-runtime-20.08.15750_GH0.tar.gz) = 2762119 +TIMESTAMP = 1582906602 +SHA256 (intel-compute-runtime-20.09.15980_GH0.tar.gz) = 26ac5e2f175e5aa53bed322d4f996b4218621e4cc4e3c00a6874224dc3b9c8f2 +SIZE (intel-compute-runtime-20.09.15980_GH0.tar.gz) = 2805385 +SHA256 (612f47ced386.patch) = 8e144975e53f09dbd03c06fce0dd500a33451e4b5179f53d8e9867881fe36326 +SIZE (612f47ced386.patch) = 1400 Modified: head/lang/intel-compute-runtime/files/patch-backtrace ============================================================================== --- head/lang/intel-compute-runtime/files/patch-backtrace Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/files/patch-backtrace Fri Mar 6 23:23:00 2020 (r527902) @@ -12,8 +12,8 @@ ld: error: undefined symbol: backtrace_symbols >>> referenced by safety_caller_linux.cpp >>> CMakeFiles/ocloc.dir/utilities/linux/safety_caller_linux.cpp.o:(SafetyGuardLinux::sigAction(int, __siginfo*, void*)) ---- offline_compiler/utilities/linux/safety_guard_linux.h.orig 2019-11-22 15:41:47 UTC -+++ offline_compiler/utilities/linux/safety_guard_linux.h +--- shared/offline_compiler/source/utilities/linux/safety_guard_linux.h.orig 2020-02-28 16:16:42 UTC ++++ shared/offline_compiler/source/utilities/linux/safety_guard_linux.h @@ -33,7 +33,7 @@ class SafetyGuardLinux { char **callstack; int backtraceSize = 0; @@ -23,15 +23,16 @@ ld: error: undefined symbol: backtrace_symbols callstack = backtrace_symbols(addresses, backtraceSize); for (int i = 0; i < backtraceSize; ++i) { ---- offline_compiler/CMakeLists.txt.orig 2019-11-29 14:23:34 UTC -+++ offline_compiler/CMakeLists.txt -@@ -124,6 +124,9 @@ endif() - +--- shared/offline_compiler/source/CMakeLists.txt.orig 2020-02-28 16:16:42 UTC ++++ shared/offline_compiler/source/CMakeLists.txt +@@ -161,6 +161,10 @@ endif() if(UNIX) + target_link_libraries(ocloc_lib dl pthread) target_link_libraries(ocloc dl pthread) + if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|NetBSD|OpenBSD") ++ target_link_libraries(ocloc_lib execinfo) + target_link_libraries(ocloc execinfo) + endif() endif() - target_link_libraries(ocloc elflib) + set(CLOC_LIB_SRCS_LIB ${CLOC_LIB_SRCS_LIB} PARENT_SCOPE) Modified: head/lang/intel-compute-runtime/files/patch-clock_gettime ============================================================================== --- head/lang/intel-compute-runtime/files/patch-clock_gettime Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/files/patch-clock_gettime Fri Mar 6 23:23:00 2020 (r527902) @@ -9,8 +9,8 @@ runtime/os_interface/linux/os_time_linux.cpp:138:24: e if (resolutionFunc(CLOCK_MONOTONIC_RAW, &ts)) { ^ ---- core/os_interface/linux/os_time_linux.cpp.orig 2020-01-23 10:09:13 UTC -+++ core/os_interface/linux/os_time_linux.cpp +--- shared/source/os_interface/linux/os_time_linux.cpp.orig 2020-02-28 16:16:42 UTC ++++ shared/source/os_interface/linux/os_time_linux.cpp @@ -14,6 +14,10 @@ #include <time.h> Added: head/lang/intel-compute-runtime/files/patch-getPath ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/intel-compute-runtime/files/patch-getPath Fri Mar 6 23:23:00 2020 (r527902) @@ -0,0 +1,38 @@ +Implement getPath on BSDs + +--- shared/offline_compiler/source/utilities/linux/get_path.cpp.orig 2020-02-28 16:16:42 UTC ++++ shared/offline_compiler/source/utilities/linux/get_path.cpp +@@ -10,11 +10,33 @@ + #include <sys/types.h> + #include <unistd.h> + ++#if defined(__DragonFly__) || defined(__FreeBSD__) || defined(__NetBSD__) ++#include <sys/sysctl.h> ++#endif ++ + std::string getPath() { ++#if defined(KERN_PROC_PATHNAME) ++ char exepath[PATH_MAX + 1] = {0}; ++ size_t len = sizeof(exepath); ++ int mib[] = { ++ CTL_KERN, ++#if defined(__NetBSD__) ++ KERN_PROC_ARGS, ++ -1, ++ KERN_PROC_PATHNAME, ++#else ++ KERN_PROC, ++ KERN_PROC_PATHNAME, ++ -1, ++#endif ++ }; ++ if (sysctl(mib, sizeof(mib)/sizeof(mib[0]), exepath, &len, NULL, 0) != -1) { ++#else // Linux + char exepath[128] = {0}; + std::stringstream ss; + ss << "/proc/" << getpid() << "/exe"; + if (readlink(ss.str().c_str(), exepath, 128) != -1) { ++#endif + std::string path = std::string(exepath); + path = path.substr(0, path.find_last_of('/') + 1); + return path; Modified: head/lang/intel-compute-runtime/files/patch-i386 ============================================================================== --- head/lang/intel-compute-runtime/files/patch-i386 Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/files/patch-i386 Fri Mar 6 23:23:00 2020 (r527902) @@ -4,8 +4,8 @@ core/utilities/clflush.cpp:16:5: error: '_mm_clflush' _mm_clflush(ptr); ^ ---- core/utilities/cpuintrinsics.cpp.orig 2020-01-23 10:09:13 UTC -+++ core/utilities/cpuintrinsics.cpp +--- shared/source/utilities/cpuintrinsics.cpp.orig 2020-02-28 16:16:42 UTC ++++ shared/source/utilities/cpuintrinsics.cpp @@ -12,6 +12,9 @@ namespace NEO { namespace CpuIntrinsics { Modified: head/lang/intel-compute-runtime/files/patch-includes ============================================================================== --- head/lang/intel-compute-runtime/files/patch-includes Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/files/patch-includes Fri Mar 6 23:23:00 2020 (r527902) @@ -15,11 +15,11 @@ runtime/tbx/tbx_sockets_imp.cpp:107:9: error: unknown struct sockaddr { ^ ---- core/os_interface/linux/drm_neo.cpp.orig 2020-02-14 10:58:18 UTC -+++ core/os_interface/linux/drm_neo.cpp -@@ -15,10 +15,10 @@ - #include "core/os_interface/linux/sys_calls.h" - #include "core/utilities/directory.h" +--- shared/source/os_interface/linux/drm_neo.cpp.orig 2020-02-28 16:16:42 UTC ++++ shared/source/os_interface/linux/drm_neo.cpp +@@ -17,10 +17,10 @@ + #include "shared/source/os_interface/os_interface.h" + #include "shared/source/utilities/directory.h" +#include <climits> #include <cstdio> @@ -29,8 +29,8 @@ struct sockaddr { namespace NEO { ---- runtime/tbx/tbx_sockets_imp.cpp.orig 2019-11-22 15:41:47 UTC -+++ runtime/tbx/tbx_sockets_imp.cpp +--- opencl/source/tbx/tbx_sockets_imp.cpp.orig 2020-02-28 16:16:42 UTC ++++ opencl/source/tbx/tbx_sockets_imp.cpp @@ -18,6 +18,7 @@ typedef int socklen_t; #else #include <arpa/inet.h> Modified: head/lang/intel-compute-runtime/files/patch-max_freq ============================================================================== --- head/lang/intel-compute-runtime/files/patch-max_freq Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/files/patch-max_freq Fri Mar 6 23:23:00 2020 (r527902) @@ -3,9 +3,9 @@ $ clinfo | fgrep clock Max clock frequency 0MHz ---- core/os_interface/linux/drm_neo.cpp.orig 2020-01-23 10:09:13 UTC -+++ core/os_interface/linux/drm_neo.cpp -@@ -18,6 +18,11 @@ +--- shared/source/os_interface/linux/drm_neo.cpp.orig 2020-03-06 21:12:07 UTC ++++ shared/source/os_interface/linux/drm_neo.cpp +@@ -22,6 +22,11 @@ #include <cstring> #include <fstream> @@ -17,7 +17,7 @@ namespace NEO { const char *Drm::sysFsDefaultGpuPath = "/drm/card0"; -@@ -68,6 +73,16 @@ int Drm::getEnabledPooledEu(int &enabled) { +@@ -106,6 +111,16 @@ int Drm::getEnabledPooledEu(int &enabled) { int Drm::getMaxGpuFrequency(int &maxGpuFrequency) { maxGpuFrequency = 0; @@ -34,7 +34,7 @@ int deviceID = 0; int ret = getDeviceID(deviceID); if (ret != 0) { -@@ -89,6 +104,7 @@ int Drm::getMaxGpuFrequency(int &maxGpuFrequency) { +@@ -127,6 +142,7 @@ int Drm::getMaxGpuFrequency(int &maxGpuFrequency) { ifs >> maxGpuFrequency; ifs.close(); Modified: head/lang/intel-compute-runtime/files/patch-mmap ============================================================================== --- head/lang/intel-compute-runtime/files/patch-mmap Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/files/patch-mmap Fri Mar 6 23:23:00 2020 (r527902) @@ -9,11 +9,11 @@ core/os_interface/linux/os_memory_linux.cpp:17:99: err ...mmapWrapper(0, sizeToReserve, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_HUGETLB, -1... ^ ---- core/os_interface/linux/os_memory_linux.cpp.orig 2019-11-22 15:41:47 UTC -+++ core/os_interface/linux/os_memory_linux.cpp +--- shared/source/os_interface/linux/os_memory_linux.cpp.orig 2020-02-28 16:16:42 UTC ++++ shared/source/os_interface/linux/os_memory_linux.cpp @@ -7,6 +7,17 @@ - #include "core/os_interface/linux/os_memory_linux.h" + #include "shared/source/os_interface/linux/os_memory_linux.h" +#ifdef MAP_ALIGNED_SUPER +#define MAP_HUGETLB MAP_ALIGNED_SUPER // FreeBSD Added: head/lang/intel-compute-runtime/files/patch-ocloc-no-dlsym ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/lang/intel-compute-runtime/files/patch-ocloc-no-dlsym Fri Mar 6 23:23:00 2020 (r527902) @@ -0,0 +1,34 @@ +Regressed by https://github.com/intel/compute-runtime/commit/beab60f62634 + +FAILED: bin/built_ins/x64/gen12lp/copy_buffer_rect_Gen12LPlp.spv bin/built_ins/x64/gen12lp/copy_buffer_rect_Gen12LPlp.bin bin/built_ins/x64/gen12lp/copy_buffer_rect_Gen12LPlp.cpp bin/built_ins/x64/gen12lp/copy_buffer_rect_Gen12LPlp.gen +cd shared/source/built_ins/kernels && LD_LIBRARY_PATH=bin bin/ocloc -q -file copy_buffer_rect.builtin_kernel -device tgllp -64 -out_dir bin/built_ins/x64/gen12lp -cpp_file -options -cl-kernel-arg-info +Error! Couldn't find OclocInvoke function. +Error! Ocloc Library couldn't be loaded. + +--- shared/offline_compiler/source/ocloc_wrapper.cpp.orig 2020-02-28 16:16:42 UTC ++++ shared/offline_compiler/source/ocloc_wrapper.cpp +@@ -5,6 +5,7 @@ + * + */ + ++#include "ocloc_api.h" + #include "ocloc_wrapper.h" + + #include "shared/source/os_interface/os_library.h" +@@ -43,14 +44,8 @@ struct OclocWrapper::Impl { + OclocLibrary ocloc; + std::string oclocLibName = ""; + ocloc.library.reset(NEO::OsLibrary::load(oclocLibName)); +- if (nullptr == (ocloc.invoke = reinterpret_cast<pOclocInvoke>(ocloc.library->getProcAddress("oclocInvoke")))) { +- std::cout << "Error! Couldn't find OclocInvoke function.\n"; +- return; +- } +- if (nullptr == (ocloc.freeOutput = reinterpret_cast<pOclocFreeOutput>(ocloc.library->getProcAddress("oclocFreeOutput")))) { +- std::cout << "Error! Couldn't find OclocFreeOutput function.\n"; +- return; +- } ++ ocloc.invoke = oclocInvoke; ++ ocloc.freeOutput = oclocFreeOutput; + this->oclocLib = std::move(ocloc); + } + }; Modified: head/lang/intel-compute-runtime/files/patch-rtld ============================================================================== --- head/lang/intel-compute-runtime/files/patch-rtld Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/files/patch-rtld Fri Mar 6 23:23:00 2020 (r527902) @@ -5,8 +5,8 @@ core/os_interface/linux/os_library_linux.cpp:35:49: er 35 | constexpr auto dlopenFlag = RTLD_LAZY | RTLD_DEEPBIND; | ^~~~~~~~~~~~~ ---- core/os_interface/linux/os_library_linux.cpp.orig 2019-11-29 14:23:34 UTC -+++ core/os_interface/linux/os_library_linux.cpp +--- shared/source/os_interface/linux/os_library_linux.cpp.orig 2020-02-28 16:16:42 UTC ++++ shared/source/os_interface/linux/os_library_linux.cpp @@ -29,7 +29,7 @@ OsLibrary::OsLibrary(const std::string &name) { if (name.empty()) { this->handle = dlopen(0, RTLD_LAZY); Modified: head/lang/intel-compute-runtime/files/patch-unix ============================================================================== --- head/lang/intel-compute-runtime/files/patch-unix Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/files/patch-unix Fri Mar 6 23:23:00 2020 (r527902) @@ -13,8 +13,8 @@ core/elf/writer.cpp:76:5: error: memcpy_s(curSectionHeader, sizeof(SElf64SectionHeader), ^ ---- core/helpers/string.h.orig 2019-11-22 15:41:47 UTC -+++ core/helpers/string.h +--- shared/source/helpers/string.h.orig 2020-02-28 16:16:42 UTC ++++ shared/source/helpers/string.h @@ -10,7 +10,7 @@ #include <memory> #include <type_traits> Modified: head/lang/intel-compute-runtime/files/patch-userptr ============================================================================== --- head/lang/intel-compute-runtime/files/patch-userptr Fri Mar 6 23:22:48 2020 (r527901) +++ head/lang/intel-compute-runtime/files/patch-userptr Fri Mar 6 23:23:00 2020 (r527902) @@ -38,9 +38,9 @@ frame #5: 0x000000080104b4e5 libigdrcl.so`NEO::DrmMemo 60 } 61 } ---- core/os_interface/linux/drm_memory_manager.cpp.orig 2020-02-14 10:58:18 UTC -+++ core/os_interface/linux/drm_memory_manager.cpp -@@ -141,7 +141,17 @@ NEO::BufferObject *DrmMemoryManager::allocUserptr(uint +--- shared/source/os_interface/linux/drm_memory_manager.cpp.orig 2020-02-28 16:16:42 UTC ++++ shared/source/os_interface/linux/drm_memory_manager.cpp +@@ -148,7 +148,17 @@ NEO::BufferObject *DrmMemoryManager::allocUserptr(uint userptr.flags = static_cast<uint32_t>(flags); if (this->getDrm(rootDeviceIndex).ioctl(DRM_IOCTL_I915_GEM_USERPTR, &userptr) != 0) {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003062323.026NN0J8045069>