Attachment #161374 for bug #200949

Lines 70-75 Link Here

(-)benchmarks/Makefile (+1 lines)
70	SUBDIR += smhasher	70	SUBDIR += smhasher
71	SUBDIR += spp	71	SUBDIR += spp
72	SUBDIR += stream	72	SUBDIR += stream
		73	SUBDIR += stress-ng
73	SUBDIR += super-smack	74	SUBDIR += super-smack
74	SUBDIR += sysbench	75	SUBDIR += sysbench
75	SUBDIR += tcpblast	76	SUBDIR += tcpblast




# $FreeBSD$

PORTNAME=	stress-ng
PORTVERSION=	0.04.20
CATEGORIES=	benchmarks
MASTER_SITES=	http://kernel.ubuntu.com/~cking/tarballs/stress-ng/

MAINTAINER=	luca.pizzamiglio@gmail.com
COMMENT=	Stress test benchmarks

LICENSE=	GPLv2

ALL_TARGET=	# empty

PLIST_FILES=	bin/stress-ng man/man1/stress-ng.1.gz

.include <bsd.port.pre.mk>

.if ${OSVERSION} < 1000000
EXTRA_PATCHES+=	${FILESDIR}/extrapatch-stress-cpu.c \
		${FILESDIR}/extrapatch-Makefile
.endif

do-install:
	${INSTALL_PROGRAM} ${WRKSRC}/stress-ng ${STAGEDIR}${PREFIX}/bin
	${INSTALL_MAN} ${WRKSRC}/stress-ng.1 ${STAGEDIR}${MANDIRS}/man1

.include <bsd.port.post.mk>

Added Link Here

(-)benchmarks/stress-ng/distinfo (+2 lines)
1	SHA256 (stress-ng-0.04.20.tar.gz) = 5b00c23325e46236466e598a977c8ebcd4f786cc0c2e15118004a0462bb6f47f
2	SIZE (stress-ng-0.04.20.tar.gz) = 236074

Added Link Here

(-)benchmarks/stress-ng/files/extrapatch-Makefile (+11 lines)
1	--- Makefile.orig 2015-09-25 10:15:45 UTC
2	+++ Makefile
3	@@ -165,7 +165,7 @@ OBJS = $(SRC:.c=.o)
4	@$(CC) $(CFLAGS) -c -o $@ $<
5
6	stress-ng: $(OBJS)
7	- $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm -pthread -lrt -lcrypt -o $@ $(LDFLAGS)
8	+ $(CC) $(CPPFLAGS) $(CFLAGS) $(OBJS) -lm -pthread -lrt -lcrypt -lstdc++ -o $@ $(LDFLAGS)
9
10	stress-cpu.o: stress-cpu.c
11	@echo $(CC) $(CFLAGS) -c -o $@ $<

Added Link Here

(-)benchmarks/stress-ng/files/extrapatch-stress-cpu.c (+10 lines)
1	--- stress-cpu.c.orig 2015-09-18 14:50:12 UTC
2	+++ stress-cpu.c
3	@@ -23,6 +23,7 @@
4	*
5	*/
6	#define _GNU_SOURCE
7	+#define _DECLARE_C99_LDBL_MATH 1
8
9	#include <stdio.h>
10	#include <stdlib.h>




--- stress-cpu.c.orig	2015-09-18 14:50:12 UTC
+++ stress-cpu.c
@@ -57,7 +58,6 @@
 #define	ccosl	ccos
 #define	csinl	csin
 #define cpow	pow
-#define powl	pow
 #endif
 
 /*
@@ -866,6 +866,7 @@ stress_cpu_fp(_Decimal128, decimal128, s
 /* Append floating point literal specifier to literal value */
 #define FP(val, ltype)	val ## ltype
 
+#if defined(__STDC_IEC_559_COMPLEX__)
 /*
  *  Generic complex stressor macro
  */
@@ -891,6 +892,7 @@ static void HOT OPTIMIZE3 stress_cpu_ ##
 stress_cpu_complex(complex float, f, complex_float, csinf, ccosf)
 stress_cpu_complex(complex double, , complex_double, csin, ccos)
 stress_cpu_complex(complex long double, l, complex_long_double, csinl, ccosl)
+#endif /* __STDC_IEC_559_COMPLEX__ */
 
 #define int_float_ops(_ftype, flt_a, flt_b, flt_c, flt_d,	\
 	_sin, _cos, int_a, int_b, _c1, _c2, _c3)		\
