summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorConrad Kostecki <conikost@gentoo.org>2020-09-02 14:38:17 +0200
committerConrad Kostecki <conikost@gentoo.org>2020-09-02 14:38:17 +0200
commit285d1df0bf8f3e4208def7b36974e72b9b929f7e (patch)
treecb8155b0c1f23903f9953c49bee76d861aa150c0 /app-benchmarks
parentnet-vpn/networkmanager-strongswan: drop old version (diff)
downloadgentoo-285d1df0bf8f3e4208def7b36974e72b9b929f7e.tar.gz
gentoo-285d1df0bf8f3e4208def7b36974e72b9b929f7e.tar.bz2
gentoo-285d1df0bf8f3e4208def7b36974e72b9b929f7e.zip
app-benchmarks/stress-ng: fix compilation due optimization
Closes: https://bugs.gentoo.org/739830 Package-Manager: Portage-3.0.4, Repoman-3.0.1 Signed-off-by: Conrad Kostecki <conikost@gentoo.org>
Diffstat (limited to 'app-benchmarks')
-rw-r--r--app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch87
-rw-r--r--app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild5
2 files changed, 91 insertions, 1 deletions
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
new file mode 100644
index 000000000000..18bd02ae9d57
--- /dev/null
+++ b/app-benchmarks/stress-ng/files/stress-ng-0.11.19-optimization-checks.patch
@@ -0,0 +1,87 @@
+From 70acc386b6afb726d4576a3d4368b51114e92530 Mon Sep 17 00:00:00 2001
+From: Colin Ian King <colin.king@canonical.com>
+Date: Tue, 1 Sep 2020 12:54:19 +0100
+Subject: [PATCH] stress-ng.h: build in target clone types if gcc supports the
+ feature
+
+Add in more build time optimization checks, try to build smarter with
+various gcc compatibility support checks.
+
+Signed-off-by: Colin Ian King <colin.king@canonical.com>
+---
+ stress-ng.h | 62 ++++++++++++++++++++++++++++++++++++++++++++++++++++-
+ 1 file changed, 61 insertions(+), 1 deletion(-)
+
+diff --git a/stress-ng.h b/stress-ng.h
+index 3803bc71..6ce7d72e 100644
+--- a/stress-ng.h
++++ b/stress-ng.h
+@@ -1686,7 +1686,67 @@ extern void pr_dbg_lock(bool *locked, const char *fmt, ...) FORMAT(printf, 2, 3
+
+ /* GCC5.0+ target_clones attribute */
+ #if defined(HAVE_TARGET_CLONES) && defined(STRESS_ARCH_X86)
+-#define TARGET_CLONES __attribute__((target_clones("mmx","sse","sse2","ssse3", "sse4.1", "sse4a", "avx", "avx2", "arch=skylake-avx512", "default")))
++#if defined(__MMX_WITH_SSE__)
++#define TARGET_CLONE_MMX "mmx",
++#else
++#define TARGET_CLONE_MMX
++#endif
++
++#if defined(__AVX__)
++#define TARGET_CLONE_AVX "avx",
++#else
++#define TARGET_CLONE_AVX
++#endif
++
++#if defined(__AVX2__)
++#define TARGET_CLONE_AVX2 "avx2",
++#else
++#define TARGET_CLONE_AVX2
++#endif
++
++#if defined(__SSE__)
++#define TARGET_CLONE_SSE "sse",
++#else
++#define TARGET_CLONE_SSE
++#endif
++
++#if defined(__SSE2__)
++#define TARGET_CLONE_SSE2 "sse2",
++#else
++#define TARGET_CLONE_SSE2
++#endif
++
++#if defined(__SSE3__)
++#define TARGET_CLONE_SSE3 "sse3",
++#else
++#define TARGET_CLONE_SSE3
++#endif
++
++#if defined(__SSSE3__)
++#define TARGET_CLONE_SSSE3 "ssse3",
++#else
++#define TARGET_CLONE_SSSE3
++#endif
++
++#if defined(__SSE4_1__)
++#define TARGET_CLONE_SSE4_1 "sse4.1",
++#else
++#define TARGET_CLONE_SSE4_1
++#endif
++
++#if defined(__SSE4_2__)
++#define TARGET_CLONE_SSE4_2 "sse4.2",
++#else
++#define TARGET_CLONE_SSE4_2
++#endif
++
++#if defined(__AVX512F__)
++#define TARGET_CLONE_SKYLAKE_AVX512 "arch=skylake-avx512",
++#else
++#define TARGET_CLONE_SKYLAKE_AVX512
++#endif
++
++#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")))
+ #elif defined(HAVE_TARGET_CLONES) && defined(STRESS_ARCH_PPC64)
+ #define TARGET_CLONES __attribute__((target_clones("cpu=power9,default")))
+ #else
diff --git a/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild b/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
index 4c88cc73a967..cadf668aef46 100644
--- a/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
+++ b/app-benchmarks/stress-ng/stress-ng-0.11.19.ebuild
@@ -27,7 +27,10 @@ RDEPEND="${DEPEND}"
DOCS=( "README" "README.Android" "TODO" "syscalls.txt" )
-PATCHES=( "${FILESDIR}/${PN}-0.11.17-makefile.patch" )
+PATCHES=(
+ "${FILESDIR}/${PN}-0.11.17-makefile.patch"
+ "${FILESDIR}/${PN}-0.11.19-optimization-checks.patch"
+)
src_compile() {
tc-export CC