diff options
| author | Daniel Engberg <diizzy@FreeBSD.org> | 2026-10-04 20:15:19 +0000 |
|---|---|---|
| committer | Daniel Engberg <diizzy@FreeBSD.org> | 2026-10-04 20:28:06 +0000 |
| commit | 19f88714b485e9dc91bc989d21793e0b0b22d76d (patch) | |
| tree | 5c7879dda772e0d91c89ccff9ca5c84f5e1de56c | |
| parent | 1afa88031110d2859d5167c5ee422fc580aba2a0 (diff) | |
lang/intel-compute-runtime: Remove from tree
Broken for more than a year in tree and no maintainer
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | lang/Makefile | 1 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/Makefile | 63 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/distinfo | 3 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-arch | 16 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-backtrace | 37 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-clock_gettime | 28 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-device_path | 37 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-gmmlib-22.3.7 | 22 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-includes | 70 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-max_freq | 56 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-mmap | 31 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-no-perf | 82 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-no-rebar | 131 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-rtld | 32 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-unix | 45 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/files/patch-userptr | 61 | ||||
| -rw-r--r-- | lang/intel-compute-runtime/pkg-descr | 4 |
18 files changed, 1 insertions, 719 deletions
@@ -5724,3 +5724,4 @@ devel/eclipse-titan||2026-10-04|Broken for more than a year in tree devel/xeus-cling||2026-10-04|Broken for years in tree dns/dog||2026-10-04|Broken for years in tree and upstream is inactive games/frogatto||2026-10-04|Broken for than a year in tree +lang/intel-compute-runtime||2026-10-04|Broken for than a year in tree diff --git a/lang/Makefile b/lang/Makefile index 225da5c1a409..b39ffa532cfe 100644 --- a/lang/Makefile +++ b/lang/Makefile @@ -153,7 +153,6 @@ SUBDIR += hs-unlambda SUBDIR += huc SUBDIR += inko - SUBDIR += intel-compute-runtime SUBDIR += intercal SUBDIR += io SUBDIR += io-devel diff --git a/lang/intel-compute-runtime/Makefile b/lang/intel-compute-runtime/Makefile deleted file mode 100644 index b8062472f26c..000000000000 --- a/lang/intel-compute-runtime/Makefile +++ /dev/null @@ -1,63 +0,0 @@ -PORTNAME= compute-runtime -DISTVERSION= 22.24.23453 -CATEGORIES= lang -PKGNAMEPREFIX= intel- -PKGNAMESUFFIX= -${FLAVOR} - -MAINTAINER= ports@FreeBSD.org -COMMENT= OpenCL implementation for Intel HD 5000 (Gen8) or newer -WWW= https://01.org/compute-runtime - -LICENSE= MIT -LICENSE_FILE= ${WRKSRC}/LICENSE.md - -BROKEN= Does not build with latest level-zero -ONLY_FOR_ARCHS= amd64 -ONLY_FOR_ARCHS_REASON= only Intel GPUs on x86 are supported - -LIB_DEPENDS= libigc.so:devel/intel-graphics-compiler@${FLAVOR} \ - libigdgmm.so:multimedia/gmmlib - -FLAVORS= ${14 13 12 11:L:S/^/llvm/} - -CONFLICTS_INSTALL= ${PORTNAME}-* - -USES= cmake compiler:c++17-lang localbase:ldflags pkgconfig -USE_GITHUB= yes -USE_LDCONFIG= yes -GH_ACCOUNT= intel -CMAKE_ON= RELEASE_WITH_REGKEYS SKIP_UNIT_TESTS SUPPORT_DG1 -CMAKE_ARGS= -DNEO_OCL_DRIVER_VERSION:STRING="${DISTVERSIONFULL}" -PLIST_FILES= bin/ocloc \ - etc/OpenCL/vendors/intel.icd \ - include/ocloc_api.h \ - lib/intel-opencl/libigdrcl.so \ - lib/libocloc.so \ - ${NULL} - -OPTIONS_DEFINE= L0 VAAPI -OPTIONS_DEFAULT=L0 VAAPI - -L0_DESC= oneAPI Level Zero support -L0_BUILD_DEPENDS= level-zero>=1.0:devel/level-zero -L0_CMAKE_BOOL= BUILD_WITH_L0 -L0_CMAKE_ON= -DNEO_VERSION_BUILD:STRING="0" -L0_PLIST_FILES= lib/libze_intel_gpu.so.1 \ - lib/libze_intel_gpu.so.1.3.0 - -VAAPI_BUILD_DEPENDS= ${LOCALBASE}/include/va/va.h:multimedia/libva -VAAPI_CMAKE_BOOL_OFF= DISABLE_LIBVA - -post-patch: - @${REINPLACE_CMD} -e '/-Werror/d' \ - -e '/FORCE_RESPONSE_FILE/d' \ - ${WRKSRC}/CMakeLists.txt - @${REINPLACE_CMD} -e '/OCL_ICD_VENDORDIR/s,/etc,${PREFIX}&,' \ - ${WRKSRC}/package.cmake - -post-install: -# install/strip has no effect on install(FILES), so strip manually - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* - ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/intel-opencl/*.so - -.include <bsd.port.mk> diff --git a/lang/intel-compute-runtime/distinfo b/lang/intel-compute-runtime/distinfo deleted file mode 100644 index 493deff14d63..000000000000 --- a/lang/intel-compute-runtime/distinfo +++ /dev/null @@ -1,3 +0,0 @@ -TIMESTAMP = 1654689886 -SHA256 (intel-compute-runtime-22.24.23453_GH0.tar.gz) = d52088aeb6062294c9b1d65263d39ce42a9772b573480974fad68ca6ef722cbf -SIZE (intel-compute-runtime-22.24.23453_GH0.tar.gz) = 5521386 diff --git a/lang/intel-compute-runtime/files/patch-arch b/lang/intel-compute-runtime/files/patch-arch deleted file mode 100644 index 0a319dba8445..000000000000 --- a/lang/intel-compute-runtime/files/patch-arch +++ /dev/null @@ -1,16 +0,0 @@ -Add more architecture names - -CMake Error at CMakeLists.txt:164 (message): - Unsupported target processor: amd64 - ---- CMakeLists.txt.orig 2021-09-17 14:06:15 UTC -+++ CMakeLists.txt -@@ -154,6 +154,8 @@ if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") - set(NEO_TARGET_PROCESSOR "x86_64") - elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") - set(NEO_TARGET_PROCESSOR "x86_64") -+elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64") -+ set(NEO_TARGET_PROCESSOR "x86_64") - elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") - set(NEO_TARGET_PROCESSOR "aarch64") - include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/sse2neon) diff --git a/lang/intel-compute-runtime/files/patch-backtrace b/lang/intel-compute-runtime/files/patch-backtrace deleted file mode 100644 index 10a7a98e0207..000000000000 --- a/lang/intel-compute-runtime/files/patch-backtrace +++ /dev/null @@ -1,37 +0,0 @@ -Adjust for backtrace(3) on BSDs - -In file included from offline_compiler/utilities/linux/safety_caller_linux.cpp:10: -offline_compiler/utilities/linux/safety_guard_linux.h:36:25: error: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'int' [-Werror,-Wshorten-64-to-32] - backtraceSize = backtrace(addresses, callstackDepth); - ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -ld: error: undefined symbol: backtrace ->>> referenced by safety_caller_linux.cpp ->>> CMakeFiles/ocloc.dir/utilities/linux/safety_caller_linux.cpp.o:(SafetyGuardLinux::sigAction(int, __siginfo*, void*)) -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*)) - ---- 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; - -- backtraceSize = backtrace(addresses, callstackDepth); -+ backtraceSize = (int)backtrace(addresses, callstackDepth); - callstack = backtrace_symbols(addresses, backtraceSize); - - for (int i = 0; i < backtraceSize; ++i) { ---- shared/offline_compiler/source/CMakeLists.txt.orig 2020-05-15 20:36:40 UTC -+++ shared/offline_compiler/source/CMakeLists.txt -@@ -140,6 +140,9 @@ endif() - - if(UNIX) - target_link_libraries(${OCLOC_NAME}_lib dl pthread) -+ if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|NetBSD|OpenBSD") -+ target_link_libraries(${OCLOC_NAME}_lib execinfo) -+ endif() - endif() - - set(CLOC_LIB_SRCS_LIB ${CLOC_LIB_SRCS_LIB} PARENT_SCOPE) diff --git a/lang/intel-compute-runtime/files/patch-clock_gettime b/lang/intel-compute-runtime/files/patch-clock_gettime deleted file mode 100644 index e1cf4dc32ff5..000000000000 --- a/lang/intel-compute-runtime/files/patch-clock_gettime +++ /dev/null @@ -1,28 +0,0 @@ -CLOCK_MONOTONIC_RAW doesn't exist on non-Linux systems. - -runtime/os_interface/linux/os_time_linux.cpp:61:21: error: - use of undeclared identifier 'CLOCK_MONOTONIC_RAW' - if (getTimeFunc(CLOCK_MONOTONIC_RAW, &ts)) { - ^ -runtime/os_interface/linux/os_time_linux.cpp:138:24: error: - use of undeclared identifier 'CLOCK_MONOTONIC_RAW' - if (resolutionFunc(CLOCK_MONOTONIC_RAW, &ts)) { - ^ - ---- shared/source/os_interface/linux/os_time_linux.cpp.orig 2020-05-15 20:36:40 UTC -+++ shared/source/os_interface/linux/os_time_linux.cpp -@@ -14,6 +14,14 @@ - - #include <time.h> - -+#ifndef CLOCK_MONOTONIC_RAW -+# ifdef CLOCK_MONOTONIC_FAST -+# define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC_FAST -+# else -+# define CLOCK_MONOTONIC_RAW CLOCK_MONOTONIC -+# endif -+#endif -+ - namespace NEO { - - OSTimeLinux::OSTimeLinux(OSInterface *osInterface) { diff --git a/lang/intel-compute-runtime/files/patch-device_path b/lang/intel-compute-runtime/files/patch-device_path deleted file mode 100644 index 15a11b0b6b7c..000000000000 --- a/lang/intel-compute-runtime/files/patch-device_path +++ /dev/null @@ -1,37 +0,0 @@ -/sys is Linux-specific. FreeBSD has linsysfs(5) but not mounted by default. - ---- shared/source/os_interface/linux/sys_calls_linux.cpp.orig 2021-02-22 20:55:37 UTC -+++ shared/source/os_interface/linux/sys_calls_linux.cpp -@@ -12,7 +12,11 @@ - #include <stdio.h> - #include <sys/ioctl.h> - #include <sys/stat.h> -+#if defined(__linux__) - #include <sys/sysmacros.h> -+#elif defined(__DragonFly__) || defined(__FreeBSD__) -+#include <cstdlib> -+#endif - #include <unistd.h> - - namespace NEO { -@@ -36,6 +40,7 @@ int readlink(const char *path, char *buf, size_t bufsi - } - - int getDevicePath(int deviceFd, char *buf, size_t &bufSize) { -+#if defined(__linux__) - struct stat st; - if (fstat(deviceFd, &st)) { - return -1; -@@ -45,6 +50,12 @@ int getDevicePath(int deviceFd, char *buf, size_t &buf - major(st.st_rdev), minor(st.st_rdev)); - - return 0; -+#elif defined(__DragonFly__) || defined(__FreeBSD__) -+ return fdevname_r(deviceFd, buf, (int)bufSize) ? 0 : -1; -+#else -+ // Extract drmGetDeviceNameFromFd2 from libdrm -+ return -1; -+#endif - } - } // namespace SysCalls - } // namespace NEO diff --git a/lang/intel-compute-runtime/files/patch-gmmlib-22.3.7 b/lang/intel-compute-runtime/files/patch-gmmlib-22.3.7 deleted file mode 100644 index 6ba0f7c7c402..000000000000 --- a/lang/intel-compute-runtime/files/patch-gmmlib-22.3.7 +++ /dev/null @@ -1,22 +0,0 @@ -Chase https://github.com/intel/gmmlib/commit/861d5b2318ec -until https://github.com/intel/compute-runtime/commit/cfe51ff2ba97 - ---- shared/source/gen8/hw_info_bdw.cpp.orig 2022-06-08 12:04:46 UTC -+++ shared/source/gen8/hw_info_bdw.cpp -@@ -17,11 +17,11 @@ bool isSimulationBDW(unsigned short deviceId) { - - bool isSimulationBDW(unsigned short deviceId) { - switch (deviceId) { -- case IBDW_GT0_DESK_DEVICE_F0_ID: -- case IBDW_GT1_DESK_DEVICE_F0_ID: -- case IBDW_GT2_DESK_DEVICE_F0_ID: -- case IBDW_GT3_DESK_DEVICE_F0_ID: -- case IBDW_GT4_DESK_DEVICE_F0_ID: -+ case 0x0BD0: -+ case 0x0BD1: -+ case 0x0BD2: -+ case 0x0BD3: -+ case 0x0BD4: - return true; - } - return false; diff --git a/lang/intel-compute-runtime/files/patch-includes b/lang/intel-compute-runtime/files/patch-includes deleted file mode 100644 index 0dd7b3117e6c..000000000000 --- a/lang/intel-compute-runtime/files/patch-includes +++ /dev/null @@ -1,70 +0,0 @@ -Adjust includes in various places. - -level_zero/tools/source/metrics/linux/os_metric_enumeration_imp_linux.cpp:14:10: fatal error: 'sys/sysmacros.h' file not found -#include <sys/sysmacros.h> - ^~~~~~~~~~~~~~~~~ -In file included from level_zero/tools/source/sysman/linux/os_sysman_imp.h:12: -level_zero/tools/source/sysman/linux/fs_access.h:19:10: fatal error: 'sys/sysmacros.h' file not found -#include <sys/sysmacros.h> - ^~~~~~~~~~~~~~~~~ - -core/os_interface/linux/drm_neo.cpp:21:10: fatal error: 'linux/limits.h' file not found -#include <linux/limits.h> - ^~~~~~~~~~~~~~~~ - -runtime/tbx/tbx_sockets_imp.cpp:74:51: error: use of undeclared identifier 'IPPROTO_TCP' - m_socket = ::socket(AF_INET, SOCK_STREAM, IPPROTO_TCP); - ^ -runtime/tbx/tbx_sockets_imp.cpp:107:9: error: unknown type name 'sockaddr_in'; did you mean 'sockaddr'? - sockaddr_in clientService; - ^~~~~~~~~~~ - sockaddr -/usr/include/sys/socket.h:328:8: note: 'sockaddr' declared here -struct sockaddr { - ^ - ---- level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.cpp.orig 2021-01-20 18:22:07 UTC -+++ level_zero/tools/source/metrics/linux/os_metric_oa_enumeration_imp_linux.cpp -@@ -13,7 +13,9 @@ - #include "level_zero/tools/source/metrics/metric_oa_source.h" - - #include <sys/stat.h> -+#if defined(__linux__) - #include <sys/sysmacros.h> -+#endif - - namespace L0 { - ---- level_zero/tools/source/sysman/linux/fs_access.h.orig 2020-03-27 09:53:58 UTC -+++ level_zero/tools/source/sysman/linux/fs_access.h -@@ -16,7 +16,6 @@ - #include <sstream> - #include <string> - #include <sys/stat.h> --#include <sys/sysmacros.h> - #include <sys/types.h> - #include <unistd.h> - #include <vector> ---- shared/source/os_interface/linux/drm_neo.cpp.orig 2022-03-22 13:13:25 UTC -+++ shared/source/os_interface/linux/drm_neo.cpp -@@ -34,9 +34,9 @@ - #include "shared/source/os_interface/os_interface.h" - #include "shared/source/utilities/directory.h" - -+#include <climits> - #include <cstdio> - #include <cstring> --#include <linux/limits.h> - #include <map> - - namespace NEO { ---- shared/source/tbx/tbx_sockets_imp.cpp.orig 2020-10-23 15:44:19 UTC -+++ shared/source/tbx/tbx_sockets_imp.cpp -@@ -18,6 +18,7 @@ typedef int socklen_t; - #else - #include <arpa/inet.h> - #include <netdb.h> -+#include <netinet/in.h> - #include <stdlib.h> - #include <string.h> - #include <unistd.h> diff --git a/lang/intel-compute-runtime/files/patch-max_freq b/lang/intel-compute-runtime/files/patch-max_freq deleted file mode 100644 index 3c5afd6896a6..000000000000 --- a/lang/intel-compute-runtime/files/patch-max_freq +++ /dev/null @@ -1,56 +0,0 @@ -/sys/bus/pci/devices doesn't exist as kms-drm exports sysfs via sysctl - - $ clinfo | fgrep clock - Max clock frequency 0MHz - ---- shared/source/os_interface/linux/drm_neo.cpp.orig 2021-09-10 14:22:47 UTC -+++ shared/source/os_interface/linux/drm_neo.cpp -@@ -34,6 +34,13 @@ - #include <cstdio> - #include <cstring> - -+#if defined(__FreeBSD__) -+#include <sys/param.h> -+#include <sys/sysctl.h> -+#include <cstdio> -+#include <cstdlib> -+#endif -+ - namespace NEO { - - namespace IoctlHelper { -@@ -800,6 +807,26 @@ bool Drm::sysmanQueryEngineInfo() { - - int getMaxGpuFrequencyOfDevice(Drm &drm, std::string &sysFsPciPath, int &maxGpuFrequency) { - maxGpuFrequency = 0; -+#if defined(__FreeBSD__) -+ char name[SPECNAMELEN + 1]; -+ if (!fdevname_r(drm.getFileDescriptor(), name, sizeof(name))) { -+ return 0; -+ } -+ int id; -+ if (!sscanf(name, "drm/%d", &id) && !sscanf(name, "dri/renderD%d", &id)) { -+ return 0; -+ } -+ -+ char oid[MAXPATHLEN + 1]; -+ char max_freq[PAGE_SIZE]; -+ size_t len = sizeof(max_freq); -+ snprintf(oid, sizeof(oid), "sys.class.drm.card%d.gt_max_freq_mhz", id - 128); -+ if (sysctlbyname(oid, &max_freq, &len, NULL, 0)) { -+ return 0; -+ } -+ -+ maxGpuFrequency = std::stoi(max_freq); -+#else - std::string clockSysFsPath = sysFsPciPath + "/gt_max_freq_mhz"; - - std::ifstream ifs(clockSysFsPath.c_str(), std::ifstream::in); -@@ -809,6 +836,7 @@ int getMaxGpuFrequencyOfDevice(Drm &drm, std::string & - - ifs >> maxGpuFrequency; - ifs.close(); -+#endif - return 0; - } - diff --git a/lang/intel-compute-runtime/files/patch-mmap b/lang/intel-compute-runtime/files/patch-mmap deleted file mode 100644 index 78d65ee7dfa5..000000000000 --- a/lang/intel-compute-runtime/files/patch-mmap +++ /dev/null @@ -1,31 +0,0 @@ -Some mmap(2) flags are Linux-specific but otherwise not required - -core/os_interface/linux/os_memory_linux.cpp:17:83: error: - use of undeclared identifier 'MAP_NORESERVE' - return mmapWrapper(0, sizeToReserve, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_... - ^ -core/os_interface/linux/os_memory_linux.cpp:17:99: error: - use of undeclared identifier 'MAP_HUGETLB' - ...mmapWrapper(0, sizeToReserve, PROT_NONE, MAP_PRIVATE | MAP_ANONYMOUS | MAP_NORESERVE | MAP_HUGETLB, -1... - ^ - ---- 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 "shared/source/os_interface/linux/os_memory_linux.h" - -+#ifdef MAP_ALIGNED_SUPER -+#define MAP_HUGETLB MAP_ALIGNED_SUPER // FreeBSD -+#endif -+ -+#ifndef MAP_NORESERVE -+#define MAP_NORESERVE 0 -+#endif -+#ifndef MAP_HUGETLB -+#define MAP_HUGETLB 0 -+#endif -+ - namespace NEO { - - std::unique_ptr<OSMemory> OSMemory::create() { diff --git a/lang/intel-compute-runtime/files/patch-no-perf b/lang/intel-compute-runtime/files/patch-no-perf deleted file mode 100644 index bb7d45b8425d..000000000000 --- a/lang/intel-compute-runtime/files/patch-no-perf +++ /dev/null @@ -1,82 +0,0 @@ -Limit PMU counters to Linux - -In file included from level_zero/tools/source/sysman/linux/os_sysman_imp.cpp:8: -In file included from level_zero/tools/source/sysman/linux/os_sysman_imp.h:16: -level_zero/tools/source/sysman/linux/pmu/pmu_imp.h:12:10: fatal error: 'linux/perf_event.h' file not found -#include <linux/perf_event.h> - ^~~~~~~~~~~~~~~~~~~~ - ---- level_zero/tools/source/sysman/engine/linux/CMakeLists.txt.orig 2022-03-09 15:02:18 UTC -+++ level_zero/tools/source/sysman/engine/linux/CMakeLists.txt -@@ -9,7 +9,7 @@ set(L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp.h - ) - --if(NEO_ENABLE_i915_PRELIM_DETECTION) -+if(NEO_ENABLE_i915_PRELIM_DETECTION AND CMAKE_SYSTEM_NAME STREQUAL "Linux") - list(APPEND L0_SRCS_TOOLS_SYSMAN_ENGINE_LINUX - ${CMAKE_CURRENT_SOURCE_DIR}/os_engine_imp_prelim.cpp - ) ---- level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp.orig 2021-03-24 20:23:19 UTC -+++ level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp -@@ -49,9 +49,11 @@ ze_result_t LinuxEngineImp::getActivity(zes_engine_sta - return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; - } - uint64_t data[2] = {}; -+#ifdef __linux__ - if (pPmuInterface->pmuRead(static_cast<int>(fd), data, sizeof(data)) < 0) { - return ZE_RESULT_ERROR_UNSUPPORTED_FEATURE; - } -+#endif - // In data[], First u64 is "active time", And second u64 is "timestamp". Both in nanoseconds - pStats->activeTime = data[0] / microSecondsToNanoSeconds; - pStats->timestamp = data[1] / microSecondsToNanoSeconds; -@@ -66,9 +68,11 @@ ze_result_t LinuxEngineImp::getProperties(zes_engine_p - } - - void LinuxEngineImp::init() { -+#ifdef __linux - auto i915EngineClass = engineToI915Map.find(engineGroup); - // I915_PMU_ENGINE_BUSY macro provides the perf type config which we want to listen to get the engine busyness. - fd = pPmuInterface->pmuInterfaceOpen(I915_PMU_ENGINE_BUSY(i915EngineClass->second, engineInstance), -1, PERF_FORMAT_TOTAL_TIME_ENABLED); -+#endif - } - - LinuxEngineImp::LinuxEngineImp(OsSysman *pOsSysman, zes_engine_group_t type, uint32_t engineInstance) : engineGroup(type), engineInstance(engineInstance) { ---- level_zero/tools/source/sysman/linux/os_sysman_imp.cpp.orig 2021-11-20 20:51:51 UTC -+++ level_zero/tools/source/sysman/linux/os_sysman_imp.cpp -@@ -38,9 +38,11 @@ ze_result_t LinuxSysmanImp::init() { - } - DEBUG_BREAK_IF(nullptr == pSysfsAccess); - -+#ifdef __linux__ - pPmuInterface = PmuInterface::create(this); - - DEBUG_BREAK_IF(nullptr == pPmuInterface); -+#endif - - if (pFwUtilInterface == nullptr) { - createFwUtilInterface(); ---- level_zero/tools/source/sysman/linux/os_sysman_imp.h.orig 2021-10-01 16:31:56 UTC -+++ level_zero/tools/source/sysman/linux/os_sysman_imp.h -@@ -14,7 +14,9 @@ - #include "level_zero/tools/source/sysman/linux/firmware_util/firmware_util.h" - #include "level_zero/tools/source/sysman/linux/fs_access.h" - #include "level_zero/tools/source/sysman/linux/pmt/pmt.h" -+#ifdef __linux__ - #include "level_zero/tools/source/sysman/linux/pmu/pmu_imp.h" -+#endif - #include "level_zero/tools/source/sysman/sysman_imp.h" - - #include <map> ---- level_zero/tools/source/sysman/linux/pmu/CMakeLists.txt.orig 2020-09-11 07:53:58 UTC -+++ level_zero/tools/source/sysman/linux/pmu/CMakeLists.txt -@@ -9,7 +9,7 @@ set(L0_SRCS_TOOLS_SYSMAN_LINUX_PMU - ${CMAKE_CURRENT_SOURCE_DIR}/pmu_imp.h - ${CMAKE_CURRENT_SOURCE_DIR}/pmu.h - ) --if(UNIX) -+if(CMAKE_SYSTEM_NAME STREQUAL "Linux") - target_sources(${L0_STATIC_LIB_NAME} - PRIVATE - ${L0_SRCS_TOOLS_SYSMAN_LINUX_PMU} diff --git a/lang/intel-compute-runtime/files/patch-no-rebar b/lang/intel-compute-runtime/files/patch-no-rebar deleted file mode 100644 index 01e2e8b19968..000000000000 --- a/lang/intel-compute-runtime/files/patch-no-rebar +++ /dev/null @@ -1,131 +0,0 @@ -Limit resizable BAR to Linux as NEO doesn't use libpci. - -level_zero/tools/source/sysman/linux/os_sysman_imp.cpp:17:10: fatal error: 'linux/pci_regs.h' file not found -#include <linux/pci_regs.h> - ^~~~~~~~~~~~~~~~~~ -level_zero/tools/source/sysman/linux/os_sysman_imp.cpp:333:27: error: use of undeclared identifier 'PCI_BRIDGE_CONTROL' - unsigned int offset = PCI_BRIDGE_CONTROL; // Bridge control offset in Header of PCI config space - ^ -level_zero/tools/source/sysman/linux/os_sysman_imp.cpp:342:26: error: use of undeclared identifier 'PCI_BRIDGE_CTL_BUS_RESET' - resetValue = value | PCI_BRIDGE_CTL_BUS_RESET; - ^ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:15:10: fatal error: 'linux/pci_regs.h' file not found -#include <linux/pci_regs.h> - ^~~~~~~~~~~~~~~~~~ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:157:20: error: use of undeclared identifier 'PCI_CFG_SPACE_SIZE' - uint32_t pos = PCI_CFG_SPACE_SIZE; - ^ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:167:23: error: use of undeclared identifier 'PCI_CFG_SPACE_EXP_SIZE' - auto loopCount = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8; - ^ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:167:48: error: use of undeclared identifier 'PCI_CFG_SPACE_SIZE' - auto loopCount = (PCI_CFG_SPACE_EXP_SIZE - PCI_CFG_SPACE_SIZE) / 8; - ^ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:174:13: error: use of undeclared identifier 'PCI_EXT_CAP_ID' - if (PCI_EXT_CAP_ID(header) == PCI_EXT_CAP_ID_REBAR) { - ^ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:174:39: error: use of undeclared identifier 'PCI_EXT_CAP_ID_REBAR' - if (PCI_EXT_CAP_ID(header) == PCI_EXT_CAP_ID_REBAR) { - ^ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:177:15: error: use of undeclared identifier 'PCI_EXT_CAP_NEXT' - pos = PCI_EXT_CAP_NEXT(header); - ^ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:178:19: error: use of undeclared identifier 'PCI_CFG_SPACE_SIZE' - if (pos < PCI_CFG_SPACE_SIZE) { - ^ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:202:48: error: use of undeclared identifier 'PCI_CFG_SPACE_EXP_SIZE' - configMemory = std::make_unique<uint8_t[]>(PCI_CFG_SPACE_EXP_SIZE); - ^ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:203:35: error: use of undeclared identifier 'PCI_CFG_SPACE_EXP_SIZE' - memset(configMemory.get(), 0, PCI_CFG_SPACE_EXP_SIZE); - ^ -level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:204:55: error: use of undeclared identifier 'PCI_CFG_SPACE_EXP_SIZE' - this->preadFunction(fdConfig, configMemory.get(), PCI_CFG_SPACE_EXP_SIZE, 0); - ^ - ---- level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.cpp.orig 2022-06-08 12:04:46 UTC -+++ level_zero/tools/source/sysman/diagnostics/linux/os_diagnostics_imp.cpp -@@ -11,7 +11,9 @@ - - #include "level_zero/core/source/device/device_imp.h" - -+#ifdef __linux__ - #include <linux/pci_regs.h> -+#endif - - namespace L0 { - const std::string LinuxDiagnosticsImp::deviceDir("device"); ---- level_zero/tools/source/sysman/linux/os_sysman_imp.h.orig 2022-06-08 12:04:46 UTC -+++ level_zero/tools/source/sysman/linux/os_sysman_imp.h -@@ -18,6 +20,11 @@ - #include "level_zero/tools/source/sysman/sysman_imp.h" - -+#ifdef __linux__ - #include <linux/pci_regs.h> -+#else -+#define PCI_BRIDGE_CONTROL 0x3e -+#define PCI_BRIDGE_CTL_BUS_RESET 0x40 -+#endif - #include <map> - - namespace L0 { ---- level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp.orig 2021-08-11 16:12:33 UTC -+++ level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp -@@ -12,7 +12,9 @@ - - #include "sysman/pci/pci_imp.h" - -+#ifdef __linux__ - #include <linux/pci_regs.h> -+#endif - - namespace L0 { - -@@ -153,6 +155,7 @@ ze_result_t LinuxPciImp::initializeBarProperties(std:: - } - - uint32_t LinuxPciImp::getRebarCapabilityPos() { -+#ifdef __linux__ - uint32_t pos = PCI_CFG_SPACE_SIZE; - uint32_t header = 0; - -@@ -179,6 +182,7 @@ uint32_t LinuxPciImp::getRebarCapabilityPos() { - } - header = getDwordFromConfig(pos); - } -+#endif - return 0; - } - -@@ -197,6 +201,7 @@ bool LinuxPciImp::resizableBarEnabled(uint32_t barInde - if (!rebarCapabilityPos) { - return false; - } -+#ifdef __linux__ - - // As per PCI spec, resizable BAR's capability structure's 52 byte length could be represented as: - // -------------------------------------------------------------- -@@ -249,6 +254,7 @@ bool LinuxPciImp::resizableBarEnabled(uint32_t barInde - - // If current size is equal to larget possible BAR size, it indicates resizable BAR is enabled. - return (currentSize == largestPossibleBarSize); -+#endif - } - - ze_result_t LinuxPciImp::getState(zes_pci_state_t *state) { -@@ -256,6 +262,7 @@ ze_result_t LinuxPciImp::getState(zes_pci_state_t *sta - } - - void LinuxPciImp::pciExtendedConfigRead() { -+#ifdef __linux__ - std::string pciConfigNode; - pSysfsAccess->getRealPath("device/config", pciConfigNode); - int fdConfig = -1; -@@ -267,6 +274,7 @@ void LinuxPciImp::pciExtendedConfigRead() { - memset(configMemory.get(), 0, PCI_CFG_SPACE_EXP_SIZE); - this->preadFunction(fdConfig, configMemory.get(), PCI_CFG_SPACE_EXP_SIZE, 0); - this->closeFunction(fdConfig); -+#endif - } - - LinuxPciImp::LinuxPciImp(OsSysman *pOsSysman) { diff --git a/lang/intel-compute-runtime/files/patch-rtld b/lang/intel-compute-runtime/files/patch-rtld deleted file mode 100644 index 624554e2c616..000000000000 --- a/lang/intel-compute-runtime/files/patch-rtld +++ /dev/null @@ -1,32 +0,0 @@ -RTLD_DEEPBIND isn't available on non-Linux - -shared/source/os_interface/linux/os_library_helper.cpp:17:24: error: use of undeclared identifier 'RTLD_DEEPBIND' - dlopenFlag &= ~RTLD_DEEPBIND; - ^ -shared/source/os_interface/linux/os_library_linux.cpp:41:39: error: use of undeclared identifier 'RTLD_DEEPBIND' - auto dlopenFlag = RTLD_LAZY | RTLD_DEEPBIND; - ^ - ---- shared/source/os_interface/linux/os_library_helper.cpp.orig 2021-03-01 17:17:25 UTC -+++ shared/source/os_interface/linux/os_library_helper.cpp -@@ -14,7 +14,9 @@ namespace NEO { - namespace Linux { - void adjustLibraryFlags(int &dlopenFlag) { - if (DebugManager.flags.DisableDeepBind.get()) { -+#ifdef RTLD_DEEPBIND - dlopenFlag &= ~RTLD_DEEPBIND; -+#endif - } - } - } // namespace Linux ---- shared/source/os_interface/linux/os_library_linux.cpp.orig 2021-03-01 17:17:25 UTC -+++ shared/source/os_interface/linux/os_library_linux.cpp -@@ -35,7 +35,7 @@ OsLibrary::OsLibrary(const std::string &name) { - if (name.empty()) { - this->handle = SysCalls::dlopen(0, RTLD_LAZY); - } else { --#ifdef SANITIZER_BUILD -+#if defined(SANITIZER_BUILD) || !defined(RTLD_DEEPBIND) - auto dlopenFlag = RTLD_LAZY; - #else - auto dlopenFlag = RTLD_LAZY | RTLD_DEEPBIND; diff --git a/lang/intel-compute-runtime/files/patch-unix b/lang/intel-compute-runtime/files/patch-unix deleted file mode 100644 index 50467f486654..000000000000 --- a/lang/intel-compute-runtime/files/patch-unix +++ /dev/null @@ -1,45 +0,0 @@ -Relax Linux checks for the code works on any non-Windows platform - -In file included from level_zero/tools/source/pin/pin.cpp:11: -level_zero/source/inc/ze_intel_gpu.h:34:2: error: "Unsupported OS" -#error "Unsupported OS" - ^ -level_zero/api/core/ze_core_loader.cpp:29:41: error: use of undeclared identifier 'LOAD_INTEL_GPU_LIBRARY' - driver_ddiTable.driverLibrary = LOAD_INTEL_GPU_LIBRARY(); - ^ - -core/elf/writer.cpp:54:9: error: - use of undeclared identifier 'memcpy_s' - memcpy_s(data, queueFront.dataSize, queueFront.data.c_str(), queueFront.dataSize); - ^ -core/elf/writer.cpp:59:13: error: - use of undeclared identifier 'memcpy_s' - memcpy_s(curString, queueFront.name.size(), queueFront.name.c_str(), queueFront.name.size()); - ^ -core/elf/writer.cpp:76:5: error: - use of undeclared identifier 'memcpy_s' - memcpy_s(curSectionHeader, sizeof(SElf64SectionHeader), - ^ - ---- 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> - --#if defined(__linux__) -+#if !defined(_WIN32) - - #include <cstring> - #include <errno.h> ---- shared/source/os_interface/linux/drm_neo.cpp.orig 2021-06-02 19:58:38 UTC -+++ shared/source/os_interface/linux/drm_neo.cpp -@@ -733,7 +733,7 @@ int Drm::queryAdapterBDF() { - void Drm::setGmmInputArgs(void *args) { - auto gmmInArgs = reinterpret_cast<GMM_INIT_IN_ARGS *>(args); - auto adapterBDF = this->getAdapterBDF(); --#if defined(__linux__) -+#if !defined(_WIN32) - gmmInArgs->FileDescriptor = adapterBDF.Data; - #endif - gmmInArgs->ClientType = GMM_CLIENT::GMM_OCL_VISTA; diff --git a/lang/intel-compute-runtime/files/patch-userptr b/lang/intel-compute-runtime/files/patch-userptr deleted file mode 100644 index 5d04bb042b36..000000000000 --- a/lang/intel-compute-runtime/files/patch-userptr +++ /dev/null @@ -1,61 +0,0 @@ -Try unsynchronized userptr if regular one fails. -https://github.com/FreeBSDDesktop/kms-drm/issues/197 - -Process 51117 stopped -* thread #1, name = 'clinfo', stop reason = signal SIGABRT - frame #0: 0x000000080044fe7a libc.so.7`__sys_thr_kill at thr_kill.S:4 -(lldb) bt -* thread #1, name = 'clinfo', stop reason = signal SIGABRT - * frame #0: 0x000000080044fe7a libc.so.7`__sys_thr_kill at thr_kill.S:4 - frame #1: 0x000000080044f7e4 libc.so.7`__raise(s=6) at raise.c:52:10 - frame #2: 0x00000008003b3a89 libc.so.7`abort at abort.c:67:8 - frame #3: 0x000000080043a711 libc.so.7`__assert(func=<unavailable>, file=<unavailable>, line=<unavailable>, failedexpr=<unavailable>) at assert.c:51:2 - frame #4: 0x0000000800e255ad libigdrcl.so`NEO::debugBreak(line=58, file="compute-runtime-19.48.14977/runtime/os_interface/linux/drm_memory_manager.cpp") at debug_helpers.cpp:19:9 - frame #5: 0x000000080104b4e5 libigdrcl.so`NEO::DrmMemoryManager::DrmMemoryManager(this=0x00000008018e7300, mode=gemCloseWorkerActive, forcePinAllowed=true, validateHostPtrMemory=true, executionEnvironment=0x00000008018f6180) at drm_memory_manager.cpp:58:9 - frame #6: 0x0000000800f07bb1 libigdrcl.so`std::__1::__unique_if<NEO::DrmMemoryManager>::__unique_single std::__1::make_unique<NEO::DrmMemoryManager, NEO::gemCloseWorkerMode, bool, bool, NEO::ExecutionEnvironment&>(__args=0x00007fffffffda4c, __args=0x00007fffffffda4b, __args=0x00007fffffffda4a, __args=0x00000008018f6180) at memory:3003:32 - frame #7: 0x0000000800f07ad4 libigdrcl.so`NEO::MemoryManager::createMemoryManager(executionEnvironment=0x00000008018f6180) at create_drm_memory_manager.cpp:16:12 - frame #8: 0x0000000800fbce8b libigdrcl.so`NEO::ExecutionEnvironment::initializeMemoryManager(this=0x00000008018f6180) at execution_environment.cpp:63:25 - frame #9: 0x0000000801058c9d libigdrcl.so`NEO::Platform::initialize(this=0x00000008025ea0a0) at platform.cpp:144:27 - frame #10: 0x0000000800e259f2 libigdrcl.so`::clGetPlatformIDs(numEntries=1, platforms=0x0000000800251500, numPlatforms=0x0000000000000000) at api.cpp:82:35 - frame #11: 0x0000000800e25c54 libigdrcl.so`::clIcdGetPlatformIDsKHR(numEntries=1, platforms=0x0000000800251500, numPlatforms=0x0000000000000000) at api.cpp:112:14 - frame #12: 0x000000080025d0e0 libOpenCL.so.1`__initClIcd + 3392 - frame #13: 0x00000008006a61a8 libthr.so.3`_thr_once(once_control=0x000000080026e038, init_routine=(libOpenCL.so.1`__initClIcd)) at thr_once.c:98:2 - frame #14: 0x000000080025b670 libOpenCL.so.1`clGetPlatformIDs_hid + 320 - frame #15: 0x000000000020f9cd clinfo`main(argc=<unavailable>, argv=0x00007fffffffe188) at clinfo.c:2656:10 - frame #16: 0x000000000020713d clinfo`_start(ap=<unavailable>, cleanup=<unavailable>) at crt1.c:76:7 -(lldb) f 5 -frame #5: 0x000000080104b4e5 libigdrcl.so`NEO::DrmMemoryManager::DrmMemoryManager(this=0x00000008018e7300, mode=gemCloseWorkerActive, forcePinAllowed=true, validateHostPtrMemory=true, executionEnvironment=0x00000008018f6180) at drm_memory_manager.cpp:58:9 - 50 - 51 if (forcePinEnabled || validateHostPtrMemory) { - 52 pinBB = allocUserptr(reinterpret_cast<uintptr_t>(memoryForPinBB), MemoryConstants::pageSize, 0, 0); - 53 } - 54 - 55 if (!pinBB) { - 56 alignedFreeWrapper(memoryForPinBB); - 57 memoryForPinBB = nullptr; --> 58 DEBUG_BREAK_IF(true); - 59 UNRECOVERABLE_IF(validateHostPtrMemory); - 60 } - 61 } - ---- shared/source/os_interface/linux/drm_memory_manager.cpp.orig 2022-06-01 18:10:32 UTC -+++ shared/source/os_interface/linux/drm_memory_manager.cpp -@@ -248,7 +248,17 @@ NEO::BufferObject *DrmMemoryManager::allocUserptr(uint - auto &drm = this->getDrm(rootDeviceIndex); - - if (drm.ioctl(DrmIoctl::GemUserptr, &userptr) != 0) { -- return nullptr; -+ if (errno == ENODEV && userptr.flags == 0) { -+ userptr.flags = I915_USERPTR_UNSYNCHRONIZED; -+ if (drm.ioctl(DrmIoctl::GemUserptr, &userptr) != 0) { -+ if (geteuid() != 0) { -+ printDebugString(true, stderr, "%s", "ioctl(I915_GEM_USERPTR) failed. Try running as root but expect poor stability.\n"); -+ } -+ return nullptr; -+ } -+ } else { -+ return nullptr; -+ } - } - - PRINT_DEBUG_STRING(DebugManager.flags.PrintBOCreateDestroyResult.get(), stdout, "Created new BO with GEM_USERPTR, handle: BO-%d\n", userptr.handle); diff --git a/lang/intel-compute-runtime/pkg-descr b/lang/intel-compute-runtime/pkg-descr deleted file mode 100644 index d993fb206de4..000000000000 --- a/lang/intel-compute-runtime/pkg-descr +++ /dev/null @@ -1,4 +0,0 @@ -The Intel(R) Graphics Compute Runtime for oneAPI Level Zero and -OpenCL(TM) Driver is an open source project providing compute API -support (Level Zero, OpenCL) for Intel graphics hardware architectures -(HD Graphics, Xe). |
