diff --git a/devel/lace/Makefile b/devel/lace/Makefile index ca5a764dae84..7851b1b56fac 100644 --- a/devel/lace/Makefile +++ b/devel/lace/Makefile @@ -1,35 +1,37 @@ PORTNAME= lace DISTVERSIONPREFIX= v -DISTVERSION= 2.0.2 -PORTREVISION= 1 +DISTVERSION= 2.2.1 CATEGORIES= devel PKGNAMESUFFIX= -work-stealing MAINTAINER= yuri@FreeBSD.org COMMENT= Implementation of work-stealing in C WWW= https://github.com/trolando/lace LICENSE= APACHE20 LICENSE_FILE= ${WRKSRC}/LICENSE BROKEN_armv7= compilation fails: error: static assertion failed due to requirement '(sizeof(struct _lace_task) % 64) == 0': lace_task size should be a multiple of LACE_CACHE_LINE_SIZE BROKEN_i386= compilation fails: error: static assertion failed due to requirement '(sizeof(struct _lace_task) % 64) == 0': lace_task size should be a multiple of LACE_CACHE_LINE_SIZE USES= cmake:testing USE_GITHUB= yes GH_ACCOUNT= trolando CMAKE_ON= BUILD_SHARED_LIBS -CMAKE_OFF= LACE_BUILD_TESTS +CMAKE_OFF= LACE_BUILD_TESTS \ + LACE_NATIVE_OPT CMAKE_TESTING_ON= LACE_BUILD_TESTS +CFLAGS+= -fPIC + PORTSCOUT= limit:^.*[0-9]+\.[0-9]+\.[0-9]+$$ # prevent tags like mucocos_2014_ri pre-configure: # see discussion in https://github.com/trolando/lace/issues/16 @${REINPLACE_CMD} -e 's,memory_order_[[:alnum:]_]*,memory_order_seq_cst,g' \ ${WRKSRC}/src/*.[ch] ${WRKSRC}/src/lace.sh -# tests as of 2.0.2: 100% tests passed, 0 tests failed out of 2 +# tests as of 2.2.1: 100% tests passed, 0 tests failed out of 3 .include diff --git a/devel/lace/distinfo b/devel/lace/distinfo index b3fa7aacf4d4..eeb59ff90620 100644 --- a/devel/lace/distinfo +++ b/devel/lace/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1754112927 -SHA256 (trolando-lace-v2.0.2_GH0.tar.gz) = 416d8397f95646778d9ed7e044b699bb3db49c41f843352d2681d9c44db3f44e -SIZE (trolando-lace-v2.0.2_GH0.tar.gz) = 145602 +TIMESTAMP = 1772864520 +SHA256 (trolando-lace-v2.2.1_GH0.tar.gz) = 1c36475c422f98fe7d4efcd6113c4a897f83cd187dbccd888803ab1bd64175d1 +SIZE (trolando-lace-v2.2.1_GH0.tar.gz) = 191191 diff --git a/devel/lace/files/patch-CMakeLists.txt b/devel/lace/files/patch-CMakeLists.txt index 0df89b0ef40c..b3d5e17315f8 100644 --- a/devel/lace/files/patch-CMakeLists.txt +++ b/devel/lace/files/patch-CMakeLists.txt @@ -1,34 +1,19 @@ ---- CMakeLists.txt.orig 2023-11-18 14:52:47 UTC +--- CMakeLists.txt.orig 2026-03-06 23:32:42 UTC +++ CMakeLists.txt -@@ -25,11 +25,11 @@ endif() +@@ -91,7 +91,7 @@ foreach(_target lace lace32 lace128) + set(_src ${CMAKE_CURRENT_SOURCE_DIR}/src/lace128.c ${CMAKE_CURRENT_SOURCE_DIR}/src/lace128.h) endif() - endif() --add_library(lace STATIC -+add_library(lace - ${CMAKE_CURRENT_SOURCE_DIR}/src/lace.c - ${CMAKE_CURRENT_SOURCE_DIR}/src/lace.h - ) --add_library(lace14 STATIC -+add_library(lace14 - ${CMAKE_CURRENT_SOURCE_DIR}/src/lace14.c - ${CMAKE_CURRENT_SOURCE_DIR}/src/lace14.h - ) -@@ -56,7 +56,7 @@ target_compile_options(lace PRIVATE +- add_library(${_target} STATIC ${_src}) ++ add_library(${_target} ${_src}) + add_library(lace::${_target} ALIAS ${_target}) - target_compile_options(lace PRIVATE - $<$,$>: -- -pipe -march=native -+ -pipe - $<$:-O0 -Wall -Wextra -Wpedantic>> - $<$: - $<$:/Od /Wall /Zi>> -@@ -64,7 +64,7 @@ target_compile_options(lace14 PRIVATE - - target_compile_options(lace14 PRIVATE - $<$,$>: -- -pipe -march=native -+ -pipe - $<$:-O0 -Wall -Wextra -Wpedantic>> - $<$: - $<$:/Od /Wall /Zi>> + target_compile_features(${_target} PUBLIC c_std_11) +@@ -109,7 +109,6 @@ foreach(_target lace lace32 lace128) + target_compile_options(${_target} PRIVATE + -pipe + $<$:-O0 -Wall -Wextra -Wpedantic> +- $<$:-march=native> + ) + elseif(MSVC) + target_compile_options(${_target} PUBLIC diff --git a/devel/lace/files/patch-benchmarks_CMakeLists.txt b/devel/lace/files/patch-benchmarks_CMakeLists.txt index 00392a29fc02..13c15d3a2ce7 100644 --- a/devel/lace/files/patch-benchmarks_CMakeLists.txt +++ b/devel/lace/files/patch-benchmarks_CMakeLists.txt @@ -1,11 +1,10 @@ ---- benchmarks/CMakeLists.txt.orig 2025-08-06 15:18:26 UTC +--- benchmarks/CMakeLists.txt.orig 2026-03-06 23:32:42 UTC +++ benchmarks/CMakeLists.txt -@@ -4,7 +4,7 @@ macro(set_compilation_settings NAME) - target_compile_features(${NAME} PRIVATE c_std_11 cxx_std_11) - target_compile_options(${NAME} PRIVATE - $<$,$>: -- -pipe -march=native -Wall -Wextra -Wpedantic -Wno-deprecated> -+ -pipe -Wall -Wextra -Wpedantic -Wno-deprecated> - $<$: /W4> - ) - if (CMAKE_BUILD_TYPE STREQUAL "Release") +@@ -7,7 +7,6 @@ macro(set_compilation_settings NAME) + if(CMAKE_C_COMPILER_ID MATCHES "Clang|GNU") + target_compile_options(${NAME} PRIVATE + -pipe -Wall -Wextra -Wpedantic -Wno-deprecated +- $<$:-march=native> + ) + endif() + diff --git a/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c b/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c index 5a47f1622ae4..08ba81f978b7 100644 --- a/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c +++ b/devel/lace/files/patch-benchmarks_cilksort_cilksort-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/cilksort/cilksort-lace.c.orig 2025-05-23 10:54:43 UTC +--- benchmarks/cilksort/cilksort-lace.c.orig 2026-03-06 23:32:42 UTC +++ benchmarks/cilksort/cilksort-lace.c -@@ -438,7 +438,7 @@ int main(int argc, char *argv[]) +@@ -434,7 +434,7 @@ int main(int argc, char *argv[]) int workers = 1; int dqsize = 100000; -- char c; -+ signed char c; +- int c; ++ signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_dfs_dfs-lace.c b/devel/lace/files/patch-benchmarks_dfs_dfs-lace.c index 709bb4a901de..ca5cfff947bf 100644 --- a/devel/lace/files/patch-benchmarks_dfs_dfs-lace.c +++ b/devel/lace/files/patch-benchmarks_dfs_dfs-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/dfs/dfs-lace.c.orig 2025-05-23 10:54:05 UTC +--- benchmarks/dfs/dfs-lace.c.orig 2026-03-06 23:32:42 UTC +++ benchmarks/dfs/dfs-lace.c -@@ -50,7 +50,7 @@ int main(int argc, char **argv) +@@ -45,7 +45,7 @@ int main(int argc, char **argv) int workers = 1; int dqsize = 100000; -- char c; -+ signed char c; +- int c; ++ signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_fib_fib-lace.c b/devel/lace/files/patch-benchmarks_fib_fib-lace.c index 705fff75ccfa..644eb1883494 100644 --- a/devel/lace/files/patch-benchmarks_fib_fib-lace.c +++ b/devel/lace/files/patch-benchmarks_fib_fib-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/fib/fib-lace.c.orig 2025-05-23 10:55:18 UTC +--- benchmarks/fib/fib-lace.c.orig 2026-03-06 23:32:42 UTC +++ benchmarks/fib/fib-lace.c -@@ -34,7 +34,7 @@ int main(int argc, char **argv) +@@ -28,7 +28,7 @@ int main(int argc, char **argv) int workers = 1; int dqsize = 100000; -- char c; -+ signed char c; +- int c; ++ signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_fib_fib-lace.cpp b/devel/lace/files/patch-benchmarks_fib_fib-lace.cpp index b288f60b8ec9..c62db2d4d9c0 100644 --- a/devel/lace/files/patch-benchmarks_fib_fib-lace.cpp +++ b/devel/lace/files/patch-benchmarks_fib_fib-lace.cpp @@ -1,11 +1,11 @@ ---- benchmarks/fib/fib-lace.cpp.orig 2025-05-23 10:53:18 UTC +--- benchmarks/fib/fib-lace.cpp.orig 2026-03-06 23:32:42 UTC +++ benchmarks/fib/fib-lace.cpp -@@ -35,7 +35,7 @@ int main(int argc, char **argv) +@@ -29,7 +29,7 @@ int main(int argc, char **argv) int workers = 1; int dqsize = 100000; -- char c; -+ signed char c; +- int c; ++ signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_knapsack_knapsack-lace.c b/devel/lace/files/patch-benchmarks_knapsack_knapsack-lace.c index 26a2489b4bab..481206dd4dc1 100644 --- a/devel/lace/files/patch-benchmarks_knapsack_knapsack-lace.c +++ b/devel/lace/files/patch-benchmarks_knapsack_knapsack-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/knapsack/knapsack-lace.c.orig 2025-05-23 10:56:00 UTC +--- benchmarks/knapsack/knapsack-lace.c.orig 2026-03-06 23:32:42 UTC +++ benchmarks/knapsack/knapsack-lace.c -@@ -119,7 +119,7 @@ int main(int argc, char *argv[]) +@@ -188,7 +188,7 @@ int main(int argc, char *argv[]) int workers = 1; int dqsize = 100000; -- char c; -+ signed char c; +- int c; ++ signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_matmul_matmul-lace.c b/devel/lace/files/patch-benchmarks_matmul_matmul-lace.c index 7036a56448ed..4ed8b1c8f792 100644 --- a/devel/lace/files/patch-benchmarks_matmul_matmul-lace.c +++ b/devel/lace/files/patch-benchmarks_matmul_matmul-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/matmul/matmul-lace.c.orig 2025-05-23 10:56:19 UTC +--- benchmarks/matmul/matmul-lace.c.orig 2026-03-06 23:32:42 UTC +++ benchmarks/matmul/matmul-lace.c -@@ -121,7 +121,7 @@ int main(int argc, char *argv[]) +@@ -115,7 +115,7 @@ int main(int argc, char *argv[]) int workers = 1; int dqsize = 100000; -- char c; -+ signed char c; +- int c; ++ signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_matmul_matmul-seq.c b/devel/lace/files/patch-benchmarks_matmul_matmul-seq.c index 6159bc215087..685b14b44a27 100644 --- a/devel/lace/files/patch-benchmarks_matmul_matmul-seq.c +++ b/devel/lace/files/patch-benchmarks_matmul_matmul-seq.c @@ -1,11 +1,11 @@ ---- benchmarks/matmul/matmul-seq.c.orig 2025-05-23 10:55:39 UTC +--- benchmarks/matmul/matmul-seq.c.orig 2026-03-06 23:32:42 UTC +++ benchmarks/matmul/matmul-seq.c -@@ -114,7 +114,7 @@ int main(int argc, char *argv[]) +@@ -107,7 +107,7 @@ int main(int argc, char *argv[]) int main(int argc, char *argv[]) { -- char c; -+ signed char c; +- int c; ++ signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'h': diff --git a/devel/lace/files/patch-benchmarks_pi_pi-lace.c b/devel/lace/files/patch-benchmarks_pi_pi-lace.c index f1d66022fbfa..20fa39d79832 100644 --- a/devel/lace/files/patch-benchmarks_pi_pi-lace.c +++ b/devel/lace/files/patch-benchmarks_pi_pi-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/pi/pi-lace.c.orig 2025-05-23 10:54:23 UTC +--- benchmarks/pi/pi-lace.c.orig 2026-03-06 23:32:42 UTC +++ benchmarks/pi/pi-lace.c -@@ -55,7 +55,7 @@ int main(int argc, char **argv) +@@ -53,7 +53,7 @@ int main(int argc, char **argv) int workers = 0; int dqsize = 1000000; -- char c; -+ signed char c; +- int c; ++ signed int c; while ((c=getopt(argc, argv, "w:q:h")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/files/patch-benchmarks_strassen_strassen-lace.c b/devel/lace/files/patch-benchmarks_strassen_strassen-lace.c index eb4f69cb841a..5a19246352b9 100644 --- a/devel/lace/files/patch-benchmarks_strassen_strassen-lace.c +++ b/devel/lace/files/patch-benchmarks_strassen_strassen-lace.c @@ -1,11 +1,11 @@ ---- benchmarks/strassen/strassen-lace.c.orig 2025-05-23 10:55:02 UTC +--- benchmarks/strassen/strassen-lace.c.orig 2026-03-06 23:32:42 UTC +++ benchmarks/strassen/strassen-lace.c -@@ -718,7 +718,7 @@ int main(int argc, char *argv[]) - int dqsize = 100000; +@@ -706,7 +706,7 @@ int main(int argc, char *argv[]) int verify = 0; + int n = 4096; -- char c; -+ signed char c; +- int c; ++ signed int c; while ((c=getopt(argc, argv, "w:q:h:c")) != -1) { switch (c) { case 'w': diff --git a/devel/lace/pkg-plist b/devel/lace/pkg-plist index 6b1ab64e5d57..7c5e5339d0cc 100644 --- a/devel/lace/pkg-plist +++ b/devel/lace/pkg-plist @@ -1,11 +1,14 @@ include/lace.h -include/lace14.h +include/lace128.h +include/lace32.h include/lace_config.h lib/cmake/lace/lace-config-version.cmake lib/cmake/lace/lace-config.cmake lib/cmake/lace/lace-targets-%%CMAKE_BUILD_TYPE%%.cmake lib/cmake/lace/lace-targets.cmake lib/liblace.so -lib/liblace14.so +lib/liblace128.so +lib/liblace32.so libdata/pkgconfig/lace.pc -libdata/pkgconfig/lace14.pc +libdata/pkgconfig/lace128.pc +libdata/pkgconfig/lace32.pc