Attachment #230330 for bug #260625

View | Details | Raw Unified | Return to bug 260625
Collapse All | Expand All




# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>

PORTNAME=	lzbench
PORTVERSION=	1.8.1
DISTVERSIONPREFIX=	v
DISTVERSION=	1.8.1
PORTREVISION=	1
CATEGORIES=	benchmarks

MAINTAINER=	danfe@FreeBSD.org
COMMENT=	In-memory benchmark of open-source LZ77/LZSS/LZMA compressors

BROKEN_riscv64=		fails to compile: invalid arch name 'native', string must begin with rv32{i,e,g} or rv64{i,g}

USES=		compiler:c11 gmake
USE_GITHUB=	yes
GH_ACCOUNT=	inikep

MAKE_ENV=	CFLAGS_O2="${CFLAGS}"

PLIST_FILES=	bin/lzbench
PORTDOCS=	NEWS README.md

OPTIONS_DEFINE=	DOCS
OPTIONS_DEFINE_amd64=	SSE
OPTIONS_DEFAULT_amd64=	SSE
SSE_MAKE_ARGS=		DONT_BUILD_LZSSE=0

post-patch:
	@${REINPLACE_CMD} -e '/PROGOS/s,Linux,${OPSYS},' \




--- Makefile.orig	2020-09-01 10:03:34 UTC
+++ Makefile
@@ -11,11 +11,7 @@ vpath wflz/wfLZ.h $(SOURCE_PATH)
 #BUILD_ARCH = 32-bit
 #BUILD_STATIC = 1
 
-ifeq ($(BUILD_ARCH),32-bit)
-	CODE_FLAGS += -m32
-	LDFLAGS += -m32
-	DONT_BUILD_LZSSE ?= 1
-endif
+DONT_BUILD_LZSSE ?= 1
 
 CC?=gcc
 
