Index: head/lang/intel-compute-runtime/Makefile =================================================================== --- head/lang/intel-compute-runtime/Makefile (revision 531937) +++ head/lang/intel-compute-runtime/Makefile (revision 531938) @@ -1,51 +1,51 @@ # $FreeBSD$ PORTNAME= compute-runtime -DISTVERSION= 20.14.16441 +DISTVERSION= 20.15.16524 CATEGORIES= lang PKGNAMEPREFIX= intel- MAINTAINER= jbeich@FreeBSD.org COMMENT= OpenCL implementation for Intel HD 5000 (Gen8) or newer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported LIB_DEPENDS= libigc.so:devel/intel-graphics-compiler \ libigdgmm.so:multimedia/gmmlib USES= cmake compiler:c++14-lang localbase:ldflags pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel 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 OPTIONS_DEFINE_amd64= L0 OPTIONS_DEFAULT_amd64= L0 L0_DESC= oneAPI Level Zero support L0_BUILD_DEPENDS= level-zero>0:devel/level-zero L0_CMAKE_BOOL= BUILD_WITH_L0 L0_PLIST_FILES= lib/libze_intel_gpu.so.0.8 \ lib/libze_intel_gpu.so.0.8.0 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 Index: head/lang/intel-compute-runtime/distinfo =================================================================== --- head/lang/intel-compute-runtime/distinfo (revision 531937) +++ head/lang/intel-compute-runtime/distinfo (revision 531938) @@ -1,3 +1,3 @@ -TIMESTAMP = 1585911199 -SHA256 (intel-compute-runtime-20.14.16441_GH0.tar.gz) = 169e7833121beea8ec69ff9249ca06f3bae981e14593c7a62f363d4991acb7e2 -SIZE (intel-compute-runtime-20.14.16441_GH0.tar.gz) = 3012283 +TIMESTAMP = 1586590867 +SHA256 (intel-compute-runtime-20.15.16524_GH0.tar.gz) = 6b0f8f12fdda8c379f803b8b08e2219ca18377dea9487519ea46c1ecb4089f6a +SIZE (intel-compute-runtime-20.15.16524_GH0.tar.gz) = 3031777 Index: head/lang/intel-compute-runtime/files/patch-max_freq =================================================================== --- head/lang/intel-compute-runtime/files/patch-max_freq (revision 531937) +++ head/lang/intel-compute-runtime/files/patch-max_freq (revision 531938) @@ -1,44 +1,44 @@ /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 2020-03-06 21:12:07 UTC +--- shared/source/os_interface/linux/drm_neo.cpp.orig 2020-04-11 07:41:07 UTC +++ shared/source/os_interface/linux/drm_neo.cpp -@@ -22,6 +22,11 @@ - #include +@@ -24,6 +24,11 @@ #include + #include +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) +#include +#include +#endif + namespace NEO { - const char *Drm::sysFsDefaultGpuPath = "/drm/card0"; -@@ -106,6 +111,16 @@ int Drm::getEnabledPooledEu(int &enabled) { + namespace IoctlHelper { +@@ -104,6 +109,16 @@ int Drm::getEnabledPooledEu(int &enabled) { int Drm::getMaxGpuFrequency(int &maxGpuFrequency) { maxGpuFrequency = 0; +#if defined(__FreeBSD__) || defined(__FreeBSD_kernel__) + char max_freq[PAGE_SIZE]; + size_t len = sizeof(max_freq); + + if (sysctlbyname("sys.class.drm.card0.gt_max_freq_mhz", &max_freq, &len, NULL, 0)) { + return 0; + } + + maxGpuFrequency = std::stoi(max_freq); +#else - int deviceID = 0; - int ret = getDeviceID(deviceID); - if (ret != 0) { -@@ -127,6 +142,7 @@ int Drm::getMaxGpuFrequency(int &maxGpuFrequency) { + std::string clockSysFsPath = getSysFsPciPath(); + + clockSysFsPath += "/gt_max_freq_mhz"; +@@ -115,6 +130,7 @@ int Drm::getMaxGpuFrequency(int &maxGpuFrequency) { ifs >> maxGpuFrequency; ifs.close(); +#endif return 0; } Index: head/lang/intel-compute-runtime/files/patch-no-blitter =================================================================== --- head/lang/intel-compute-runtime/files/patch-no-blitter (nonexistent) +++ head/lang/intel-compute-runtime/files/patch-no-blitter (revision 531938) @@ -0,0 +1,37 @@ +Regressed by https://github.com/intel/compute-runtime/commit/691a4ea8237f +blitterOperationsSupported isn't enabled on any GPU yet + +Process 82663 stopped +* thread #1, name = 'ze_peak', stop reason = signal SIGABRT + frame #0: 0x000000080060b02a libc.so.7`__sys_thr_kill at thr_kill.S:4 +(lldb) bt +* thread #1, name = 'ze_peak', stop reason = signal SIGABRT + * frame #0: 0x000000080060b02a libc.so.7`__sys_thr_kill at thr_kill.S:4 + frame #1: 0x000000080060a9c4 libc.so.7`__raise(s=6) at raise.c:52:10 + frame #2: 0x0000000800573459 libc.so.7`abort at abort.c:67:8 + frame #3: 0x00000008003d6a49 libcxxrt.so.1`report_failure(err=, thrown_exception=0x0000000802717fa8) at exception.cc:719:5 + frame #4: 0x000000000020df59 ze_peak`L0Context::init_xe(this=0x00007fffffffde70) at ze_peak.cpp:183:5 + frame #5: 0x00000000002115d9 ze_peak`main(argc=1, argv=0x00007fffffffe0f0) at ze_peak.cpp:760:11 + frame #6: 0x000000000020b8bf ze_peak`_start(ap=, cleanup=) at crt1.c:76:7 +(lldb) f 4 +frame #4: 0x000000000020df59 ze_peak`L0Context::init_xe(this=0x00007fffffffde70) at ze_peak.cpp:183:5 + 180 result = + 181 zeCommandListCreate(device, &command_list_description, &command_list); + 182 if (result) { +-> 183 throw std::runtime_error("zeDeviceCreateCommandList failed: " + + 184 std::to_string(result)); + 185 } + 186 if (verbose) + +--- level_zero/core/source/device/device_imp.cpp.orig 2020-04-11 07:41:07 UTC ++++ level_zero/core/source/device/device_imp.cpp +@@ -725,9 +725,7 @@ ze_result_t DeviceImp::isCreatedCommandListCopyOnly(co + auto hwInfo = neoDevice->getHardwareInfo(); + if (hwInfo.capabilityTable.blitterOperationsSupported) { + *useBliter = true; +- return ZE_RESULT_SUCCESS; + } +- return ZE_RESULT_ERROR_INVALID_ENUMERATION; + } + return ZE_RESULT_SUCCESS; + } Property changes on: head/lang/intel-compute-runtime/files/patch-no-blitter ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property