diff --git a/devel/intel-graphics-compiler/Makefile b/devel/intel-graphics-compiler/Makefile index c2c931c6ef12..ad3f7ff7c2e6 100644 --- a/devel/intel-graphics-compiler/Makefile +++ b/devel/intel-graphics-compiler/Makefile @@ -1,47 +1,42 @@ PORTNAME= intel-graphics-compiler DISTVERSIONPREFIX= igc- -DISTVERSION= 1.0.8517 +DISTVERSION= 1.0.8708 CATEGORIES= devel -PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ -PATCHFILES+= ef9a69ee4723.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/189 -PATCHFILES+= 8888a28132ac.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/189 -PATCHFILES+= b926d2c2f490.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/189 - MAINTAINER= jbeich@FreeBSD.org COMMENT= Intel Graphics Compiler for OpenCL LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.md ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= Only Intel GPUs on x86 are supported # llvm10 is unstable, see https://github.com/intel/intel-graphics-compiler/issues/202 BUILD_DEPENDS= vc-intrinsics-llvm11>=s20210730:devel/vc-intrinsics@llvm11 LIB_DEPENDS= libopencl-clang.so.11:devel/opencl-clang@llvm11 USES= bison cmake compiler:c++17-lang python:build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel CMAKE_OFF= INSTALL_SPIRVDLL CMAKE_ARGS= -DCMAKE_PREFIX_PATH:PATH="${LOCALBASE}/${LIB_DEPENDS:M*@llvm*:C/.*@//}" \ -DIGC_OPTION__LLVM_PREFERRED_VERSION:STRING="${LIB_DEPENDS:M*@llvm*:C/.*so\.//:C/:.*//}" CFLAGS+= -Wno-macro-redefined # __fastcall PLIST_SUB= ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//} post-patch: # lang/python* don't install unsuffixed symlinks @${REINPLACE_CMD} -i .python \ -e '/EXECUTABLE/s/"python"/"${PYTHON_CMD:T}"/' \ -e '/IGC_PYTHON/s/"python"/"${PYTHON_CMD:T}"/' \ ${WRKSRC}/IGC/CMakeLists.txt \ ${WRKSRC}/IGC/BiFModule/linux/CMakeLists.txt # No need to abort on every benign warning enabled by default # Disable debug symbols unless WITH_DEBUG passed via CXXFLAGS @${REINPLACE_CMD} -e 's/"-Werror"//; /-Werror/d' \ -e 's/"-g"//' \ ${WRKSRC}/IGC/CMakeLists.txt .include diff --git a/devel/intel-graphics-compiler/distinfo b/devel/intel-graphics-compiler/distinfo index 7566046d95a9..ed7c408bbe01 100644 --- a/devel/intel-graphics-compiler/distinfo +++ b/devel/intel-graphics-compiler/distinfo @@ -1,9 +1,3 @@ -TIMESTAMP = 1629709130 -SHA256 (intel-intel-graphics-compiler-igc-1.0.8517_GH0.tar.gz) = b6bcac1e598a51d7ca54a97d746f5f9ddd619d4cd23fd3fa3e63f181fce5de17 -SIZE (intel-intel-graphics-compiler-igc-1.0.8517_GH0.tar.gz) = 7539946 -SHA256 (ef9a69ee4723.patch) = 3468a505bff2a3793530f8e14cadcaba33859899855447230c00b8f45476cccd -SIZE (ef9a69ee4723.patch) = 1199 -SHA256 (8888a28132ac.patch) = 74e2be5a81e3ed91286d6f0e7fba07b5eb1542fffbeb4394be40d4585515548b -SIZE (8888a28132ac.patch) = 1160 -SHA256 (b926d2c2f490.patch) = d126535816d8daa42abb480c7a5ae627abe4655e26de84a65daca9c6203f2f32 -SIZE (b926d2c2f490.patch) = 4441 +TIMESTAMP = 1631387007 +SHA256 (intel-intel-graphics-compiler-igc-1.0.8708_GH0.tar.gz) = 08dc2d4b93be77b024a9cf76ebfdc5013c5c756fd9bd73a10e4da78e6b6a560e +SIZE (intel-intel-graphics-compiler-igc-1.0.8708_GH0.tar.gz) = 7574517 diff --git a/devel/intel-graphics-compiler/files/patch-strerror_r b/devel/intel-graphics-compiler/files/patch-strerror_r new file mode 100644 index 000000000000..d5996876448f --- /dev/null +++ b/devel/intel-graphics-compiler/files/patch-strerror_r @@ -0,0 +1,23 @@ +POSIX version of strerror_r returns int + +visa/iga/IGALibrary/system.cpp:263:14: error: assigning to 'char *' from incompatible type 'int' + errMsg = strerror_r(errCode, buf, sizeof(buf)); + ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +--- visa/iga/IGALibrary/system.cpp.orig 2021-09-11 19:03:27 UTC ++++ visa/iga/IGALibrary/system.cpp +@@ -259,8 +259,13 @@ std::string iga::FormatLastError(unsigned errCode) + NULL); + if (errMsg) + msg = errMsg; +-#else ++#elif defined(__GLIBC__) + errMsg = strerror_r(errCode, buf, sizeof(buf)); ++#else ++ if (strerror_r(errCode, buf, sizeof(buf))) ++ errMsg = nullptr; ++ else ++ errMsg = buf; + #endif // _WIN32 + if (errMsg == nullptr || errMsg[0] == 0) + return "???"; diff --git a/devel/intel-graphics-compiler/pkg-plist b/devel/intel-graphics-compiler/pkg-plist index 968e8aebed31..da47de31c31a 100644 --- a/devel/intel-graphics-compiler/pkg-plist +++ b/devel/intel-graphics-compiler/pkg-plist @@ -1,103 +1,104 @@ bin/GenX_IR bin/iga%%ARCH_SUFX%% include/iga/iga.h include/iga/iga.hpp include/iga/igaEncoderWrapper.hpp include/iga/iga_bxml_enums.hpp include/iga/iga_bxml_ops.hpp include/iga/iga_types_ext.hpp include/iga/iga_types_swsb.hpp include/iga/igad.h include/iga/igax.hpp include/iga/kv.h include/iga/kv.hpp include/igc/cif/CMakeLists.txt include/igc/cif/cif/CMakeLists.txt include/igc/cif/cif/builtins/builtins_registry.cpp include/igc/cif/cif/builtins/builtins_registry.h include/igc/cif/cif/builtins/memory/buffer/buffer.h include/igc/cif/cif/builtins/memory/buffer/impl/buffer_impl.cpp include/igc/cif/cif/builtins/memory/buffer/impl/buffer_impl.h include/igc/cif/cif/common/cif.h include/igc/cif/cif/common/cif_main.h include/igc/cif/cif/common/coder.h include/igc/cif/cif/common/compatibility.h include/igc/cif/cif/common/id.h include/igc/cif/cif/common/library_api.h include/igc/cif/cif/common/library_handle.h include/igc/cif/cif/export/build/binary_version.h include/igc/cif/cif/export/cif_impl.h include/igc/cif/cif/export/cif_main.cpp include/igc/cif/cif/export/cif_main_impl.h include/igc/cif/cif/export/interface_creator.h include/igc/cif/cif/export/library_api.h include/igc/cif/cif/export/muiltiversion.h include/igc/cif/cif/export/pimpl_base.h include/igc/cif/cif/export/registry.cpp include/igc/cif/cif/export/registry.h include/igc/cif/cif/helpers/error.h include/igc/cif/cif/helpers/memory.h include/igc/cif/cif/import/cif_main.cpp include/igc/cif/cif/import/cif_main.h include/igc/cif/cif/import/library_api.h include/igc/cif/cif/macros/disable.h include/igc/cif/cif/macros/enable.h include/igc/cif/cif/os/lin/lin_library_handle.cpp include/igc/cif/cif/os/lin/lin_library_handle.h include/igc/cif/cif/os/win/win_library_handle.cpp include/igc/cif/cif/os/win/win_library_handle.h include/igc/cif/readme.txt include/igc/common/StateSaveAreaHeader.h include/igc/igc.opencl.h include/igc/ocl_igc_interface/code_type.h include/igc/ocl_igc_interface/fcl_ocl_device_ctx.h include/igc/ocl_igc_interface/fcl_ocl_translation_ctx.h include/igc/ocl_igc_interface/gt_system_info.h include/igc/ocl_igc_interface/igc_features_and_workarounds.h include/igc/ocl_igc_interface/igc_ocl_device_ctx.h include/igc/ocl_igc_interface/igc_ocl_translation_ctx.h include/igc/ocl_igc_interface/impl/fcl_ocl_device_ctx_impl.cpp include/igc/ocl_igc_interface/impl/fcl_ocl_device_ctx_impl.h include/igc/ocl_igc_interface/impl/fcl_ocl_translation_ctx_impl.cpp include/igc/ocl_igc_interface/impl/fcl_ocl_translation_ctx_impl.h include/igc/ocl_igc_interface/impl/gt_system_info_impl.cpp include/igc/ocl_igc_interface/impl/gt_system_info_impl.h include/igc/ocl_igc_interface/impl/igc_features_and_workarounds_impl.cpp include/igc/ocl_igc_interface/impl/igc_features_and_workarounds_impl.h include/igc/ocl_igc_interface/impl/igc_ocl_device_ctx_impl.cpp include/igc/ocl_igc_interface/impl/igc_ocl_device_ctx_impl.h include/igc/ocl_igc_interface/impl/igc_ocl_translation_ctx_impl.cpp include/igc/ocl_igc_interface/impl/igc_ocl_translation_ctx_impl.h include/igc/ocl_igc_interface/impl/ocl_gen_binary_impl.cpp include/igc/ocl_igc_interface/impl/ocl_gen_binary_impl.h include/igc/ocl_igc_interface/impl/ocl_translation_output_impl.cpp include/igc/ocl_igc_interface/impl/ocl_translation_output_impl.h include/igc/ocl_igc_interface/impl/platform_impl.cpp include/igc/ocl_igc_interface/impl/platform_impl.h +include/igc/ocl_igc_interface/impl/version_in.h include/igc/ocl_igc_interface/ocl_gen_binary.h include/igc/ocl_igc_interface/ocl_translation_output.h include/igc/ocl_igc_interface/platform.h include/igc/ocl_igc_interface/platform_helper.h include/igc/ocl_igc_shared/device_enqueue/DeviceEnqueueInternalTypes.h include/igc/ocl_igc_shared/executable_format/patch_g10.h include/igc/ocl_igc_shared/executable_format/patch_g7.h include/igc/ocl_igc_shared/executable_format/patch_g8.h include/igc/ocl_igc_shared/executable_format/patch_g9.h include/igc/ocl_igc_shared/executable_format/patch_list.h include/igc/ocl_igc_shared/executable_format/patch_shared.h include/igc/ocl_igc_shared/executable_format/program_debug_data.h include/igc/ocl_igc_shared/gtpin/gtpin_driver_common.h include/igc/ocl_igc_shared/gtpin/gtpin_driver_common_bti.h include/igc/ocl_igc_shared/gtpin/gtpin_ocl_interface.h include/visa/RelocationInfo.h @comment lib/igc/NOTICES.txt lib/libiga%%ARCH_SUFX%%.so lib/libiga%%ARCH_SUFX%%.so.1 lib/libiga%%ARCH_SUFX%%.so.1.0.1 lib/libigc.so lib/libigc.so.1 lib/libigc.so.1.0.1 lib/libigdfcl.so lib/libigdfcl.so.1 lib/libigdfcl.so.1.0.1 libdata/pkgconfig/igc-opencl.pc