Index: head/lang/intel-compute-runtime/Makefile =================================================================== --- head/lang/intel-compute-runtime/Makefile (revision 522572) +++ head/lang/intel-compute-runtime/Makefile (revision 522573) @@ -1,42 +1,42 @@ # $FreeBSD$ PORTNAME= compute-runtime -DISTVERSION= 19.52.15209 +DISTVERSION= 20.01.15264 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 pkgconfig USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel -CMAKE_ON= SKIP_ALL_ULT +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 post-patch: @${REINPLACE_CMD} -e '/-Werror/d' \ -e '/FORCE_RESPONSE_FILE/d' \ ${WRKSRC}/CMakeLists.txt @${REINPLACE_CMD} -e '/defaults/!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 522572) +++ head/lang/intel-compute-runtime/distinfo (revision 522573) @@ -1,3 +1,3 @@ -TIMESTAMP = 1578044448 -SHA256 (intel-compute-runtime-19.52.15209_GH0.tar.gz) = 91405bcdc2241073161adc5d01885121adf78454d6dbd3dd796a5fd3fdae2812 -SIZE (intel-compute-runtime-19.52.15209_GH0.tar.gz) = 2659506 +TIMESTAMP = 1578092671 +SHA256 (intel-compute-runtime-20.01.15264_GH0.tar.gz) = 6a9b1cab8b91d086ac9fdf54495a4880f38ab07f056a49026234153ff7d58d2e +SIZE (intel-compute-runtime-20.01.15264_GH0.tar.gz) = 2662016 Index: head/lang/intel-compute-runtime/files/patch-gmmlib-adapter =================================================================== --- head/lang/intel-compute-runtime/files/patch-gmmlib-adapter (revision 522572) +++ head/lang/intel-compute-runtime/files/patch-gmmlib-adapter (nonexistent) @@ -1,150 +0,0 @@ -https://github.com/intel/compute-runtime/pull/244 - -In file included from runtime/kernel/kernel.cpp:10: -core/gmm_helper/gmm_helper.h:42:129: error: use of undeclared identifier 'GmmDestroy' - static std::unique_ptr (*createGmmContextWrapperFunc)(HardwareInfo *, decltype(&InitializeGmm), decltype(&GmmDestroy)); - ^ -core/gmm_helper/gmm_helper.h:51:15: error: use of undeclared identifier 'GmmDestroy' - decltype(&GmmDestroy) destroyGmmFunc; - ^ - ---- core/gmm_helper/gmm_helper.h.orig 2019-12-23 15:18:58 UTC -+++ core/gmm_helper/gmm_helper.h -@@ -40,7 +40,7 @@ class GmmHelper { - - GmmClientContext *getClientContext() const; - -- static std::unique_ptr (*createGmmContextWrapperFunc)(OSInterface *, HardwareInfo *, decltype(&InitializeGmm), decltype(&GmmDestroy)); -+ static std::unique_ptr (*createGmmContextWrapperFunc)(OSInterface *, HardwareInfo *, decltype(&InitializeGmm), decltype(&GmmAdapterDestroy)); - - protected: - void loadLib(); -@@ -49,6 +49,6 @@ class GmmHelper { - std::unique_ptr gmmLib; - std::unique_ptr gmmClientContext; - decltype(&InitializeGmm) initGmmFunc; -- decltype(&GmmDestroy) destroyGmmFunc; -+ decltype(&GmmAdapterDestroy) destroyGmmFunc; - }; - } // namespace NEO ---- runtime/dll/linux/options_linux.cpp.orig 2019-12-23 15:18:58 UTC -+++ runtime/dll/linux/options_linux.cpp -@@ -16,8 +16,8 @@ const char *frontEndDllName = FCL_LIBRARY_NAME; - const char *igcDllName = IGC_LIBRARY_NAME; - const char *libvaDllName = "libva.so.2"; - const char *gmmDllName = GMM_UMD_DLL; --const char *gmmInitFuncName = GMM_INIT_NAME; --const char *gmmDestroyFuncName = GMM_DESTROY_NAME; -+const char *gmmInitFuncName = GMM_ADAPTER_INIT_NAME; -+const char *gmmDestroyFuncName = GMM_ADAPTER_DESTROY_NAME; - - const char *sysFsPciPath = "/sys/bus/pci/devices/"; - const char *tbxLibName = "libtbxAccess.so"; ---- runtime/dll/windows/options_windows.cpp.orig 2019-12-23 15:18:58 UTC -+++ runtime/dll/windows/options_windows.cpp -@@ -14,8 +14,8 @@ const char *frontEndDllName = FCL_LIBRARY_NAME; - const char *igcDllName = IGC_LIBRARY_NAME; - const char *gdiDllName = "gdi32.dll"; - const char *gmmDllName = GMM_UMD_DLL; --const char *gmmInitFuncName = GMM_INIT_NAME; --const char *gmmDestroyFuncName = GMM_DESTROY_NAME; -+const char *gmmInitFuncName = GMM_ADAPTER_INIT_NAME; -+const char *gmmDestroyFuncName = GMM_ADAPTER_DESTROY_NAME; - - // Os specific Metrics Library name - #if _WIN64 ---- runtime/gmm_helper/client_context/gmm_client_context.cpp.orig 2019-12-23 15:18:58 UTC -+++ runtime/gmm_helper/client_context/gmm_client_context.cpp -@@ -8,5 +8,5 @@ - #include "gmm_client_context.h" - - namespace NEO { --GmmClientContext::GmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmDestroy) destroyFunc) : GmmClientContextBase(osInterface, hwInfo, initFunc, destroyFunc){}; -+GmmClientContext::GmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmAdapterDestroy) destroyFunc) : GmmClientContextBase(osInterface, hwInfo, initFunc, destroyFunc){}; - } // namespace NEO ---- runtime/gmm_helper/client_context/gmm_client_context.h.orig 2019-12-23 15:18:58 UTC -+++ runtime/gmm_helper/client_context/gmm_client_context.h -@@ -11,6 +11,6 @@ - namespace NEO { - class GmmClientContext : public GmmClientContextBase { - public: -- GmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmDestroy) destroyFunc); -+ GmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmAdapterDestroy) destroyFunc); - }; - } // namespace NEO ---- runtime/gmm_helper/client_context/gmm_client_context_base.cpp.orig 2019-12-23 15:18:58 UTC -+++ runtime/gmm_helper/client_context/gmm_client_context_base.cpp -@@ -15,7 +15,7 @@ - #include "runtime/os_interface/os_interface.h" - - namespace NEO { --GmmClientContextBase::GmmClientContextBase(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmDestroy) destroyFunc) : destroyFunc(destroyFunc) { -+GmmClientContextBase::GmmClientContextBase(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmAdapterDestroy) destroyFunc) : destroyFunc(destroyFunc) { - _SKU_FEATURE_TABLE gmmFtrTable = {}; - _WA_TABLE gmmWaTable = {}; - SkuInfoTransfer::transferFtrTableForGmm(&gmmFtrTable, &hwInfo->featureTable); ---- runtime/gmm_helper/client_context/gmm_client_context_base.h.orig 2019-12-23 15:18:58 UTC -+++ runtime/gmm_helper/client_context/gmm_client_context_base.h -@@ -25,7 +25,7 @@ class GmmClientContextBase { - MOCKABLE_VIRTUAL void destroyResInfoObject(GMM_RESOURCE_INFO *pResInfo); - GMM_CLIENT_CONTEXT *getHandle() const; - template -- static std::unique_ptr create(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmDestroy) destroyFunc) { -+ static std::unique_ptr create(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmAdapterDestroy) destroyFunc) { - return std::make_unique(osInterface, hwInfo, initFunc, destroyFunc); - } - -@@ -34,7 +34,7 @@ class GmmClientContextBase { - - protected: - GMM_CLIENT_CONTEXT *clientContext; -- GmmClientContextBase(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmDestroy) destroyFunc); -- decltype(&GmmDestroy) destroyFunc; -+ GmmClientContextBase(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmAdapterDestroy) destroyFunc); -+ decltype(&GmmAdapterDestroy) destroyFunc; - }; - } // namespace NEO ---- runtime/gmm_helper/gmm_interface.cpp.orig 2019-12-23 15:18:58 UTC -+++ runtime/gmm_helper/gmm_interface.cpp -@@ -21,7 +21,7 @@ void GmmHelper::loadLib() { - gmmLib.reset(OsLibrary::load(Os::gmmDllName)); - UNRECOVERABLE_IF(!gmmLib); - initGmmFunc = reinterpret_cast(gmmLib->getProcAddress(Os::gmmInitFuncName)); -- destroyGmmFunc = reinterpret_cast(gmmLib->getProcAddress(Os::gmmDestroyFuncName)); -+ destroyGmmFunc = reinterpret_cast(gmmLib->getProcAddress(Os::gmmDestroyFuncName)); - UNRECOVERABLE_IF(!initGmmFunc || !destroyGmmFunc); - } - } // namespace NEO ---- unit_tests/main.cpp.orig 2019-12-23 15:18:58 UTC -+++ unit_tests/main.cpp -@@ -461,8 +461,8 @@ int main(int argc, char **argv) { - #endif - if (!useMockGmm) { - Os::gmmDllName = GMM_UMD_DLL; -- Os::gmmInitFuncName = GMM_INIT_NAME; -- Os::gmmDestroyFuncName = GMM_DESTROY_NAME; -+ Os::gmmInitFuncName = GMM_ADAPTER_INIT_NAME; -+ Os::gmmDestroyFuncName = GMM_ADAPTER_DESTROY_NAME; - } else { - GmmHelper::createGmmContextWrapperFunc = GmmClientContextBase::create; - } ---- unit_tests/mocks/mock_gmm_client_context.cpp.orig 2019-12-23 15:18:58 UTC -+++ unit_tests/mocks/mock_gmm_client_context.cpp -@@ -8,6 +8,6 @@ - #include "mock_gmm_client_context.h" - - namespace NEO { --MockGmmClientContext::MockGmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmDestroy) destroyFunc) : MockGmmClientContextBase(osInterface, hwInfo, initFunc, destroyFunc) { -+MockGmmClientContext::MockGmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmAdapterDestroy) destroyFunc) : MockGmmClientContextBase(osInterface, hwInfo, initFunc, destroyFunc) { - } - } // namespace NEO ---- unit_tests/mocks/mock_gmm_client_context.h.orig 2019-12-23 15:18:58 UTC -+++ unit_tests/mocks/mock_gmm_client_context.h -@@ -11,6 +11,6 @@ - namespace NEO { - class MockGmmClientContext : public MockGmmClientContextBase { - public: -- MockGmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmDestroy) destroyFunc); -+ MockGmmClientContext(OSInterface *osInterface, HardwareInfo *hwInfo, decltype(&InitializeGmm) initFunc, decltype(&GmmAdapterDestroy) destroyFunc); - }; - } // namespace NEO Property changes on: head/lang/intel-compute-runtime/files/patch-gmmlib-adapter ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property