diff --git a/devel/ispc/Makefile b/devel/ispc/Makefile index 00b0b716254b..8bcfa95a296a 100644 --- a/devel/ispc/Makefile +++ b/devel/ispc/Makefile @@ -1,53 +1,77 @@ # Created by: Yuri Victorovich PORTNAME= ispc DISTVERSIONPREFIX= v DISTVERSION= 1.16.1 +PORTREVISION= 1 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= Intel's compiler for high-performance SIMD programming LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE.txt ONLY_FOR_ARCHS= aarch64 amd64 i386 ONLY_FOR_ARCHS_REASON= only available for these architectures BUILD_DEPENDS= ${LOCALBASE}/bin/flex:textproc/flex \ m4:devel/m4 LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_VERSION} USES= bison cmake compiler:c++14-lang python:build,test shebangfix USE_GITHUB= yes SHEBANG_FILES= *.py #LLVM_VERSION= -devel # fails with 12: call to non-static member function without an object argument: llvm::DebugLoc::get # Release notes https://github.com/ispc/ispc/blob/master/docs/ReleaseNotes.txt list compatible LLVM versions, but they assume that extra patches are applied to LLVM # LLVM build script: https://github.com/ispc/ispc/blob/master/scripts/build.sh LLVM_VERSION= 11 # it fails with -devel (13.0.d20210308), with 12.0.0.r2 it also fails, using 11 that it succeeds with CONFIGURE_ENV= PATH=${LOCALBASE}/llvm${LLVM_VERSION}/bin:${PATH} CMAKE_OFF= ISPC_NO_DUMPS ISPC_INCLUDE_EXAMPLES BINARY_ALIAS= flex=${LOCALBASE}/bin/flex python=${PYTHON_CMD} m4=${LOCALBASE}/bin/gm4 PLIST_FILES= bin/ispc \ bin/check_isa +OPTIONS_DEFINE_amd64= GENX +OPTIONS_DEFAULT_amd64= GENX + +GENX_DESC= Intel GPU 8/16-wide SIMD support +GENX_BUILD_DEPENDS= ${LOCALBASE}/llvm${LLVM_VERSION}/lib/libLLVMGenXIntrinsics.a:devel/vc-intrinsics@llvm${LLVM_VERSION} +GENX_LIB_DEPENDS= libze_loader.so:devel/level-zero \ + libLLVMSPIRVLib.so.${LLVM_VERSION}:devel/spirv-llvm-translator@llvm${LLVM_VERSION} +GENX_CMAKE_BOOL= GENX_ENABLED +GENX_CMAKE_BOOL_OFF= ISPCRT_BUILD_TESTS +GENX_CMAKE_ON= -DGENX_DEPS_DIR:PATH="${LOCALBASE}/llvm${LLVM_VERSION}" +GENX_PLIST_FILES= include/ispcrt/ispcrt.h \ + include/ispcrt/ispcrt.hpp \ + include/ispcrt/ispcrt.isph \ + lib/cmake/ispcrt-${PORTVERSION}/Findlevel_zero.cmake \ + lib/cmake/ispcrt-${PORTVERSION}/ispc.cmake \ + lib/cmake/ispcrt-${PORTVERSION}/ispcrtConfig.cmake \ + lib/cmake/ispcrt-${PORTVERSION}/ispcrt_Exports-%%CMAKE_BUILD_TYPE%%.cmake \ + lib/cmake/ispcrt-${PORTVERSION}/ispcrt_Exports.cmake \ + lib/libispcrt.so \ + lib/libispcrt.so.1 \ + lib/libispcrt.so.${PORTVERSION} \ + lib/libispcrt_static.a + do-test: # some tests fail: https://github.com/ispc/ispc/issues/1868 @cd ${WRKSRC} && ISPC_HOME=${BUILD_WRKSRC}/bin ./run_tests.py test-check-all: # the upstream claims that some of these checks are broken without using their patched llvm version, hence using llvm-devel @cd ${BUILD_WRKSRC} && ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} check-all run-examples: build @[ -f ${LOCALBASE}/lib/libtbb.so ] || ! echo "ERROR run-examples target requires devel/tbb package installed" .for e in simple sort mandelbrot stencil @cd ${WRKSRC}/examples/${e} && \ ${ECHO} "===> Running example ${e}" && \ ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} && \ ./${e} .endfor .include diff --git a/devel/ispc/files/patch-cmake_GenerateBuiltins.cmake b/devel/ispc/files/patch-cmake_GenerateBuiltins.cmake new file mode 100644 index 000000000000..e541332c18f1 --- /dev/null +++ b/devel/ispc/files/patch-cmake_GenerateBuiltins.cmake @@ -0,0 +1,11 @@ +--- cmake/GenerateBuiltins.cmake.orig 2021-07-15 23:04:31 UTC ++++ cmake/GenerateBuiltins.cmake +@@ -289,6 +289,8 @@ function(builtin_genx_to_cpp bit resultFileName) + set(os_name "windows") + elseif (APPLE) + set(SKIP ON) ++ elseif (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD") ++ set(os_name "freebsd") + else () + set(os_name "linux") + endif() diff --git a/devel/ispc/files/patch-src_ispc.cpp b/devel/ispc/files/patch-src_ispc.cpp new file mode 100644 index 000000000000..e06e096d9b80 --- /dev/null +++ b/devel/ispc/files/patch-src_ispc.cpp @@ -0,0 +1,25 @@ +--- src/ispc.cpp.orig 2021-07-15 23:04:31 UTC ++++ src/ispc.cpp +@@ -1464,10 +1464,22 @@ std::string Target::GetTripleString() const { + triple.setArchName("armv7"); + } else if (m_arch == Arch::aarch64) { + triple.setArchName("aarch64"); ++ } else if (m_arch == Arch::genx32) { ++ triple.setArchName("spir"); ++ } else if (m_arch == Arch::genx64) { ++ triple.setArchName("spir64"); + } else { + Error(SourcePos(), "Unknown arch."); + exit(1); + } ++#ifdef ISPC_GENX_ENABLED ++ if (m_arch == Arch::genx32 || m_arch == Arch::genx64) { ++ //"spir64-unknown-unknown" ++ triple.setVendor(llvm::Triple::VendorType::UnknownVendor); ++ triple.setOS(llvm::Triple::OSType::UnknownOS); ++ return triple.str(); ++ } ++#endif + triple.setVendor(llvm::Triple::VendorType::UnknownVendor); + triple.setOS(llvm::Triple::OSType::FreeBSD); + break; diff --git a/devel/ispc/files/patch-src_module.cpp b/devel/ispc/files/patch-src_module.cpp new file mode 100644 index 000000000000..987c2fcb2fd6 --- /dev/null +++ b/devel/ispc/files/patch-src_module.cpp @@ -0,0 +1,20 @@ +--- src/module.cpp.orig 2021-07-15 23:04:31 UTC ++++ src/module.cpp +@@ -102,7 +102,7 @@ + #define OCLOC_LIBRARY_NAME "ocloc64.dll" + #elif defined(_WIN32) + #define OCLOC_LIBRARY_NAME "ocloc32.dll" +-#elif defined(__linux__) ++#elif defined(__linux__) || defined(__FreeBSD__) + #define OCLOC_LIBRARY_NAME "libocloc.so" + #else + #error "Unexpected platform" +@@ -1149,7 +1149,7 @@ bool Module::translateToSPIRV(llvm::Module *module, st + llvm::cl::desc("Allow DWARF operations not listed in the OpenCL.DebugInfo.100 " + "specification (experimental, may produce incompatible SPIR-V " + "module)")); +-#if ISPC_LLVM_VERSION < ISPC_LLVM_12_0 ++#if ISPC_LLVM_VERSION >= ISPC_LLVM_13_0 + Opts.setSPIRVAllowUnknownIntrinsics({"llvm.genx"}); + #else + llvm::cl::opt SPIRVAllowUnknownIntrinsics(