Attachment 158909 Details for Bug 200949 – Patch recreated following reviewer's suggestions

[patch] Patch recreated following reviewer's suggestions

W-benchmarks-stress-ng.diff (text/plain), 5.46 KB, created by luca.pizzamiglio on 2015-07-17 14:16:32 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: luca.pizzamiglio

Created: 2015-07-17 14:16:32 UTC

Size: 5.46 KB

patch

obsolete

>diff --git benchmarks/Makefile benchmarks/Makefile
>index 770d523..86ef121 100644
>--- benchmarks/Makefile
>+++ benchmarks/Makefile
>@@ -70,6 +70,7 @@
>     SUBDIR += smhasher
>     SUBDIR += spp
>     SUBDIR += stream
>+    SUBDIR += stress-ng
>     SUBDIR += super-smack
>     SUBDIR += sysbench
>     SUBDIR += tcpblast
>diff --git benchmarks/stress-ng/Makefile benchmarks/stress-ng/Makefile
>new file mode 100644
>index 0000000..834f316
>--- /dev/null
>+++ benchmarks/stress-ng/Makefile
>@@ -0,0 +1,28 @@
>+# $FreeBSD$
>+
>+PORTNAME=	stress-ng
>+PORTVERSION=	0.04.12
>+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} < 900000
>+EXTRAPATCH+=	${FILESDIR}/extra-patch-stress-cpu.c \
>+		${FILESDIR}/extra-patch-stree-vm.c
>+.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>
>diff --git benchmarks/stress-ng/distinfo benchmarks/stress-ng/distinfo
>new file mode 100644
>index 0000000..e80f64c
>--- /dev/null
>+++ benchmarks/stress-ng/distinfo
>@@ -0,0 +1,2 @@
>+SHA256 (stress-ng-0.04.12.tar.gz) = f54d245ee58c4630d475826d1a85d2eb178441ff5378cd913d0bfe16a2aa853d
>+SIZE (stress-ng-0.04.12.tar.gz) = 226964
>diff --git benchmarks/stress-ng/files/extra-patch-stress-cpu.c benchmarks/stress-ng/files/extra-patch-stress-cpu.c
>new file mode 100644
>index 0000000..2cff3a3
>--- /dev/null
>+++ benchmarks/stress-ng/files/extra-patch-stress-cpu.c
>@@ -0,0 +1,44 @@
>+--- stress-cpu.c.orig	2015-06-02 19:36:12 UTC
>++++ stress-cpu.c
>+@@ -54,10 +54,15 @@
>+@@ -392,6 +397,7 @@ static void HOT OPTIMIZE3 stress_cpu_phi
>+ 		pr_fail(stderr, "%s: Golden Ratio phi not accurate enough\n", name);
>+ }
>+ 
>++#if 0
>+ /*
>+  *  fft_partial()
>+  *  	partial Fast Fourier Transform
>+@@ -432,6 +438,7 @@ static void HOT stress_cpu_fft(const cha
>+ 	memcpy(tmp, buf, sizeof(double complex) * FFT_SIZE);
>+ 	fft_partial(buf, tmp, FFT_SIZE, 1);
>+ }
>++#endif
>+ 
>+ /*
>+  *   stress_cpu_euler()
>+@@ -1651,10 +1660,10 @@ static uint8_t HOT OPTIMIZE3 hamming84(c
>+ 	 * G[] is reversed to turn G[3-j] into G[j] to save a subtraction
>+ 	 */
>+ 	static const uint8_t G[] = {
>+-		0b11110001,
>+-		0b11010010,
>+-		0b10110100,
>+-		0b01111000,
>++		0xF1,
>++		0xD2,
>++		0xB4,
>++		0x78,
>+ 	};
>+ 
>+ 	register uint8_t code = 0;
>+@@ -1936,7 +1947,9 @@ static stress_cpu_stressor_info_t cpu_me
>+ 	{ "double",		stress_cpu_double },
>+ 	{ "euler",		stress_cpu_euler },
>+ 	{ "explog",		stress_cpu_explog },
>++#if 0
>+ 	{ "fft",		stress_cpu_fft },
>++#endif
>+ 	{ "fibonacci",		stress_cpu_fibonacci },
>+ 	{ "float",		stress_cpu_float },
>+ 	{ "fnv1a",		stress_cpu_fnv1a },
>diff --git benchmarks/stress-ng/files/extra-patch-stress-vm.c benchmarks/stress-ng/files/extra-patch-stress-vm.c
>new file mode 100644
>index 0000000..f0dd781
>--- /dev/null
>+++ benchmarks/stress-ng/files/extra-patch-stress-vm.c
>@@ -0,0 +1,11 @@
>+--- stress-vm.c.orig	2015-06-17 09:02:30 UTC
>++++ stress-vm.c
>+@@ -952,7 +952,7 @@ static size_t stress_vm_flip(
>+ {
>+ 	const size_t chunk_sz = sizeof(uint8_t) * 8;
>+ 	volatile uint8_t *ptr;
>+-	uint8_t *buf_end = buf + sz, bit = 0b00000011;
>++	uint8_t *buf_end = buf + sz, bit = 0x03;
>+ 	uint64_t w, z, c = *counter;
>+ 	size_t bit_errors = 0, i;
>+ 
>diff --git benchmarks/stress-ng/files/patch-stress-cpu.c benchmarks/stress-ng/files/patch-stress-cpu.c
>new file mode 100644
>index 0000000..d985c35
>--- /dev/null
>+++ benchmarks/stress-ng/files/patch-stress-cpu.c
>@@ -0,0 +1,45 @@
>+--- stress-cpu.c.orig	2015-06-02 19:36:12 UTC
>++++ stress-cpu.c
>+@@ -54,10 +54,14 @@
>+ #endif
>+ 
>+ #if defined(__FreeBSD__)
>+ #define	ccosl	ccos
>+ #define	csinl	csin
>+ #define cpow	pow
>+ #define powl	pow
>++#define logl	log
>++#define expl	exp
>++#define coshl	cosh
>++#define	sinhl	sinh
>+ #endif
>+ 
>+ /*
>+@@ -846,6 +853,7 @@ stress_cpu_fp(_Decimal64, decimal64, sin
>+ stress_cpu_fp(_Decimal128, decimal128, sinl, cosl)
>+ #endif
>+ 
>++#if defined(__STDC_IEC_559_COMPLEX__)
>+ /*
>+  *  Generic complex stressor macro
>+  */
>+@@ -869,6 +877,7 @@ static void HOT OPTIMIZE3 stress_cpu_ ##
>+ stress_cpu_complex(complex float, complex_float, csinf, ccosf)
>+ stress_cpu_complex(complex double, complex_double, csin, ccos)
>+ stress_cpu_complex(complex long double, 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)		\
>+@@ -1921,9 +1930,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)
>diff --git benchmarks/stress-ng/pkg-descr benchmarks/stress-ng/pkg-descr
>new file mode 100644
>index 0000000..395e783
>--- /dev/null
>+++ benchmarks/stress-ng/pkg-descr
>@@ -0,0 +1,5 @@
>+This stress test suite will stress a computer system in various selectable ways
>+It was designed to exercise various physical subsystems of a computer as well
>+as various operating system kernel interfaces.
>+
>+WWW: http://kernel.ubuntu.com/~cking/stress-ng/

Actions: View | Diff

Attachments on bug 200949: 157850 | 157851 | 157852 | 157853 | 157854 | 157855 | 157856 | 158909 | 161374