diff --git a/lang/intel-compute-runtime/Makefile b/lang/intel-compute-runtime/Makefile index bb181ad04477..f3db2fc62a6a 100644 --- a/lang/intel-compute-runtime/Makefile +++ b/lang/intel-compute-runtime/Makefile @@ -1,61 +1,61 @@ PORTNAME= compute-runtime -DISTVERSION= 22.13.22789 +DISTVERSION= 22.14.22890 CATEGORIES= lang PKGNAMEPREFIX= intel- PKGNAMESUFFIX= -${FLAVOR} 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 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= ${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 diff --git a/lang/intel-compute-runtime/distinfo b/lang/intel-compute-runtime/distinfo index c39b8f6c3246..954761daeb49 100644 --- a/lang/intel-compute-runtime/distinfo +++ b/lang/intel-compute-runtime/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1647954805 -SHA256 (intel-compute-runtime-22.13.22789_GH0.tar.gz) = b6edbbeb72e7173a4d6ae78871c8a6f65563160661dd21224c9a0e2bb7286421 -SIZE (intel-compute-runtime-22.13.22789_GH0.tar.gz) = 5252140 +TIMESTAMP = 1648837439 +SHA256 (intel-compute-runtime-22.14.22890_GH0.tar.gz) = 16a0fab74f6732c63cf8f666d40db5bbeecfaaf73061f69fd608a7f058ba1738 +SIZE (intel-compute-runtime-22.14.22890_GH0.tar.gz) = 5290076 diff --git a/lang/intel-compute-runtime/files/patch-no-rebar b/lang/intel-compute-runtime/files/patch-no-rebar index 10941205ad28..a609570fb9e0 100644 --- a/lang/intel-compute-runtime/files/patch-no-rebar +++ b/lang/intel-compute-runtime/files/patch-no-rebar @@ -1,96 +1,120 @@ 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 + ^~~~~~~~~~~~~~~~~~ +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 ^~~~~~~~~~~~~~~~~~ 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/linux/os_sysman_imp.cpp.orig 2022-04-01 18:23:59 UTC ++++ level_zero/tools/source/sysman/linux/os_sysman_imp.cpp +@@ -14,7 +14,12 @@ + + #include "sysman/linux/firmware_util/firmware_util.h" + ++#ifdef __linux__ + #include ++#else ++#define PCI_BRIDGE_CONTROL 0x3e ++#define PCI_BRIDGE_CTL_BUS_RESET 0x40 ++#endif + + 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 +#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) {