Index: head/devel/ispc/Makefile =================================================================== --- head/devel/ispc/Makefile (revision 524235) +++ head/devel/ispc/Makefile (revision 524236) @@ -1,51 +1,52 @@ # Created by: Yuri Victorovich # $FreeBSD$ PORTNAME= ispc DISTVERSIONPREFIX= v -DISTVERSION= 1.11.0 -PORTREVISION= 2 +DISTVERSION= 1.12.0-116 +DISTVERSIONSUFFIX= -g98cd1326 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= amd64 i386 ONLY_FOR_ARCHS_REASON= only available for x86 architectures +BUILD_DEPENDS= m4:devel/m4 LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_DEFAULT} -USES= bison cmake python:build shebangfix +USES= bison cmake compiler:c++14-lang python:build shebangfix USE_GITHUB= yes SHEBANG_FILES= *.py CONFIGURE_ENV= PATH=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin:${PATH} CMAKE_OFF= ISPC_INCLUDE_EXAMPLES -BINARY_ALIAS= python=${PYTHON_CMD} +BINARY_ALIAS= python=${PYTHON_CMD} m4=${LOCALBASE}/bin/gm4 PLIST_FILES= bin/ispc \ bin/check_isa do-test: # tests are broken with python-3.6 @cd ${WRKSRC} && ISPC_HOME=${WRKSRC} ./run_tests.py run-examples: @[ -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 -.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 -LLVM_DEFAULT= 80 -.endif +#.if ${LLVM_DEFAULT:S,-devel,990,} >= 90 +#LLVM_DEFAULT= 80 +#.endif .include Index: head/devel/ispc/distinfo =================================================================== --- head/devel/ispc/distinfo (revision 524235) +++ head/devel/ispc/distinfo (revision 524236) @@ -1,3 +1,3 @@ -TIMESTAMP = 1555776188 -SHA256 (ispc-ispc-v1.11.0_GH0.tar.gz) = f48ef6e8a1fe5ad4fca691583bf7419f4dce1596e7ed850ff99cc017f8711b2f -SIZE (ispc-ispc-v1.11.0_GH0.tar.gz) = 19369955 +TIMESTAMP = 1580092092 +SHA256 (ispc-ispc-v1.12.0-116-g98cd1326_GH0.tar.gz) = 4fda17a161cac14e32667a1f5f6e1a10f504dbe6fa6e06872794d9df6996a649 +SIZE (ispc-ispc-v1.12.0-116-g98cd1326_GH0.tar.gz) = 19158442 Index: head/devel/ispc/files/patch-src_ispc.h =================================================================== --- head/devel/ispc/files/patch-src_ispc.h (revision 524235) +++ head/devel/ispc/files/patch-src_ispc.h (revision 524236) @@ -1,11 +1,11 @@ ---- src/ispc.h.orig 2019-04-20 16:38:55 UTC +--- src/ispc.h.orig 2020-01-25 02:15:35 UTC +++ src/ispc.h -@@ -48,6 +48,8 @@ - #define ISPC_IS_WINDOWS +@@ -49,6 +49,8 @@ + #define ISPC_HOST_IS_WINDOWS #elif defined(__linux__) - #define ISPC_IS_LINUX + #define ISPC_HOST_IS_LINUX +#elif defined(__FreeBSD__) -+#define ISPC_IS_FREEBSD ++#define ISPC_HOST_FREEBSD #elif defined(__APPLE__) - #define ISPC_IS_APPLE + #define ISPC_HOST_IS_APPLE #endif Index: head/devel/ispc/files/patch-src_llvmutil.cpp =================================================================== --- head/devel/ispc/files/patch-src_llvmutil.cpp (revision 524235) +++ head/devel/ispc/files/patch-src_llvmutil.cpp (revision 524236) @@ -1,14 +1,13 @@ ISPC devs insist on using dump() functions which LLVM devs consider a debug functionality, and it isn't available in the LLVM packages. ---- src/llvmutil.cpp.orig 2019-03-02 06:20:14 UTC ---- src/llvmutil.cpp.orig 2019-04-20 16:08:37 UTC +--- src/llvmutil.cpp.orig 2020-01-25 02:15:35 UTC +++ src/llvmutil.cpp -@@ -1349,7 +1349,7 @@ static void lDumpValue(llvm::Value *v, s +@@ -1344,7 +1344,7 @@ static void lDumpValue(llvm::Value *v, std::setdump(); + //v->dump(); done.insert(v); if (inst == NULL) Index: head/devel/ispc/files/patch-src_opt.cpp =================================================================== --- head/devel/ispc/files/patch-src_opt.cpp (revision 524235) +++ head/devel/ispc/files/patch-src_opt.cpp (revision 524236) @@ -1,65 +1,64 @@ ISPC devs insist on using dump() functions which LLVM devs consider a debug functionality, and it isn't available in the LLVM packages. ---- src/opt.cpp.orig 2019-03-02 06:22:00 UTC ---- src/opt.cpp.orig 2019-04-20 16:07:05 UTC +--- src/opt.cpp.orig 2020-01-25 02:15:35 UTC +++ src/opt.cpp -@@ -175,7 +175,7 @@ static llvm::Pass *CreatePromoteLocalToP +@@ -144,7 +144,7 @@ static llvm::Pass *CreateFixBooleanSelectPass(); getenv("FUNC"), strlen(getenv("FUNC")))))) { \ fprintf(stderr, "Start of " NAME "\n"); \ fprintf(stderr, "---------------\n"); \ - bb.dump(); \ + /*bb.dump();*/ \ fprintf(stderr, "---------------\n\n"); \ } else /* eat semicolon */ -@@ -185,7 +185,7 @@ static llvm::Pass *CreatePromoteLocalToP +@@ -154,7 +154,7 @@ static llvm::Pass *CreateFixBooleanSelectPass(); getenv("FUNC"), strlen(getenv("FUNC")))))) { \ fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \ fprintf(stderr, "---------------\n"); \ - bb.dump(); \ + /*bb.dump();*/ \ fprintf(stderr, "---------------\n\n"); \ } else /* eat semicolon */ #else -@@ -505,7 +505,7 @@ void Optimize(llvm::Module *module, int +@@ -442,7 +442,7 @@ void Optimize(llvm::Module *module, int optLevel) { #ifndef ISPC_NO_DUMPS if (g->debugPrint) { printf("*** Code going into optimization ***\n"); - module->dump(); + //module->dump(); } #endif DebugPassManager optPM; -@@ -892,7 +892,7 @@ void Optimize(llvm::Module *module, int +@@ -655,7 +655,7 @@ void Optimize(llvm::Module *module, int optLevel) { #ifndef ISPC_NO_DUMPS if (g->debugPrint) { printf("\n*****\nFINAL OUTPUT\n*****\n"); - module->dump(); + //module->dump(); } #endif } -@@ -1944,11 +1944,11 @@ lExtractUniformsFromOffset(llvm::Value * +@@ -1728,11 +1728,11 @@ lExtractUniformsFromOffset(llvm::Value **basePtr, llvm llvm::Value *offsetScale, llvm::Instruction *insertBefore) { #if 1 - (*basePtr)->dump(); + //(*basePtr)->dump(); printf("\n"); - (*offsetVector)->dump(); + //(*offsetVector)->dump(); printf("\n"); - offsetScale->dump(); + //offsetScale->dump(); printf("-----\n"); #endif -@@ -4394,7 +4394,7 @@ char DebugPass::ID = 0; +@@ -4217,7 +4217,7 @@ char DebugPass::ID = 0; bool DebugPass::runOnModule(llvm::Module &module) { fprintf(stderr, "%s", str_output); fflush(stderr); - module.dump(); + //module.dump(); return true; } Index: head/devel/ispc/files/patch-src_util.cpp =================================================================== --- head/devel/ispc/files/patch-src_util.cpp (revision 524235) +++ head/devel/ispc/files/patch-src_util.cpp (revision 524236) @@ -1,12 +1,11 @@ ---- src/util.cpp.orig 2019-04-20 16:26:13 UTC +--- src/util.cpp.orig 2020-01-25 02:15:35 UTC +++ src/util.cpp -@@ -43,7 +43,9 @@ - #include // for alloca() - #endif - #else -+#if !defined(ISPC_IS_FREEBSD) +@@ -41,6 +41,8 @@ + #ifdef ISPC_HOST_IS_LINUX #include -+#endif #include - #endif - #include ++#elif defined(ISPC_HOST_IS_FREEBSD) ++#include + #elif defined(ISPC_HOST_IS_WINDOWS) + #include + #include