Date: Wed, 24 Apr 2019 06:14:44 +0000 (UTC) From: Yuri Victorovich <yuri@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r499815 - in head/devel/ispc: . files Message-ID: <201904240614.x3O6EiIZ014996@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: yuri Date: Wed Apr 24 06:14:43 2019 New Revision: 499815 URL: https://svnweb.freebsd.org/changeset/ports/499815 Log: devel/ispc: Update 1.10.0 -> 1.11.0 The project switched to cmake. Added: head/devel/ispc/files/patch-src_ispc.h (contents, props changed) head/devel/ispc/files/patch-src_util.cpp (contents, props changed) Deleted: head/devel/ispc/files/patch-Makefile head/devel/ispc/files/patch-examples_common.mk Modified: head/devel/ispc/Makefile head/devel/ispc/distinfo head/devel/ispc/files/patch-examples_tasksys.cpp head/devel/ispc/files/patch-src_llvmutil.cpp head/devel/ispc/files/patch-src_opt.cpp Modified: head/devel/ispc/Makefile ============================================================================== --- head/devel/ispc/Makefile Wed Apr 24 06:08:30 2019 (r499814) +++ head/devel/ispc/Makefile Wed Apr 24 06:14:43 2019 (r499815) @@ -3,8 +3,7 @@ PORTNAME= ispc DISTVERSIONPREFIX= v -DISTVERSION= 1.10.0 -PORTREVISION= 2 +DISTVERSION= 1.11.0 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org @@ -18,29 +17,19 @@ ONLY_FOR_ARCHS_REASON= only available for x86 architec LIB_DEPENDS= libLLVM.so:devel/llvm${LLVM_DEFAULT} -USES= bison gmake python:build shebangfix +USES= bison cmake python:build shebangfix USE_GITHUB= yes - -ALL_TARGET= default -MAKE_ENV= LLVM_HOME="${LOCALBASE}" SHEBANG_FILES= *.py -MAKE_ARGS= LLVM_CONFIG=${LOCALBASE}/bin/llvm-config${LLVM_DEFAULT} \ - CLANG=clang${LLVM_DEFAULT} CXX=clang++${LLVM_DEFAULT} +CONFIGURE_ENV= PATH=${LOCALBASE}/llvm${LLVM_DEFAULT}/bin:${PATH} +CMAKE_OFF= ISPC_INCLUDE_EXAMPLES -PLIST_FILES= bin/ispc +BINARY_ALIAS= python=${PYTHON_CMD} -post-patch: - @${REINPLACE_CMD} -e 's|python|${PYTHON_CMD}| ; s|@$$(C|$$(C|' \ - ${WRKSRC}/Makefile - @${REINPLACE_CMD} -e '/alloca\.h/d' ${WRKSRC}/src/util.cpp - @${REINPLACE_CMD} -e '/^LLVM_LIBS=/s|$$| -lexecinfo|' \ - ${WRKSRC}/Makefile +PLIST_FILES= bin/ispc \ + bin/check_isa -do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/ispc ${STAGEDIR}${PREFIX}/bin - -do-test: +do-test: # tests are broken with python-3.6 @cd ${WRKSRC} && ISPC_HOME=${WRKSRC} ./run_tests.py run-examples: Modified: head/devel/ispc/distinfo ============================================================================== --- head/devel/ispc/distinfo Wed Apr 24 06:08:30 2019 (r499814) +++ head/devel/ispc/distinfo Wed Apr 24 06:14:43 2019 (r499815) @@ -1,3 +1,3 @@ -TIMESTAMP = 1548912339 -SHA256 (ispc-ispc-v1.10.0_GH0.tar.gz) = 0aa30e989f8d446b2680c9078d5c5db70634f40b9aa07db387aa35aa08dd0b81 -SIZE (ispc-ispc-v1.10.0_GH0.tar.gz) = 19358558 +TIMESTAMP = 1555776188 +SHA256 (ispc-ispc-v1.11.0_GH0.tar.gz) = f48ef6e8a1fe5ad4fca691583bf7419f4dce1596e7ed850ff99cc017f8711b2f +SIZE (ispc-ispc-v1.11.0_GH0.tar.gz) = 19369955 Modified: head/devel/ispc/files/patch-examples_tasksys.cpp ============================================================================== --- head/devel/ispc/files/patch-examples_tasksys.cpp Wed Apr 24 06:08:30 2019 (r499814) +++ head/devel/ispc/files/patch-examples_tasksys.cpp Wed Apr 24 06:14:43 2019 (r499815) @@ -1,11 +1,20 @@ ---- examples/tasksys.cpp.orig 2016-07-08 11:13:52 UTC +--- examples/tasksys.cpp.orig 2019-04-20 16:09:47 UTC +++ examples/tasksys.cpp -@@ -90,6 +90,8 @@ - #define ISPC_USE_CONCRT - #elif defined(__linux__) - #define ISPC_USE_PTHREADS -+ #elif defined(__FreeBSD__) -+ #define ISPC_USE_TBB_TASK_GROUP // ISPC_USE_PTHREADS fails for some reason, need to investigate - #elif defined(__APPLE__) - #define ISPC_USE_GCD - #endif +@@ -88,6 +88,8 @@ + #define ISPC_USE_CONCRT + #elif defined(__linux__) + #define ISPC_USE_PTHREADS ++#elif defined(__FreeBSD__) ++#define ISPC_USE_TBB_TASK_GROUP // ISPC_USE_PTHREADS fails for some reason, need to investigate + #elif defined(__APPLE__) + #define ISPC_USE_GCD + #endif +@@ -101,6 +103,8 @@ + #define ISPC_IS_WINDOWS + #elif defined(__linux__) + #define ISPC_IS_LINUX ++#elif defined(__FreeBSD__) ++#define ISPC_IS_FREEBSD + #elif defined(__APPLE__) + #define ISPC_IS_APPLE + #endif Added: head/devel/ispc/files/patch-src_ispc.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ispc/files/patch-src_ispc.h Wed Apr 24 06:14:43 2019 (r499815) @@ -0,0 +1,11 @@ +--- src/ispc.h.orig 2019-04-20 16:38:55 UTC ++++ src/ispc.h +@@ -48,6 +48,8 @@ + #define ISPC_IS_WINDOWS + #elif defined(__linux__) + #define ISPC_IS_LINUX ++#elif defined(__FreeBSD__) ++#define ISPC_IS_FREEBSD + #elif defined(__APPLE__) + #define ISPC_IS_APPLE + #endif Modified: head/devel/ispc/files/patch-src_llvmutil.cpp ============================================================================== --- head/devel/ispc/files/patch-src_llvmutil.cpp Wed Apr 24 06:08:30 2019 (r499814) +++ head/devel/ispc/files/patch-src_llvmutil.cpp Wed Apr 24 06:14:43 2019 (r499815) @@ -1,8 +1,9 @@ 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 -@@ -1550,7 +1550,7 @@ lDumpValue(llvm::Value *v, std::set<llvm +@@ -1349,7 +1349,7 @@ static void lDumpValue(llvm::Value *v, s return; fprintf(stderr, " "); Modified: head/devel/ispc/files/patch-src_opt.cpp ============================================================================== --- head/devel/ispc/files/patch-src_opt.cpp Wed Apr 24 06:08:30 2019 (r499814) +++ head/devel/ispc/files/patch-src_opt.cpp Wed Apr 24 06:14:43 2019 (r499815) @@ -1,45 +1,61 @@ 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 -@@ -173,7 +173,7 @@ static llvm::Pass *CreatePromoteLocalToP - strlen(getenv("FUNC"))))) { \ - fprintf(stderr, "Start of " NAME "\n"); \ - fprintf(stderr, "---------------\n"); \ -- bb.dump(); \ -+ /*bb.dump();*/ \ - fprintf(stderr, "---------------\n\n"); \ +@@ -175,7 +175,7 @@ static llvm::Pass *CreatePromoteLocalToP + 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 */ -@@ -184,7 +184,7 @@ static llvm::Pass *CreatePromoteLocalToP - strlen(getenv("FUNC"))))) { \ - fprintf(stderr, "End of " NAME " %s\n", modifiedAny ? "** CHANGES **" : ""); \ - fprintf(stderr, "---------------\n"); \ -- bb.dump(); \ -+ /*bb.dump();*/ \ - fprintf(stderr, "---------------\n\n"); \ +@@ -185,7 +185,7 @@ static llvm::Pass *CreatePromoteLocalToP + 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 */ - -@@ -537,7 +537,7 @@ void - Optimize(llvm::Module *module, int optLevel) { + #else +@@ -505,7 +505,7 @@ void Optimize(llvm::Module *module, int + #ifndef ISPC_NO_DUMPS if (g->debugPrint) { printf("*** Code going into optimization ***\n"); - module->dump(); + //module->dump(); } + #endif DebugPassManager optPM; - optPM.add(llvm::createVerifierPass(),0); -@@ -932,7 +932,7 @@ Optimize(llvm::Module *module, int optLe - +@@ -892,7 +892,7 @@ void Optimize(llvm::Module *module, int + #ifndef ISPC_NO_DUMPS if (g->debugPrint) { printf("\n*****\nFINAL OUTPUT\n*****\n"); - module->dump(); + //module->dump(); } - + #endif } -@@ -4895,7 +4895,7 @@ bool - DebugPass::runOnModule(llvm::Module &module) { +@@ -1944,11 +1944,11 @@ lExtractUniformsFromOffset(llvm::Value * + 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; + bool DebugPass::runOnModule(llvm::Module &module) { fprintf(stderr, "%s", str_output); fflush(stderr); - module.dump(); Added: head/devel/ispc/files/patch-src_util.cpp ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/devel/ispc/files/patch-src_util.cpp Wed Apr 24 06:14:43 2019 (r499815) @@ -0,0 +1,12 @@ +--- src/util.cpp.orig 2019-04-20 16:26:13 UTC ++++ src/util.cpp +@@ -43,7 +43,9 @@ + #include <malloc.h> // for alloca() + #endif + #else ++#if !defined(ISPC_IS_FREEBSD) + #include <alloca.h> ++#endif + #include <unistd.h> + #endif + #include <stdio.h>
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201904240614.x3O6EiIZ014996>