diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-benchmark')
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch | 28 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch | 13 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb (renamed from meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb) | 3 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/0001-let-system-headers-provide-pread64.patch | 34 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_488.bb | 1 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch | 41 | ||||
-rw-r--r-- | meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb | 1 |
7 files changed, 79 insertions, 42 deletions
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 deleted file mode 100644 index 983a76fb6d..0000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-arch-arm-Consider-armv7ve-arch-as-well.patch +++ /dev/null @@ -1,28 +0,0 @@ -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/files/0001-update-the-interpreter-paths.patch b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch index 327b9f5b73..c9c3a08dfc 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/files/0001-update-the-interpreter-paths.patch @@ -16,8 +16,7 @@ Signed-off-by: Mingli Yu <mingli.yu@windriver.com> tools/hist/fiologparser_hist.py | 2 +- tools/hist/half-bins.py | 2 +- tools/plot/fio2gnuplot | 2 +- - t/steadystate_tests.py | 2 +- - 7 files changed, 7 insertions(+), 7 deletions(-) + 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/tools/fio_jsonplus_clat2csv b/tools/fio_jsonplus_clat2csv index 78a007e5..0524b6e6 100755 @@ -79,16 +78,6 @@ index 4d1815cf..509141af 100755 # Note: this script is python2 and python3 compatible. # # Copyright (C) 2013 eNovance SAS <licensing@enovance.com> -diff --git a/t/steadystate_tests.py b/t/steadystate_tests.py -index 50254dcc..95e7dfde 100755 ---- a/t/steadystate_tests.py -+++ b/t/steadystate_tests.py -@@ -1,4 +1,4 @@ --#!/usr/bin/python2.7 -+#!/usr/bin/env python - # Note: this script is python2 and python 3 compatible. - # - # steadystate_tests.py -- 2.17.1 diff --git a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb index adab618780..e41c21d1e2 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.16.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/fio/fio_3.17.bb @@ -21,10 +21,9 @@ PACKAGECONFIG_NUMA_armeb = "" PACKAGECONFIG ??= "${PACKAGECONFIG_NUMA}" PACKAGECONFIG[numa] = ",--disable-numa,numactl" -SRCREV = "92f75708b530989fdb13b50be6604f44b80d038d" +SRCREV = "08ce9dc20b8a4e55db7af6d869ddfa49b4a02d03" 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/iozone3/iozone3/0001-let-system-headers-provide-pread64.patch b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/0001-let-system-headers-provide-pread64.patch new file mode 100644 index 0000000000..a61a56a71d --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3/0001-let-system-headers-provide-pread64.patch @@ -0,0 +1,34 @@ +From 64389a67b93a53b9fb7e9e20e905a5ee4613606b Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 15 Jan 2020 17:10:42 -0800 +Subject: [PATCH] let system headers provide pread64() + +The signature does not match with system headers anyway + +Fixes + +iozone.c:1270:9: error: redeclaration of 'pread64' must have the 'overloadable' attribute ssize_t pread64(); ^ /mnt/b/yoe/build/tmp/work/core2-64-yoe-linux/iozone3/488-r0/recipe-sysroot/usr/include/bits/unistd.h:83:1: note: previous overload of function is here pread64 (int __fd, void *const __clang_pass_object_size0 __buf, ^ +1 error generated. + +Upstream-Status: Pending + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + iozone.c | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/iozone.c b/iozone.c +index 090dd5f..fdea400 100644 +--- a/iozone.c ++++ b/iozone.c +@@ -1267,7 +1267,6 @@ int pit_gettimeofday(); + #ifdef HAVE_ANSIC_C + #if defined (HAVE_PREAD) && defined(_LARGEFILE64_SOURCE) + ssize_t pwrite64(); +-ssize_t pread64(); + #endif + #if !defined(linux) + char *getenv(); +-- +2.25.0 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_488.bb b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_488.bb index 5885b145e9..4d9e07765f 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_488.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/iozone3/iozone3_488.bb @@ -8,6 +8,7 @@ LIC_FILES_CHKSUM = "file://iozone.c;beginline=37;endline=48;md5=7331260091868dca " SRC_URI = "http://www.iozone.org/src/current/${BPN}_${PV}.tar \ file://parallelism.patch \ + file://0001-let-system-headers-provide-pread64.patch \ file://copyright.txt \ " SRC_URI[md5sum] = "d60a69e44cda8436f4f94d860958efc2" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch new file mode 100644 index 0000000000..9d52b908e9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/files/0001-tests-add-explicit-permissions-to-open-call.patch @@ -0,0 +1,41 @@ +From d07d2f9601b49bb72cd4b36838f0c238bd1b0fc1 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Wed, 15 Jan 2020 18:45:09 -0800 +Subject: [PATCH] tests: add explicit permissions to open() call + +Fixes +gethugepagesizes.c:227:35: error: open with O_CREAT in second argument needs 3 arguments +| fd = open(fname, O_WRONLY|O_CREAT); +| ^ + +Upstream-Status: Submitted [https://groups.google.com/forum/#!topic/libhugetlbfs/anNtDXbQKro] +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + tests/gethugepagesizes.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/tests/gethugepagesizes.c b/tests/gethugepagesizes.c +index 9551b38..5777265 100644 +--- a/tests/gethugepagesizes.c ++++ b/tests/gethugepagesizes.c +@@ -223,7 +223,7 @@ void setup_fake_data(long sizes[], int n_elem) + FAIL("mkdtemp: %s", strerror(errno)); + + sprintf(fname, "%s/meminfo-none", fake_meminfo); +- fd = open(fname, O_WRONLY|O_CREAT); ++ fd = open(fname, O_WRONLY|O_CREAT, 0600); + if (fd < 0) + FAIL("open: %s", strerror(errno)); + if (write(fd, meminfo_base, +@@ -233,7 +233,7 @@ void setup_fake_data(long sizes[], int n_elem) + FAIL("close: %s", strerror(errno)); + + sprintf(fname, "%s/meminfo-hugepages", fake_meminfo); +- fd = open(fname, O_WRONLY|O_CREAT); ++ fd = open(fname, O_WRONLY|O_CREAT, 0600); + if (fd < 0) + FAIL("open: %s", strerror(errno)); + if (write(fd, meminfo_base, +-- +2.25.0 + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb index f258122790..e66db1a090 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libhugetlbfs/libhugetlbfs_git.bb @@ -24,6 +24,7 @@ SRC_URI = " \ file://0004-shm.c-Mark-glibc-specific-changes-so.patch \ file://0005-Include-dirent.h-for-ino_t.patch \ file://0006-include-limits.h-for-PATH_MAX.patch \ + file://0001-tests-add-explicit-permissions-to-open-call.patch \ " UPSTREAM_CHECK_GITTAGREGEX = "(?P<pver>\d+(\.\d+)+)" |