@@ -28,11 +24,6 @@ ifeq (1,$(filter 1,$(shell [ "$(COMPILER)" = "gcc" ] &
     DONT_BUILD_GLZA ?= 1
 endif
 
-# LZSSE requires compiler with __SSE4_1__ support and 64-bit CPU
-ifneq ($(shell echo|$(CC) -dM -E - -march=native|egrep -c '__(SSE4_1|x86_64)__'), 2)
-    DONT_BUILD_LZSSE ?= 1
-endif
-
 # zling requires c++14
 ifeq (1,$(filter 1,$(shell [ "$(COMPILER)" = "gcc" ] && expr $(GCC_VERSION) \< 60000) $(shell [ "$(COMPILER)" = "clang" ] && expr $(CLANG_VERSION) \< 60000)))
   DONT_BUILD_ZLING ?= 1
@@ -87,8 +78,8 @@ else
 	OPT_FLAGS_O3 = $(OPT_FLAGS) -O3 -DNDEBUG
 endif
 
-CFLAGS = $(MOREFLAGS) $(CODE_FLAGS) $(OPT_FLAGS_O3) $(DEFINES)
-CFLAGS_O2 = $(MOREFLAGS) $(CODE_FLAGS) $(OPT_FLAGS_O2) $(DEFINES)
+CFLAGS += $(MOREFLAGS) $(CODE_FLAGS) $(OPT_FLAGS_O3) $(DEFINES)
+CFLAGS_O2 += $(MOREFLAGS) $(CODE_FLAGS) $(OPT_FLAGS_O2) $(DEFINES)
 LDFLAGS += $(MOREFLAGS)
 
 

Added Link Here

(-)b/benchmarks/lzbench/files/patch-pithy_pithy.cpp (+11 lines)
1	--- pithy/pithy.cpp.orig 2021-12-22 21:22:04 UTC
2	+++ pithy/pithy.cpp
3	@@ -117,7 +117,7 @@ PITHY_STATIC_INLINE char pithy_EmitCopy(char o
4	#if defined(__arm__)
5
6	#if defined(__ARM_NEON__)
7	-#define pithy_Load64(_p) ((uint64_t)vld1_u64(_p))
8	+#define pithy_Load64(_p) ((uint64_t)vld1_u64((uint64_t*)_p))
9	#define pithy_Store64(_p, _val) vst1_u64(_p, (uint64x1_t)_val)
10	#else
11	#define PITHY_32BIT_MOVE64

Added Link Here

(-)b/benchmarks/lzbench/files/patch-tornado_Common.h (-1 / +11 lines)
0	-	1	--- tornado/Common.h.orig 2021-12-22 23:34:46 UTC
		2	+++ tornado/Common.h
		3	@@ -15,7 +15,7 @@
		4	#include <sys/types.h>
		5	#include <sys/stat.h>
		6
		7	-#if defined(_M_X64) \|\| defined(_M_AMD64) \|\| defined(__x86_64__) \|\| defined(_ARCH_PPC64) \|\| defined(__arm64__) \|\| defined(__aarch64__)
		8	+#if defined(_M_X64) \|\| defined(_M_AMD64) \|\| defined(__x86_64__) \|\| defined(_ARCH_PPC64) \|\| defined(__arm64__) \|\| defined(__aarch64__) \|\| __riscv_xlen == 64
		9	#define FREEARC_64BIT
		10	#endif
		11

Return to bug 260625

Lines 1-23 Link Here

(-)b/benchmarks/lzbench/Makefile (-3 / +7 lines)
1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>	1	# Created by: Alexey Dokuchaev <danfe@FreeBSD.org>
2		2
3	PORTNAME= lzbench	3	PORTNAME= lzbench
4	PORTVERSION= 1.8.1
5	DISTVERSIONPREFIX= v	4	DISTVERSIONPREFIX= v
		5	DISTVERSION= 1.8.1
		6	PORTREVISION= 1
6	CATEGORIES= benchmarks	7	CATEGORIES= benchmarks
7		8
8	MAINTAINER= danfe@FreeBSD.org	9	MAINTAINER= danfe@FreeBSD.org
9	COMMENT= In-memory benchmark of open-source LZ77/LZSS/LZMA compressors	10	COMMENT= In-memory benchmark of open-source LZ77/LZSS/LZMA compressors
10		11
11	BROKEN_riscv64= fails to compile: invalid arch name 'native', string must begin with rv32{i,e,g} or rv64{i,g}
12
13	USES= compiler:c11 gmake	12	USES= compiler:c11 gmake
14	USE_GITHUB= yes	13	USE_GITHUB= yes
15	GH_ACCOUNT= inikep	14	GH_ACCOUNT= inikep
16		15
		16	MAKE_ENV= CFLAGS_O2="${CFLAGS}"
		17
17	PLIST_FILES= bin/lzbench	18	PLIST_FILES= bin/lzbench
18	PORTDOCS= NEWS README.md	19	PORTDOCS= NEWS README.md
19		20
20	OPTIONS_DEFINE= DOCS	21	OPTIONS_DEFINE= DOCS
		22	OPTIONS_DEFINE_amd64= SSE
		23	OPTIONS_DEFAULT_amd64= SSE
		24	SSE_MAKE_ARGS= DONT_BUILD_LZSSE=0
21		25
22	post-patch:	26	post-patch:
23	@${REINPLACE_CMD} -e '/PROGOS/s,Linux,${OPSYS},' \	27	@${REINPLACE_CMD} -e '/PROGOS/s,Linux,${OPSYS},' \

Added Link Here

(-)b/benchmarks/lzbench/files/patch-Makefile (+38 lines)
1	--- Makefile.orig 2020-09-01 10:03:34 UTC
2	+++ Makefile
3	@@ -11,11 +11,7 @@ vpath wflz/wfLZ.h $(SOURCE_PATH)
4	#BUILD_ARCH = 32-bit
5	#BUILD_STATIC = 1
6
7	-ifeq ($(BUILD_ARCH),32-bit)
8	- CODE_FLAGS += -m32
9	- LDFLAGS += -m32
10	- DONT_BUILD_LZSSE ?= 1
11	-endif
12	+DONT_BUILD_LZSSE ?= 1
13
14	CC?=gcc
15
16	@@ -28,11 +24,6 @@ ifeq (1,$(filter 1,$(shell [ "$(COMPILER)" = "gcc" ] &
17	DONT_BUILD_GLZA ?= 1
18	endif
19
20	-# LZSSE requires compiler with __SSE4_1__ support and 64-bit CPU
21	-ifneq ($(shell echo\|$(CC) -dM -E - -march=native\|egrep -c '__(SSE4_1\|x86_64)__'), 2)
22	- DONT_BUILD_LZSSE ?= 1
23	-endif
24	-
25	# zling requires c++14
26	ifeq (1,$(filter 1,$(shell [ "$(COMPILER)" = "gcc" ] && expr $(GCC_VERSION) \< 60000) $(shell [ "$(COMPILER)" = "clang" ] && expr $(CLANG_VERSION) \< 60000)))
27	DONT_BUILD_ZLING ?= 1
28	@@ -87,8 +78,8 @@ else
29	OPT_FLAGS_O3 = $(OPT_FLAGS) -O3 -DNDEBUG
30	endif
31
32	-CFLAGS = $(MOREFLAGS) $(CODE_FLAGS) $(OPT_FLAGS_O3) $(DEFINES)
33	-CFLAGS_O2 = $(MOREFLAGS) $(CODE_FLAGS) $(OPT_FLAGS_O2) $(DEFINES)
34	+CFLAGS += $(MOREFLAGS) $(CODE_FLAGS) $(OPT_FLAGS_O3) $(DEFINES)
35	+CFLAGS_O2 += $(MOREFLAGS) $(CODE_FLAGS) $(OPT_FLAGS_O2) $(DEFINES)
36	LDFLAGS += $(MOREFLAGS)
37
38