Gentoo Archives: gentoo-commits

From: Conrad Kostecki <conikost@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-benchmarks/stress-ng/files/, app-benchmarks/stress-ng/
Date: Thu, 10 Sep 2020 21:57:34
Message-Id: 1599775045.d4e293f30f2c4c62c2e467807872fe45348f02e7.conikost@gentoo
1 commit: d4e293f30f2c4c62c2e467807872fe45348f02e7
2 Author: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
3 AuthorDate: Thu Sep 10 21:55:03 2020 +0000
4 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org>
5 CommitDate: Thu Sep 10 21:57:25 2020 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d4e293f3
7
8 app-benchmarks/stress-ng: drop old version
9
10 Package-Manager: Portage-3.0.5, Repoman-3.0.1
11 Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org>
12
13 app-benchmarks/stress-ng/Manifest | 1 -
14 .../stress-ng-0.11.19-optimization-checks.patch | 87 ----------------------
15 app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild | 44 -----------
16 3 files changed, 132 deletions(-)
17
18 diff --git a/app-benchmarks/stress-ng/Manifest b/app-benchmarks/stress-ng/Manifest
19 index badb00724f8..8765c676141 100644
20 --- a/app-benchmarks/stress-ng/Manifest
21 +++ b/app-benchmarks/stress-ng/Manifest
22 @@ -1,2 +1 @@
23 -DIST stress-ng-0.11.19.tar.xz 475692 BLAKE2B 711e9532655e8b76c44d06a86c773e2a2d5c19cf08dec693f7aacf100060ed492fc7ace8244897d4b342a3f1cae8e3f81314cb5b792253957c1622621bd1f6c0 SHA512 eefb331699faccaaa98775e14e4f33f5cc99b86ec8feb8f1c34b6cb7d20f061c576f8fcd683e51740fa662fb54d987bed36b9d87ad13a1b39b4fe66e60177ab1
24 DIST stress-ng-0.11.20.tar.xz 480540 BLAKE2B 97ef2726ae5882c405ac752b56fa14e1a08a428b2ff2685b2d513438394b86184aa412ce97ea428a6ab4ec42c29c6bd4f5c28da9331c27c477d29a8fbe070a74 SHA512 08dda9ec44d9bde873b0186c4dbf3b15090c261316f0ec0ceed5378d31780b85038f898957c892393fef593ad5c913d044c1db8e2b60c68d88f5678d0209b6ac
25
26 diff --git a/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch b/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch
27 deleted file mode 100644
28 index 18bd02ae9d5..00000000000
29 --- a/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch
30 +++ /dev/null
31 @@ -1,87 +0,0 @@
32 -From 70acc386b6afb726d4576a3d4368b51114e92530 Mon Sep 17 00:00:00 2001
33 -From: Colin Ian King <colin.king@×××××××××.com>
34 -Date: Tue, 1 Sep 2020 12:54:19 +0100
35 -Subject: [PATCH] stress-ng.h: build in target clone types if gcc supports the
36 - feature
37 -
38 -Add in more build time optimization checks, try to build smarter with
39 -various gcc compatibility support checks.
40 -
41 -Signed-off-by: Colin Ian King <colin.king@×××××××××.com>
42 ----
43 - stress-ng.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
44 - 1 file changed, 61 insertions(+), 1 deletion(-)
45 -
46 -diff --git a/stress-ng.h b/stress-ng.h
47 -index 3803bc71..6ce7d72e 100644
48 ---- a/stress-ng.h
49 -+++ b/stress-ng.h
50 -@@ -1686,7 +1686,67 @@ extern void pr_dbg_lock(bool *locked, const char *fmt, ...) FORMAT(printf, 2, 3
51 -
52 - /* GCC5.0+ target_clones attribute */
53 - #if defined(HAVE_TARGET_CLONES) && defined(STRESS_ARCH_X86)
54 --#define TARGET_CLONES __attribute__((target_clones("mmx","sse","sse2","ssse3", "sse4.1", "sse4a", "avx", "avx2", "arch=skylake-avx512", "default")))
55 -+#if defined(__MMX_WITH_SSE__)
56 -+#define TARGET_CLONE_MMX "mmx",
57 -+#else
58 -+#define TARGET_CLONE_MMX
59 -+#endif
60 -+
61 -+#if defined(__AVX__)
62 -+#define TARGET_CLONE_AVX "avx",
63 -+#else
64 -+#define TARGET_CLONE_AVX
65 -+#endif
66 -+
67 -+#if defined(__AVX2__)
68 -+#define TARGET_CLONE_AVX2 "avx2",
69 -+#else
70 -+#define TARGET_CLONE_AVX2
71 -+#endif
72 -+
73 -+#if defined(__SSE__)
74 -+#define TARGET_CLONE_SSE "sse",
75 -+#else
76 -+#define TARGET_CLONE_SSE
77 -+#endif
78 -+
79 -+#if defined(__SSE2__)
80 -+#define TARGET_CLONE_SSE2 "sse2",
81 -+#else
82 -+#define TARGET_CLONE_SSE2
83 -+#endif
84 -+
85 -+#if defined(__SSE3__)
86 -+#define TARGET_CLONE_SSE3 "sse3",
87 -+#else
88 -+#define TARGET_CLONE_SSE3
89 -+#endif
90 -+
91 -+#if defined(__SSSE3__)
92 -+#define TARGET_CLONE_SSSE3 "ssse3",
93 -+#else
94 -+#define TARGET_CLONE_SSSE3
95 -+#endif
96 -+
97 -+#if defined(__SSE4_1__)
98 -+#define TARGET_CLONE_SSE4_1 "sse4.1",
99 -+#else
100 -+#define TARGET_CLONE_SSE4_1
101 -+#endif
102 -+
103 -+#if defined(__SSE4_2__)
104 -+#define TARGET_CLONE_SSE4_2 "sse4.2",
105 -+#else
106 -+#define TARGET_CLONE_SSE4_2
107 -+#endif
108 -+
109 -+#if defined(__AVX512F__)
110 -+#define TARGET_CLONE_SKYLAKE_AVX512 "arch=skylake-avx512",
111 -+#else
112 -+#define TARGET_CLONE_SKYLAKE_AVX512
113 -+#endif
114 -+
115 -+#define TARGET_CLONES __attribute__((target_clones(TARGET_CLONE_AVX TARGET_CLONE_AVX2 TARGET_CLONE_MMX TARGET_CLONE_SSE TARGET_CLONE_SSE2 TARGET_CLONE_SSE3 TARGET_CLONE_SSSE3 TARGET_CLONE_SSE4_1 TARGET_CLONE_SSE4_2 TARGET_CLONE_SKYLAKE_AVX512 "default")))
116 - #elif defined(HAVE_TARGET_CLONES) && defined(STRESS_ARCH_PPC64)
117 - #define TARGET_CLONES __attribute__((target_clones("cpu=power9,default")))
118 - #else
119
120 diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
121 deleted file mode 100644
122 index 45fa78dbb29..00000000000
123 --- a/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
124 +++ /dev/null
125 @@ -1,44 +0,0 @@
126 -# Copyright 1999-2020 Gentoo Authors
127 -# Distributed under the terms of the GNU General Public License v2
128 -
129 -EAPI=7
130 -
131 -inherit optfeature toolchain-funcs
132 -
133 -DESCRIPTION="Stress test for a computer system with various selectable ways"
134 -HOMEPAGE="https://kernel.ubuntu.com/~cking/stress-ng/"
135 -SRC_URI="https://kernel.ubuntu.com/~cking/tarballs/${PN}/${P}.tar.xz"
136 -
137 -LICENSE="GPL-2+"
138 -SLOT="0"
139 -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
140 -
141 -DEPEND="
142 - dev-libs/libaio
143 - dev-libs/libbsd
144 - dev-libs/libgcrypt:0=
145 - sys-apps/attr
146 - sys-apps/keyutils:=
147 - sys-libs/libcap
148 - sys-libs/zlib
149 -"
150 -
151 -RDEPEND="${DEPEND}"
152 -
153 -DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
154 -
155 -PATCHES=(
156 - "${FILESDIR}/${PN}-0.11.17-makefile.patch"
157 - "${FILESDIR}/${PN}-0.11.19-optimization-checks.patch"
158 -)
159 -
160 -src_compile() {
161 - tc-export CC
162 -
163 - default
164 -}
165 -
166 -pkg_postinst() {
167 - optfeature "AppArmor support" sys-libs/libapparmor
168 - optfeature "SCTP support" net-misc/lksctp-tools
169 -}