@@ -2058,9 +2060,11 @@ static stress_cpu_stressor_info_t cpu_me
 	{ "ackermann",		stress_cpu_ackermann },
 	{ "bitops",		stress_cpu_bitops },
 	{ "callfunc",		stress_cpu_callfunc },
+#if defined(__STDC_IEC_559_COMPLEX__)
 	{ "cdouble",		stress_cpu_complex_double },
 	{ "cfloat",		stress_cpu_complex_float },
 	{ "clongdouble",	stress_cpu_complex_long_double },
+#endif /* __STDC_IEC_559_COMPLEX__ */
 	{ "correlate",		stress_cpu_correlate },
 	{ "crc16",		stress_cpu_crc16 },
 #if defined(STRESS_FLOAT_DECIMAL)

Added Link Here

(-)benchmarks/stress-ng/pkg-descr (+5 lines)
1	This stress test suite will stress a computer system in various selectable ways
2	It was designed to exercise various physical subsystems of a computer as well
3	as various operating system kernel interfaces.
4
5	WWW: http://kernel.ubuntu.com/~cking/stress-ng/

Return to bug 200949

Added Link Here

(-)benchmarks/stress-ng/Makefile (+28 lines)
1	# $FreeBSD$
2
3	PORTNAME= stress-ng
4	PORTVERSION= 0.04.20
5	CATEGORIES= benchmarks
6	MASTER_SITES= http://kernel.ubuntu.com/~cking/tarballs/stress-ng/
7
8	MAINTAINER= luca.pizzamiglio@gmail.com
9	COMMENT= Stress test benchmarks
10
11	LICENSE= GPLv2
12
13	ALL_TARGET= # empty
14
15	PLIST_FILES= bin/stress-ng man/man1/stress-ng.1.gz
16
17	.include <bsd.port.pre.mk>
18
19	.if ${OSVERSION} < 1000000
20	EXTRA_PATCHES+= ${FILESDIR}/extrapatch-stress-cpu.c \
21	${FILESDIR}/extrapatch-Makefile
22	.endif
23
24	do-install:
25	${INSTALL_PROGRAM} ${WRKSRC}/stress-ng ${STAGEDIR}${PREFIX}/bin
26	${INSTALL_MAN} ${WRKSRC}/stress-ng.1 ${STAGEDIR}${MANDIRS}/man1
27
28	.include <bsd.port.post.mk>

Added Link Here

(-)benchmarks/stress-ng/files/patch-stress-cpu.c (+38 lines)
1	--- stress-cpu.c.orig 2015-09-18 14:50:12 UTC
2	+++ stress-cpu.c
3	@@ -57,7 +58,6 @@
4	#define ccosl ccos
5	#define csinl csin
6	#define cpow pow
7	-#define powl pow
8	#endif
9
10	/*
11	@@ -866,6 +866,7 @@ stress_cpu_fp(_Decimal128, decimal128, s
12	/* Append floating point literal specifier to literal value */
13	#define FP(val, ltype) val ## ltype
14
15	+#if defined(__STDC_IEC_559_COMPLEX__)
16	/*
17	* Generic complex stressor macro
18	*/
19	@@ -891,6 +892,7 @@ static void HOT OPTIMIZE3 stress_cpu_ ##
20	stress_cpu_complex(complex float, f, complex_float, csinf, ccosf)
21	stress_cpu_complex(complex double, , complex_double, csin, ccos)
22	stress_cpu_complex(complex long double, l, complex_long_double, csinl, ccosl)
23	+#endif /* __STDC_IEC_559_COMPLEX__ */
24
25	#define int_float_ops(_ftype, flt_a, flt_b, flt_c, flt_d, \
26	_sin, _cos, int_a, int_b, _c1, _c2, _c3) \
27	@@ -2058,9 +2060,11 @@ static stress_cpu_stressor_info_t cpu_me
28	{ "ackermann", stress_cpu_ackermann },
29	{ "bitops", stress_cpu_bitops },
30	{ "callfunc", stress_cpu_callfunc },
31	+#if defined(__STDC_IEC_559_COMPLEX__)
32	{ "cdouble", stress_cpu_complex_double },
33	{ "cfloat", stress_cpu_complex_float },
34	{ "clongdouble", stress_cpu_complex_long_double },
35	+#endif /* __STDC_IEC_559_COMPLEX__ */
36	{ "correlate", stress_cpu_correlate },
37	{ "crc16", stress_cpu_crc16 },
38	#if defined(STRESS_FLOAT_DECIMAL)