diff options
author | jmbills <42755197+jmbills@users.noreply.github.com> | 2019-10-25 19:18:16 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-25 19:18:16 +0300 |
commit | 0dbb60593ebb5a62190c0e6cff7f1770493303a2 (patch) | |
tree | 0df2ce67404dbca3ddc4ee063dbfd9ae455be682 /meta-openembedded/meta-oe/recipes-benchmark | |
parent | 34a3942845ac3264ce27c648ae5486d302c3e6d8 (diff) | |
parent | cc9cea46d74d280de03c713c8b555153fd811f09 (diff) | |
download | openbmc-0dbb60593ebb5a62190c0e6cff7f1770493303a2.tar.xz |
Merge branch 'intel' into intel2
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-benchmark')
13 files changed, 111 insertions, 44 deletions
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.3.bb b/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb index 451671dda..bb0aad341 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.3.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/analyze-suspend/analyze-suspend_5.5.bb @@ -17,7 +17,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=12f884d2ae1ff87c09e5b7ccc2c4ca7e" RDEPENDS_${PN} += "python-core python-datetime python-stringold" SRC_URI = "git://github.com/01org/suspendresume.git;protocol=https" -SRCREV = "5be9a16547234cef5aca8bfaccd920490ea1cfa7" +SRCREV = "cf59527dc24fdd2f314ae4dcaeb3d68a117988f6" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch new file mode 100644 index 000000000..983a76fb6 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch @@ -0,0 +1,28 @@ +From 2af58909cd9f2862d1dc07836e201361a2cd8d5d Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Sat, 5 Oct 2019 08:53:22 -0700 +Subject: [PATCH] arch-arm: Consider armv7ve arch as well + +Upstream-Status: Submitted [] + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + arch/arch-arm.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/arch-arm.h b/arch/arch-arm.h +index 78cb2ebe..4f722967 100644 +--- a/arch/arch-arm.h ++++ b/arch/arch-arm.h +@@ -11,7 +11,7 @@ + #define nop __asm__ __volatile__("mov\tr0,r0\t@ nop\n\t") + #define read_barrier() __asm__ __volatile__ ("" : : : "memory") + #define write_barrier() __asm__ __volatile__ ("" : : : "memory") +-#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) ++#elif defined(__ARM_ARCH_7A__) || defined(__ARM_ARCH_8A__) || defined(__ARM_ARCH_7VE__) + #define nop __asm__ __volatile__ ("nop") + #define read_barrier() __sync_synchronize() + #define write_barrier() __sync_synchronize() +-- +2.23.0 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.12.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb index e85e7c709..adab61878 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.12.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb @@ -10,7 +10,7 @@ SECTION = "console/tests" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" -DEPENDS = "libaio zlib" +DEPENDS = "libaio zlib coreutils-native" RDEPENDS_${PN} = "python bash" PACKAGECONFIG_NUMA = "numa" @@ -21,10 +21,10 @@ PACKAGECONFIG_NUMA_armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -# rev for v3.8 -SRCREV = "16500b5a0b03ee0142d592bb74a46943a223b06e" +SRCREV = "92f75708b530989fdb13b50be6604f44b80d038d" SRC_URI = "git://git.kernel.dk/fio.git \ file://0001-update-the-interpreter-paths.patch \ + file://0001-arch-arm-Consider-armv7ve-arch-as-well.patch \ " S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb index 7ed5cd028..605417634 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -15,7 +15,7 @@ PV = "20190205+${SRCPV}" COMPATIBLE_HOST_rpi = "${@bb.utils.contains('MACHINE_FEATURES', 'vc4graphics', '.*-linux*', 'null', d)}" SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" -SRCREV = "0c90dd48df43a6b0db1d9aabca6298240f4968f7" +SRCREV = "c17fd14505f30d9e4dbad276f7aa956fd21a637b" S = "${WORKDIR}/git" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch new file mode 100644 index 000000000..45c69ca06 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2/0001-Detect-bool-definition-considering-stdbool.h-being-p.patch @@ -0,0 +1,58 @@ +From 6df092a4153c6c37cfaddcabf2cd25a910a7f6e1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Mon, 2 Sep 2019 15:40:52 -0700 +Subject: [PATCH] Detect bool definition considering stdbool.h being present + +This helps in defining the value correctly on different platforms e.g. +clang/libc++ depends on the definition coming from stdbool.h +current builds fail to compile therefore + +TMPDIR/work/cortexa7t2hf-neon-vfpv4-yoe-linux-gnueabi/iperf2/2.0.13-r0/recipe-sysroot/usr/include/c++/v1/type_traits:742:29: error: redefinition of '__libcpp_is_integral<int>' +template <> struct __libcpp_is_integral<int> : public true_type {}; + ^~~~~~~~~~~~~~~~~~~~~~~~~ + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + m4/dast.m4 | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) + +--- a/m4/dast.m4 ++++ b/m4/dast.m4 +@@ -11,7 +11,12 @@ AH_TEMPLATE([false]) + + AC_DEFUN(DAST_CHECK_BOOL, [ + +-AC_CHECK_SIZEOF(bool) ++if test "$ac_cv_header_stdbool_h" = yes; then ++ AC_CHECK_SIZEOF(bool,,[#include <stdbool.h>]) ++else ++ AC_CHECK_SIZEOF(bool) ++fi ++ + if test "$ac_cv_sizeof_bool" = 0 ; then + AC_DEFINE(bool, int) + fi +--- a/configure.ac ++++ b/configure.ac +@@ -113,7 +113,7 @@ AC_SEARCH_LIBS([socket], [socket], [], + + dnl Checks for header files. + AC_HEADER_STDC +-AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h]) ++AC_CHECK_HEADERS([arpa/inet.h libintl.h net/ethernet.h net/if.h linux/ip.h linux/udp.h linux/if_packet.h linux/filter.h netdb.h netinet/in.h stdbool.h stdlib.h string.h strings.h sys/socket.h sys/time.h syslog.h unistd.h signal.h ifaddrs.h]) + + dnl =================================================================== + dnl Checks for typedefs, structures +--- a/include/util.h ++++ b/include/util.h +@@ -56,7 +56,9 @@ + #ifdef HAVE_CONFIG_H + #include "config.h" + #endif +- ++#ifdef HAVE_STDBOOL_H ++# include <stdbool.h> ++#endif + #ifdef __cplusplus + extern "C" { + #endif diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb index 1322d0788..4a520e3be 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb @@ -4,10 +4,12 @@ SECTION = "console/network" LICENSE = "BSD-2-Clause" LIC_FILES_CHKSUM = "file://COPYING;md5=e136a7b2560d80bcbf0d9b3e1356ecff" -SRC_URI = " ${SOURCEFORGE_MIRROR}/iperf2/iperf-${PV}.tar.gz" +SRC_URI = "${SOURCEFORGE_MIRROR}/${BPN}/iperf-${PV}.tar.gz \ + file://0001-Detect-bool-definition-considering-stdbool.h-being-p.patch \ +" -SRC_URI[md5sum] = "097cf0754bc1afa165975c06a91e6906" -SRC_URI[sha256sum] = "7fe4348dcca313b74e0aa9c34a8ccd713b84a5615b8578f4aa94cedce9891ef2" +SRC_URI[md5sum] = "31ea1c6d5cbf80b16ff3abe4288dad5e" +SRC_URI[sha256sum] = "c88adec966096a81136dda91b4bd19c27aae06df4d45a7f547a8e50d723778ad" S = "${WORKDIR}/iperf-${PV}" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch index 06eb41ac0..959e29389 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch @@ -1,31 +1,32 @@ -From 6db0e28f906bc3784019dfb5bb011237a8034fda Mon Sep 17 00:00:00 2001 +From 3ae408402635ea21ad90cd722c99ae3334376c91 Mon Sep 17 00:00:00 2001 From: Khem Raj <raj.khem@gmail.com> Date: Fri, 14 Jul 2017 13:00:16 -0700 -Subject: [PATCH 2/2] Remove -pg from profile_CFLAGS +Subject: [PATCH] Remove -pg from profile_CFLAGS musl fails to link with missing gcrt1.o Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Mingli Yu <mingli.yu@windriver.com> --- src/Makefile.am | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/Makefile.am b/src/Makefile.am -index 23b0c72..6268145 100644 +index 5be8562..3881aa6 100644 --- a/src/Makefile.am +++ b/src/Makefile.am -@@ -49,9 +49,9 @@ iperf3_LDFLAGS = -g +@@ -58,9 +58,9 @@ if ENABLE_PROFILING iperf3_profile_SOURCES = main.c \ - $(libiperf_la_SOURCES) + $(libiperf_la_SOURCES) -iperf3_profile_CFLAGS = -pg -g +iperf3_profile_CFLAGS = -g iperf3_profile_LDADD = libiperf.la -iperf3_profile_LDFLAGS = -pg -g +iperf3_profile_LDFLAGS = -g + endif # Specify the sources and various flags for the test cases - t_timer_SOURCES = t_timer.c -- -2.13.3 +2.21.0 diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch deleted file mode 100644 index 06c394e5c..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch +++ /dev/null @@ -1,17 +0,0 @@ -Pass the 'foreign' option to automake to enable iperf3 to build. - -Upstream-Status: Inappropriate [configuration] - -Signed-off-by: Chunrong Guo <b40290@freescale.com> - ---- a/configure.ac 2015-10-19 02:49:30.471867352 -0500 -+++ b/configure.ac 2015-10-19 02:46:36.207873572 -0500 -@@ -33,7 +33,7 @@ - - - # Initialize the automake system --AM_INIT_AUTOMAKE -+AM_INIT_AUTOMAKE([foreign]) - AM_MAINTAINER_MODE - AM_CONFIG_HEADER(src/iperf_config.h) - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb index 4e11d8233..d5296d733 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb @@ -9,16 +9,15 @@ SECTION = "console/network" BUGTRACKER = "https://github.com/esnet/iperf/issues" AUTHOR = "ESNET <info@es.net>, Lawrence Berkeley National Laboratory <websupport@lbl.gov>" LICENSE = "BSD" -LIC_FILES_CHKSUM = "file://LICENSE;md5=a9a036136b748453e839c0eb8906ef2e" +LIC_FILES_CHKSUM = "file://LICENSE;md5=f9088fe7ffdccd042f7645f1012d7f70" DEPENDS = "openssl" SRC_URI = "git://github.com/esnet/iperf.git \ - file://automake-foreign.patch \ file://0002-Remove-pg-from-profile_CFLAGS.patch \ " -SRCREV = "88f3ad87f38762081a6d7127890ff5c3a052b06a" +SRCREV = "dfcea9f6a09ead01089a3c9d20c7032f2c0af2c1" S = "${WORKDIR}/git" @@ -29,5 +28,3 @@ PACKAGECONFIG[lksctp] = "ac_cv_header_netinet_sctp_h=yes,ac_cv_header_netinet_sc CFLAGS += "-D_GNU_SOURCE" EXTRA_OECONF = "--with-openssl=${RECIPE_SYSROOT}${prefix}" - -BBCLASSEXTEND = "native" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run index e904c75e4..2716bf935 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench/lmbench-run @@ -4,7 +4,6 @@ # Javier Fernandez-Sanguino. # Distributed under the GPL SHAREDIR=/usr/share/lmbench/ -BINDIR=/usr/lib/lmbench/ SCRIPTSDIR=$SHAREDIR/scripts RESULTSDIR=$SHAREDIR/results CONFIG=/var/lib/lmbench/config/`$SCRIPTSDIR/config` diff --git a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb index 8e6e803a8..7e20b7da6 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/lmbench/lmbench_3.0-a9.bb @@ -54,7 +54,7 @@ do_compile () { do_install () { install -d ${D}${sysconfdir}/default/volatiles \ - ${D}${bindir} ${D}${mandir} ${D}${libdir}/lmbench \ + ${D}${bindir} ${D}${mandir} \ ${D}${datadir}/lmbench/scripts echo "d root root 0755 ${localstatedir}/run/${BPN} none" \ @@ -71,7 +71,6 @@ do_install () { mv ${D}${bindir}/line ${D}${bindir}/lm_line install -m 0755 ${WORKDIR}/lmbench-run ${D}${bindir}/ sed -i -e 's,^SHAREDIR=.*$,SHAREDIR=${datadir}/${BPN},;' \ - -e 's,^BINDIR=.*$,BINDIR=${libdir}/${BPN},;' \ -e 's,^CONFIG=.*$,CONFIG=`$SCRIPTSDIR/config`,;' \ ${D}${bindir}/lmbench-run install -m 0755 ${S}/scripts/lmbench ${D}${bindir} @@ -89,4 +88,4 @@ pkg_postinst_${PN} () { } RDEPENDS_${PN} = "perl" -FILES_${PN} += "${datadir}/lmbench ${libdir}/lmbench" +FILES_${PN} += "${datadir}/lmbench" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb index 873384496..c4df1a90b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.8.1.bb @@ -29,7 +29,7 @@ do_install() { SYSTEMD_AUTO_ENABLE = "disable" SYSTEMD_SERVICE_${PN} = "phoromatic-client.service phoromatic-server.service" -RDEPENDS_${PN} += "bash python php-cli util-linux-lscpu os-release lsb" +RDEPENDS_${PN} += "bash python php-cli util-linux-lscpu os-release lsb-release" FILES_${PN} += " \ ${datadir}/phoronix-test-suite \ diff --git a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb index 741142c50..8c49b4674 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb @@ -2,8 +2,8 @@ SUMMARY = "Small collection of benchmarks for storage I/O" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b529aaa6a0c50f15d29f89609b5c22f3" -SRCREV = "8d22ab8a4cc1484622c47ac9c5944fb9a61a5c0f" -PV = "3.4" +SRCREV = "3b9eef2259a70f412ab02fbe6b3a4d313d09c38a" +PV = "3.5" SRC_URI = "git://github.com/Algodev-github/S.git;protocol=https;branch=master" S = "${WORKDIR}/git" |