Index: head/lang/intel-compute-runtime/Makefile =================================================================== --- head/lang/intel-compute-runtime/Makefile (revision 548917) +++ head/lang/intel-compute-runtime/Makefile (revision 548918) @@ -1,60 +1,60 @@ # $FreeBSD$ PORTNAME= compute-runtime -DISTVERSION= 20.36.17813 +DISTVERSION= 20.37.17906 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_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= VAAPI OPTIONS_DEFAULT=VAAPI OPTIONS_DEFINE_amd64= L0 OPTIONS_DEFAULT_amd64= L0 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.0.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 Index: head/lang/intel-compute-runtime/distinfo =================================================================== --- head/lang/intel-compute-runtime/distinfo (revision 548917) +++ head/lang/intel-compute-runtime/distinfo (revision 548918) @@ -1,3 +1,3 @@ -TIMESTAMP = 1598879389 -SHA256 (intel-compute-runtime-20.36.17813_GH0.tar.gz) = 584d3be6f6bd60195da77660edd3a857589d50a610a18f1d3098869303bf6752 -SIZE (intel-compute-runtime-20.36.17813_GH0.tar.gz) = 3459305 +TIMESTAMP = 1599810838 +SHA256 (intel-compute-runtime-20.37.17906_GH0.tar.gz) = 803d48568822562398d1e09a992a13234d53040cc07aad64eeefc8ddb1a67060 +SIZE (intel-compute-runtime-20.37.17906_GH0.tar.gz) = 3492080 Index: head/lang/intel-compute-runtime/files/patch-no-perf =================================================================== --- head/lang/intel-compute-runtime/files/patch-no-perf (nonexistent) +++ head/lang/intel-compute-runtime/files/patch-no-perf (revision 548918) @@ -0,0 +1,70 @@ +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 + ^~~~~~~~~~~~~~~~~~~~ + +--- level_zero/tools/source/sysman/engine/linux/os_engine_imp.cpp.orig 2020-09-11 07:53:58 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->pmuReadSingle(static_cast(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 2020-09-11 07:53:58 UTC ++++ level_zero/tools/source/sysman/linux/os_sysman_imp.cpp +@@ -37,8 +37,10 @@ ze_result_t LinuxSysmanImp::init() { + pPmt = new PlatformMonitoringTech(); + UNRECOVERABLE_IF(nullptr == pPmt); + pPmt->init(myDeviceName, pFsAccess); ++#ifdef __linux__ + pPmuInterface = PmuInterface::create(this); + UNRECOVERABLE_IF(nullptr == pPmuInterface); ++#endif + + return ZE_RESULT_SUCCESS; + } +--- level_zero/tools/source/sysman/linux/os_sysman_imp.h.orig 2020-09-11 07:53:58 UTC ++++ level_zero/tools/source/sysman/linux/os_sysman_imp.h +@@ -13,7 +13,9 @@ + #include "level_zero/core/source/device/device.h" + #include "level_zero/tools/source/sysman/linux/fs_access.h" + #include "level_zero/tools/source/sysman/linux/pmt.h" ++#ifdef __linux__ + #include "level_zero/tools/source/sysman/linux/pmu/pmu_imp.h" ++#endif + #include "level_zero/tools/source/sysman/linux/xml_parser/xml_parser.h" + #include "level_zero/tools/source/sysman/sysman_imp.h" + +--- 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} Property changes on: head/lang/intel-compute-runtime/files/patch-no-perf ___________________________________________________________________ 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