diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-benchmark')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch | 43 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.15.bb (renamed from meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.12.bb) | 4 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb | 2 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb (renamed from meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.10.bb) | 6 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/0002-Remove-pg-from-profile_CFLAGS.patch | 15 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3/automake-foreign.patch | 17 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.7.bb (renamed from meta-openembedded/meta-oe/recipes-benchmark/iperf3/iperf3_3.6.bb) | 5 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/s-suite/s-suite_git.bb | 4 |
8 files changed, 61 insertions, 35 deletions
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch new file mode 100644 index 0000000000..cb18032d24 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-engines-splice-remove-buggy-mem_align-set.patch @@ -0,0 +1,43 @@ +From 8ca8a05d92fa799fe93a6edc27b058802211fddc Mon Sep 17 00:00:00 2001 +From: Jens Axboe <axboe@kernel.dk> +Date: Sat, 3 Aug 2019 08:33:24 -0600 +Subject: [PATCH] engines/splice: remove buggy ->mem_align set + +Two things wrong here: + +1) We align buffers by default, so no need for splice to do anything + extra. +2) ->mem_align is not a true/false setting, it's the alignment itself. + Hence the current setting to 1 is just buggy. + +Upstream-Status: Backport [https://github.com/axboe/fio/commit/8ca8a05d92fa799fe93a6edc27b058802211fddc] + +Fixes: https://github.com/axboe/fio/issues/810 +Reported-by: Sitsofe Wheeler <sitsofe@yahoo.com> +Signed-off-by: Jens Axboe <axboe@kernel.dk> +Signed-off-by: Liwei Song <liwei.song@windriver.com> +--- + engines/splice.c | 7 ------- + 1 file changed, 7 deletions(-) + +diff --git a/engines/splice.c b/engines/splice.c +index feb764feb2f4..6fc36bb6f154 100644 +--- a/engines/splice.c ++++ b/engines/splice.c +@@ -278,13 +278,6 @@ static int fio_spliceio_init(struct thread_data *td) + */ + sd->vmsplice_to_user_map = 1; + +- /* +- * And if vmsplice_to_user works, we definitely need aligned +- * buffers. Just set ->odirect to force that. +- */ +- if (td_read(td)) +- td->o.mem_align = 1; +- + td->io_ops_data = sd; + return 0; + } +-- +2.22.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.15.bb index e85e7c709b..df81759dab 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.12.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.15.bb @@ -21,10 +21,10 @@ PACKAGECONFIG_NUMA_armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -# rev for v3.8 -SRCREV = "16500b5a0b03ee0142d592bb74a46943a223b06e" +SRCREV = "01bf5128d0581e267383f280c6a1dcd26517240f" SRC_URI = "git://git.kernel.dk/fio.git \ file://0001-update-the-interpreter-paths.patch \ + file://0001-engines-splice-remove-buggy-mem_align-set.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 7ed5cd0281..605417634a 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_2.0.10.bb b/meta-openembedded/meta-oe/recipes-benchmark/iperf2/iperf2_2.0.13.bb index 1322d07883..2bd552d1d8 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,10 @@ 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" -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 06eb41ac0e..959e29389c 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 06c394e5c5..0000000000 --- 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 4e11d8233c..6686a814fd 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" 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 741142c500..8c49b4674f 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" |