diff --git a/lang/intel-compute-runtime/Makefile b/lang/intel-compute-runtime/Makefile index ed4b2dfe5be1..17ae4bcf6727 100644 --- a/lang/intel-compute-runtime/Makefile +++ b/lang/intel-compute-runtime/Makefile @@ -1,62 +1,61 @@ PORTNAME= compute-runtime -DISTVERSION= 21.32.20609 -PORTREVISION= 1 +DISTVERSION= 21.33.20678 CATEGORIES= lang PKGNAMEPREFIX= intel- PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= 4a926516c3ea.patch:-p1 # https://github.com/intel/compute-runtime/pull/361 MAINTAINER= jbeich@FreeBSD.org COMMENT= OpenCL implementation for Intel HD 5000 (Gen8) or newer LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md 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++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= 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.1.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 diff --git a/lang/intel-compute-runtime/distinfo b/lang/intel-compute-runtime/distinfo index b4dae1fa6732..42867b20d58f 100644 --- a/lang/intel-compute-runtime/distinfo +++ b/lang/intel-compute-runtime/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1628075862 -SHA256 (intel-compute-runtime-21.32.20609_GH0.tar.gz) = afe17b1f65bde7361f71cd051925ca382f8652b29549ed3527a95d801401ba67 -SIZE (intel-compute-runtime-21.32.20609_GH0.tar.gz) = 4462286 +TIMESTAMP = 1628698353 +SHA256 (intel-compute-runtime-21.33.20678_GH0.tar.gz) = 3569aceb3088b1c1674196097419e701b2070e80375c974f38706ceaacdae1db +SIZE (intel-compute-runtime-21.33.20678_GH0.tar.gz) = 4534884 SHA256 (4a926516c3ea.patch) = 1a9c4694dbe892f01a7d3be5c5229b6b3bb34222848d61054f7bdf91134ca60f SIZE (4a926516c3ea.patch) = 1691 diff --git a/lang/intel-compute-runtime/files/patch-no-rebar b/lang/intel-compute-runtime/files/patch-no-rebar index 16b5ece68112..10941205ad28 100644 --- a/lang/intel-compute-runtime/files/patch-no-rebar +++ b/lang/intel-compute-runtime/files/patch-no-rebar @@ -1,80 +1,96 @@ Limit resizable BAR to Linux as NEO doesn't use libpci. level_zero/tools/source/sysman/pci/linux/os_pci_imp.cpp:15:10: fatal error: 'linux/pci_regs.h' file not found #include ^~~~~~~~~~~~~~~~~~ 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(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/pci/linux/os_pci_imp.cpp.orig 2021-07-27 12:47:48 UTC +--- 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 +#endif namespace L0 { -@@ -154,6 +156,7 @@ ze_result_t LinuxPciImp::initializeBarProperties(std:: +@@ -153,6 +155,7 @@ ze_result_t LinuxPciImp::initializeBarProperties(std:: + } - // Parse PCIe configuration space to see if resizable Bar is supported - bool LinuxPciImp::resizableBarSupported() { + uint32_t LinuxPciImp::getRebarCapabilityPos() { +#ifdef __linux__ uint32_t pos = PCI_CFG_SPACE_SIZE; uint32_t header = 0; -@@ -180,6 +183,7 @@ bool LinuxPciImp::resizableBarSupported() { +@@ -179,6 +182,7 @@ uint32_t LinuxPciImp::getRebarCapabilityPos() { } header = getDwordFromConfig(pos); } +#endif - return false; + 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 } -@@ -192,6 +196,7 @@ ze_result_t LinuxPciImp::getState(zes_pci_state_t *sta + 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; -@@ -203,6 +208,7 @@ void LinuxPciImp::pciExtendedConfigRead() { +@@ -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) {