Date: Sun, 3 Oct 2021 10:06:44 GMT From: Jan Beich <jbeich@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 6587d3a4d2ec - main - lang/intel-compute-runtime: drop i386 support Message-ID: <202110031006.193A6i0A095860@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jbeich: URL: https://cgit.FreeBSD.org/ports/commit/?id=6587d3a4d2ecb023ce2625ac948f19b2cf080ba3 commit 6587d3a4d2ecb023ce2625ac948f19b2cf080ba3 Author: Jan Beich <jbeich@FreeBSD.org> AuthorDate: 2021-10-02 11:11:42 +0000 Commit: Jan Beich <jbeich@FreeBSD.org> CommitDate: 2021-10-03 09:54:49 +0000 lang/intel-compute-runtime: drop i386 support Probably didn't work, anyway. Upstream works on aarch64 instead. https://github.com/intel/compute-runtime/issues/316 https://github.com/intel/compute-runtime/commit/895e9e511653 --- lang/intel-compute-runtime/Makefile | 11 +--- lang/intel-compute-runtime/files/patch-arch | 5 +- lang/intel-compute-runtime/files/patch-i386 | 88 ----------------------------- 3 files changed, 4 insertions(+), 100 deletions(-) diff --git a/lang/intel-compute-runtime/Makefile b/lang/intel-compute-runtime/Makefile index d997dbc39fba..80a51ead864d 100644 --- a/lang/intel-compute-runtime/Makefile +++ b/lang/intel-compute-runtime/Makefile @@ -13,11 +13,8 @@ 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= amd64 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported -BROKEN_i386= shared/source/kernel/implicit_args.h:35:1: error: static_assert failed \ - due to requirement '(sizeof(NEO::ImplicitArgs) & 31) == 0' \ - "Implicit args size need to be aligned to 32" LIB_DEPENDS= libigc.so:devel/intel-graphics-compiler@${FLAVOR} \ libigdgmm.so:multimedia/gmmlib @@ -39,10 +36,8 @@ PLIST_FILES= bin/ocloc \ lib/libocloc.so \ ${NULL} -OPTIONS_DEFINE= VAAPI -OPTIONS_DEFAULT=VAAPI -OPTIONS_DEFINE_amd64= L0 -OPTIONS_DEFAULT_amd64= L0 +OPTIONS_DEFINE= L0 VAAPI +OPTIONS_DEFAULT=L0 VAAPI L0_DESC= oneAPI Level Zero support L0_BUILD_DEPENDS= level-zero>=1.0:devel/level-zero diff --git a/lang/intel-compute-runtime/files/patch-arch b/lang/intel-compute-runtime/files/patch-arch index 4b9b30f7ef4b..0a319dba8445 100644 --- a/lang/intel-compute-runtime/files/patch-arch +++ b/lang/intel-compute-runtime/files/patch-arch @@ -2,18 +2,15 @@ Add more architecture names CMake Error at CMakeLists.txt:164 (message): Unsupported target processor: amd64 - Unsupported target processor: i386 --- CMakeLists.txt.orig 2021-09-17 14:06:15 UTC +++ CMakeLists.txt -@@ -154,6 +154,10 @@ if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") +@@ -154,6 +154,8 @@ if(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "x86_64") set(NEO_TARGET_PROCESSOR "x86_64") elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "AMD64") set(NEO_TARGET_PROCESSOR "x86_64") +elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "amd64") + set(NEO_TARGET_PROCESSOR "x86_64") -+elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "i386") -+ set(NEO_TARGET_PROCESSOR "x86_64") # pre-895e9e511653 code elseif(${CMAKE_SYSTEM_PROCESSOR} STREQUAL "aarch64") set(NEO_TARGET_PROCESSOR "aarch64") include_directories(${CMAKE_CURRENT_SOURCE_DIR}/third_party/sse2neon) diff --git a/lang/intel-compute-runtime/files/patch-i386 b/lang/intel-compute-runtime/files/patch-i386 deleted file mode 100644 index c82d7a079b91..000000000000 --- a/lang/intel-compute-runtime/files/patch-i386 +++ /dev/null @@ -1,88 +0,0 @@ -Revert BufferObject's size to size_t like before 45a0ceecfbe4 - -shared/source/os_interface/linux/drm_memory_manager.cpp:61:54: error: non-const - lvalue reference to type 'size_t' (aka 'unsigned int') cannot bind to a value of unrelated type 'uint64_t' - (aka 'unsigned long long') - bo->gpuAddress = acquireGpuRange(bo->size, false, rootDeviceIndex, false); - ^~~~~~~~ -shared/source/os_interface/linux/drm_memory_manager.h:66:38: note: passing argument - to parameter 'size' here - uint64_t acquireGpuRange(size_t &size, bool requireSpecificBitness, uint32_t rootDeviceIndex, bool requi... - ^ - -SSE2 is not enabled by default on BSDs - -core/utilities/clflush.cpp:16:5: error: '_mm_clflush' needs target feature sse2 - _mm_clflush(ptr); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:785:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:787:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:789:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:798:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:800:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:803:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:805:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:816:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:818:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:820:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ -shared/source/os_interface/windows/wddm_memory_manager.cpp:822:5: error: '_mm_lfence' needs target feature sse2 - _mm_lfence(); - ^ - ---- shared/source/os_interface/linux/drm_buffer_object.h.orig 2020-05-21 10:39:12 UTC -+++ shared/source/os_interface/linux/drm_buffer_object.h -@@ -55,7 +55,7 @@ class BufferObject { - std::atomic<uint32_t> refCount; - - int handle; // i915 gem object handle -- uint64_t size; -+ size_t size; - bool isReused; - - //Tiling ---- shared/source/os_interface/windows/wddm_memory_manager.cpp.orig 2021-07-22 17:35:36 UTC -+++ shared/source/os_interface/windows/wddm_memory_manager.cpp -@@ -31,7 +31,11 @@ - #include "shared/source/os_interface/windows/wddm_residency_controller.h" - - #include <algorithm> -+#ifdef __SSE2__ - #include <emmintrin.h> -+#else -+#define _mm_lfence() -+#endif - - namespace NEO { - ---- shared/source/utilities/cpuintrinsics.cpp.orig 2020-02-28 16:16:42 UTC -+++ shared/source/utilities/cpuintrinsics.cpp -@@ -12,6 +12,9 @@ - namespace NEO { - namespace CpuIntrinsics { - -+#ifdef __GNUC__ -+__attribute__((target("sse2"))) -+#endif - void clFlush(void const *ptr) { - _mm_clflush(ptr); - }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202110031006.193A6i0A095860>