From bb31da87599853b2e5d4d4adc641a93edb22cd16 Mon Sep 17 00:00:00 2001 From: Peter Bergin Date: Mon, 31 Oct 2022 15:47:02 +0100 Subject: sysbench: Upgrade 0.4.12 -> 1.0.20 Use system cuncurrencykit and enable riscv Signed-off-by: Peter Bergin Signed-off-by: Khem Raj --- ...tile-modifier-to-tmp-variable-in-memory-t.patch | 40 ---------------------- .../recipes-benchmark/sysbench/sysbench_0.4.12.bb | 28 --------------- .../recipes-benchmark/sysbench/sysbench_1.0.20.bb | 30 ++++++++++++++++ 3 files changed, 30 insertions(+), 68 deletions(-) delete mode 100644 meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch delete mode 100644 meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb create mode 100644 meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb diff --git a/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch b/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch deleted file mode 100644 index d628e81b56..0000000000 --- a/meta-oe/recipes-benchmark/sysbench/sysbench/0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch +++ /dev/null @@ -1,40 +0,0 @@ -From c1ebf893e32a0a77e820484d48a903523fef7c1b Mon Sep 17 00:00:00 2001 -From: Vasily Tarasov -Date: Fri, 10 Jun 2016 14:33:48 -0400 -Subject: [PATCH] Adding volatile modifier to tmp variable in memory test - -Issue explanation: - -./sysbench/sysbench --test=memory --num-threads=16 \ - --memory-block-size=268435456 \ - --memory-total-size=137438953472 \ - --memory-oper=read \ - --memory-access-mode=seq \ - --memory-scope=local run - -Without this commit the time to run the above command is 0.0004 seconds. -With this commit the time is greater than 3 seconds. Essentially, -without the volatile modifier, the compiler optimizes read access so -that no real access happens. - -Upstream-Status: Backport [part of v1.0.0 https://github.com/akopytov/sysbench/commit/8753cb93be4c0b81a20b704ced91e7a422da52b1] - -(cherry picked from commit 8753cb93be4c0b81a20b704ced91e7a422da52b1) -Signed-off-by: massimo toscanelli ---- - sysbench/tests/memory/sb_memory.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sysbench/tests/memory/sb_memory.c b/sysbench/tests/memory/sb_memory.c -index 2e8998f..7d22bb9 100644 ---- a/sysbench/tests/memory/sb_memory.c -+++ b/sysbench/tests/memory/sb_memory.c -@@ -244,7 +244,7 @@ sb_request_t memory_get_request(int tid) - int memory_execute_request(sb_request_t *sb_req, int thread_id) - { - sb_mem_request_t *mem_req = &sb_req->u.mem_request; -- int tmp = 0; -+ volatile int tmp = 0; - int idx; - int *buf, *end; - log_msg_t msg; diff --git a/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb b/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb deleted file mode 100644 index 4ac78fb8fd..0000000000 --- a/meta-oe/recipes-benchmark/sysbench/sysbench_0.4.12.bb +++ /dev/null @@ -1,28 +0,0 @@ -SUMMARY = "System performance benchmark" -HOMEPAGE = "http://github.com/akopytov/sysbench" -SECTION = "console/tests" -LICENSE = "GPL-2.0-only" -LIC_FILES_CHKSUM = "file://COPYING;md5=94d55d512a9ba36caa9b7df079bae19f" - -inherit autotools - -# The project has moved from Sourceforge to Launchpad, to Github. Use the source tarball from -# Launchpad until the next release is available from Github. -SRC_URI = "https://launchpad.net/ubuntu/+archive/primary/+files/${BPN}_${PV}.orig.tar.gz \ - file://0001-Adding-volatile-modifier-to-tmp-variable-in-memory-t.patch \ - " - -SRC_URI[md5sum] = "3a6d54fdd3fe002328e4458206392b9d" -SRC_URI[sha256sum] = "83fa7464193e012c91254e595a89894d8e35b4a38324b52a5974777e3823ea9e" - -EXTRA_OECONF += "--enable-largefile" -PACKAGECONFIG ??= "" -PACKAGECONFIG[aio] = "--enable-aio,--disable-aio,libaio," -PACKAGECONFIG[mysql] = "--with-mysql \ - --with-mysql-includes=${STAGING_INCDIR}/mysql \ - --with-mysql-libs=${STAGING_LIBDIR}, \ - --without-mysql,mysql5" - -do_configure:prepend() { - touch ${S}/NEWS ${S}/AUTHORS -} diff --git a/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb b/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb new file mode 100644 index 0000000000..098954af37 --- /dev/null +++ b/meta-oe/recipes-benchmark/sysbench/sysbench_1.0.20.bb @@ -0,0 +1,30 @@ +SUMMARY = "System performance benchmark" +HOMEPAGE = "http://github.com/akopytov/sysbench" +SECTION = "console/tests" +LICENSE = "GPL-2.0-only" +LIC_FILES_CHKSUM = "file://COPYING;md5=b234ee4d69f5fce4486a80fdaf4a4263" + +DEPENDS = "libtool libaio luajit concurrencykit" + +inherit autotools-brokensep pkgconfig + +# The project has moved from Sourceforge to Launchpad, to Github. Use the source tarball from +# Launchpad until the next release is available from Github. +SRC_URI = "git://github.com/akopytov/sysbench.git;protocol=https;branch=master" +SRCREV = "ebf1c90da05dea94648165e4f149abc20c979557" + +S = "${WORKDIR}/git" + +COMPATIBLE_HOST = "(arm|aarch64|i.86|x86_64|powerpc|powerpc64|riscv32|riscv64).*-linux*" + +EXTRA_OECONF += "--enable-largefile --with-system-luajit --with-system-ck --without-gcc-arch" +PACKAGECONFIG ??= "" +PACKAGECONFIG[aio] = "--enable-aio,--disable-aio,libaio," +PACKAGECONFIG[mysql] = "--with-mysql \ + --with-mysql-includes=${STAGING_INCDIR}/mysql \ + --with-mysql-libs=${STAGING_LIBDIR}, \ + --without-mysql,mysql5" + +do_configure:prepend() { + touch ${S}/NEWS ${S}/AUTHORS +} -- cgit v1.2.3-54-g00ecf