Index: head/devel/intel-graphics-compiler/Makefile =================================================================== --- head/devel/intel-graphics-compiler/Makefile (revision 556859) +++ head/devel/intel-graphics-compiler/Makefile (revision 556860) @@ -1,59 +1,55 @@ # $FreeBSD$ PORTNAME= intel-graphics-compiler DISTVERSIONPREFIX= igc- DISTVERSION= 1.0.5699 +PORTREVISION= 1 CATEGORIES= devel PATCH_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/ PATCHFILES+= d878880cbb3b.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/129 +PATCHFILES+= f44eb990ac84.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/156 +PATCHFILES+= cf887180a0e3.patch:-p1 # https://github.com/intel/intel-graphics-compiler/pull/156 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 LIB_DEPENDS= libopencl-clang.so:devel/opencl-clang USES= bison cmake compiler:c++17-lang python:build USE_GITHUB= yes USE_LDCONFIG= yes GH_ACCOUNT= intel GH_TUPLE= intel:vc-intrinsics:a08fe5b:vcintrin/../vc-intrinsics CMAKE_OFF= INSTALL_SPIRVDLL CFLAGS+= -Wno-macro-redefined # __fastcall PLIST_SUB= ARCH_SUFX=${ARCH:S/i386/32/:S/amd//:S/x86_//} - -.if (exists(/usr/lib/clang/10.0.0) || exists(/usr/lib/clang/10.0.1) || exists(/usr/lib/clang/11.0.0)) && ${CXX} == c++ -# https://github.com/intel/intel-graphics-compiler/issues/126 -BUILD_DEPENDS+= clang++90:devel/llvm90 -USES:= ${USES:Ncompiler*} -CXX= clang++90 -.endif 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/CMakeLists.txt # devel/llvm* have different naming from upstream under PATH @${REINPLACE_CMD} -e '/clang-\$$/s//clang$$/' \ ${WRKSRC}/IGC/BiFModule/CMakeLists.txt # No need to abort on every benign warning enabled by default @${REINPLACE_CMD} -e 's/"-Werror"//; /-Werror/d' \ ${WRKSRC}/IGC/CMakeLists.txt pre-configure: # Only one libLLVM can be loaded, so use the same version as devel/opencl-clang @for f in ${LOCALBASE}/lib/libopencl-clang.so.*; do \ ${REINPLACE_CMD} "/set.*LLVM_VERSION/s/\".*\"/\"$${f##*so.}\"/" \ ${WRKSRC}/IGC/CMakeLists.txt; \ done .include Index: head/devel/intel-graphics-compiler/distinfo =================================================================== --- head/devel/intel-graphics-compiler/distinfo (revision 556859) +++ head/devel/intel-graphics-compiler/distinfo (revision 556860) @@ -1,7 +1,11 @@ TIMESTAMP = 1605927132 SHA256 (intel-intel-graphics-compiler-igc-1.0.5699_GH0.tar.gz) = 9afa912d7671f45e70b2dcea61dde485ed4e16fe6018d27265d98e6680935688 SIZE (intel-intel-graphics-compiler-igc-1.0.5699_GH0.tar.gz) = 7379486 SHA256 (intel-vc-intrinsics-a08fe5b_GH0.tar.gz) = e57f05d56e385449ed86fdbbb3b5f75ba67537dce137176e371c30081c4fea2f SIZE (intel-vc-intrinsics-a08fe5b_GH0.tar.gz) = 119121 SHA256 (d878880cbb3b.patch) = f430b2da0d212594ce73f23b279a1435f08dea60f30ec35494411ab0dc0fcf70 SIZE (d878880cbb3b.patch) = 9088 +SHA256 (f44eb990ac84.patch) = 4774683855caa8ef44a85a43356b7d509683bbdbef23e31ab6f5e4075715d67c +SIZE (f44eb990ac84.patch) = 1547 +SHA256 (cf887180a0e3.patch) = 20c5afc646f61180880fc8e07abcd0feac04bfb190ab27d8af939d459b61a9a0 +SIZE (cf887180a0e3.patch) = 4191 Index: head/devel/intel-graphics-compiler/files/patch-clang =================================================================== --- head/devel/intel-graphics-compiler/files/patch-clang (revision 556859) +++ head/devel/intel-graphics-compiler/files/patch-clang (nonexistent) @@ -1,20 +0,0 @@ -Regressed by http://github.com/intel/intel-graphics-compiler/commit/d0874824631f - -IGC/VectorCompiler/lib/GenXCodeGen/GenXLowering.cpp:2601:12: error: reference to local binding 'IsSignedOps' declared in enclosing function '(anonymous namespace)::GenXLowering::lowerMulSat' - return IsSignedOps ? B.CreateSExt(Val, MulType, Val->getName() + ".sext") - ^ -IGC/VectorCompiler/lib/GenXCodeGen/GenXLowering.cpp:2581:22: note: 'IsSignedOps' declared here - auto [IsSignedRes, IsSignedOps] = IsSignedMulSat(IntrinsicID); - ^ - ---- IGC/VectorCompiler/lib/GenXCodeGen/GenXLowering.cpp.orig 2020-10-30 09:08:26 UTC -+++ IGC/VectorCompiler/lib/GenXCodeGen/GenXLowering.cpp -@@ -2597,7 +2597,7 @@ bool GenXLowering::lowerMulSat(CallInst *CI, unsigned - IGCLLVM::FixedVectorType::get(MulType, cast(OpType)->getNumElements()); - - IRBuilder<> B(CI); -- auto ExtendMulOperand = [&](Value *Val) { -+ auto ExtendMulOperand = [&, IsSignedOps=IsSignedOps](Value *Val) { - return IsSignedOps ? B.CreateSExt(Val, MulType, Val->getName() + ".sext") - : B.CreateZExt(Val, MulType, Val->getName() + ".zext"); - }; Property changes on: head/devel/intel-graphics-compiler/files/patch-clang ___________________________________________________________________ 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