diff options
Diffstat (limited to 'meta-openembedded/meta-oe/recipes-benchmark')
15 files changed, 653 insertions, 148 deletions
diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0001-cpuburn-a8.S-Remove-.func-.endfunc.patch b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0001-cpuburn-a8.S-Remove-.func-.endfunc.patch new file mode 100644 index 000000000..82f12fe81 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0001-cpuburn-a8.S-Remove-.func-.endfunc.patch @@ -0,0 +1,69 @@ +From 064a63860bf9ee4bf54facb76ca66f9f957d4797 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jan 2019 11:12:38 -0800 +Subject: [PATCH] cpuburn*.S: Remove .func/.endfunc + +These are needed to generate stabs debug info which we dont use +and are silently ignored by gnu assembler when unused, clang assembler +however barfs, so remove them + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> + +--- + cpuburn-a7.S | 2 -- + cpuburn-a8.S | 2 -- + cpuburn-a9.S | 2 -- + 3 files changed, 6 deletions(-) + +diff --git a/cpuburn-a7.S b/cpuburn-a7.S +index 74e925a..c1e308c 100644 +--- a/cpuburn-a7.S ++++ b/cpuburn-a7.S +@@ -42,7 +42,6 @@ + + .global main + +-.func main + .type main, %function + main: + push {r4-r12, lr} +@@ -88,4 +87,3 @@ main: + + mov r0, #0 + pop {r4-r12, pc} +-.endfunc +diff --git a/cpuburn-a8.S b/cpuburn-a8.S +index c6f93a6..a42f5a5 100644 +--- a/cpuburn-a8.S ++++ b/cpuburn-a8.S +@@ -46,7 +46,6 @@ + /* 16 seems to be a good choice */ + #define STEP 16 + +-.func main + .thumb_func + main: + mov lr, pc +@@ -70,4 +69,3 @@ main: + subs lr, lr, #(STEP * 4) + .endr + bne 0b +-.endfunc +diff --git a/cpuburn-a9.S b/cpuburn-a9.S +index 0338b00..a1ccae5 100644 +--- a/cpuburn-a9.S ++++ b/cpuburn-a9.S +@@ -48,7 +48,6 @@ + /* 64 seems to be a good choice */ + #define STEP 64 + +-.func main + .type main, %function + main: + +@@ -94,4 +93,3 @@ main: + subsne lr, lr, #(STEP * 4) + .endr + bne 0b +-.endfunc diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0002-burn.S-Add.patch b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0002-burn.S-Add.patch new file mode 100644 index 000000000..eb68c9ce9 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0002-burn.S-Add.patch @@ -0,0 +1,47 @@ +From c2adcca93a0075665a8195caad49b89785886e8e Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jan 2019 12:02:22 -0800 +Subject: [PATCH] burn.S: Add + +This is originally from +https://hardwarebug.org/files/burn.S + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + burn.S | 26 ++++++++++++++++++++++++++ + 1 file changed, 26 insertions(+) + create mode 100644 burn.S + +diff --git a/burn.S b/burn.S +new file mode 100644 +index 0000000..c372c87 +--- /dev/null ++++ b/burn.S +@@ -0,0 +1,26 @@ ++ .arch armv7-a ++ .fpu neon ++ ++ .text ++ ++ .global main ++ .type main, STT_FUNC ++ .func main ++main: ++ bic sp, sp, #15 ++1: ++ vld1.8 {q8}, [sp,:128] ++ smuad r6, r4, r5 ++ veor q9, q0, q1 ++ add lr, r4, r5 ++ ldr ip, [sp] ++ vext.8 q10, q3, q4, #1 ++ eor r5, r4, r5 ++ vadd.i32 q11, q0, q1 ++ smusd r6, r4, r5 ++ ldr r2, [sp] ++ vext.8 q12, q1, q2, #3 ++ ssub8 lr, r4, r5 ++ vmul.u16 q13, q0, q4 ++ b 1b ++.endfunc diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0003-burn.S-Remove-.func-.endfunc.patch b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0003-burn.S-Remove-.func-.endfunc.patch new file mode 100644 index 000000000..f351b62c7 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm/0003-burn.S-Remove-.func-.endfunc.patch @@ -0,0 +1,31 @@ +From 078df5b25d75578bb0448ca53514c23debe6d920 Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jan 2019 12:03:11 -0800 +Subject: [PATCH] burn.S: Remove .func/.endfunc + +These are useless on Linux systems where we use dwarf debug info instead +of stabs + +Upstream-Status: Pending +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + burn.S | 2 -- + 1 file changed, 2 deletions(-) + +diff --git a/burn.S b/burn.S +index c372c87..4458f51 100644 +--- a/burn.S ++++ b/burn.S +@@ -5,7 +5,6 @@ + + .global main + .type main, STT_FUNC +- .func main + main: + bic sp, sp, #15 + 1: +@@ -23,4 +22,3 @@ main: + ssub8 lr, r4, r5 + vmul.u16 q13, q0, q4 + b 1b +-.endfunc diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb new file mode 100644 index 000000000..6189da39f --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-arm_git.bb @@ -0,0 +1,38 @@ +SUMMARY = "A collection of cpuburn programs tuned for different ARM hardware" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://cpuburn-a53.S;beginline=1;endline=22;md5=3b7ccd70144c16d3fe14ac491c2d4a87" + +RPROVIDES_${PN} = "cpuburn-neon" +PROVIDES += "cpuburn-neon" + +SRCREV = "ad7e646700d14b81413297bda02fb7fe96613c3f" + +PV = "1.0+git${SRCPV}" + +SRC_URI = "git://github.com/ssvb/cpuburn-arm.git \ + file://0001-cpuburn-a8.S-Remove-.func-.endfunc.patch \ + file://0002-burn.S-Add.patch \ + file://0003-burn.S-Remove-.func-.endfunc.patch \ + " + +S = "${WORKDIR}/git" + +do_compile() { + ${CC} ${CFLAGS} ${LDFLAGS} burn.S -o burn + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a7.S -o burn-a7 + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a8.S -o burn-a8 + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a9.S -o burn-a9 + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a53.S -o burn-a53 + ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-krait.S -o burn-krait +} + +do_install() { + install -d ${D}${bindir} + for f in burn burn-a7 burn-a8 burn-a9 burn-a53 burn-krait; do + install -m 0755 $f ${D}${bindir}/$f + done +} + +COMPATIBLE_MACHINE ?= "(^$)" +COMPATIBLE_MACHINE_armv7a = "(.*)" +COMPATIBLE_MACHINE_armv7ve = "(.*)" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon_20140626.bb b/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon_20140626.bb deleted file mode 100644 index 14e3fc4f3..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/cpuburn/cpuburn-neon_20140626.bb +++ /dev/null @@ -1,30 +0,0 @@ -SUMMARY = "CPU burn app that loads the NEON coprocessor fully" -LICENSE = "MIT" -LIC_FILES_CHKSUM = "file://burn.S;md5=823abc72c2cd448e87df9bc5355a4456" - -DL_DIR_append = "/${PN}-${PV}" - -# Ensure to make this available for machine which has neon -COMPATIBLE_MACHINE = "(${@bb.utils.contains("TUNE_FEATURES", "neon", "${MACHINE}", "Invalid!", d)})" - -SRC_URI = "http://hardwarebug.org/files/burn.S;name=mru \ - https://raw.githubusercontent.com/ssvb/cpuburn-arm/dd5c5ba58d2b0b23cfab4a286f9d3f5510000f20/cpuburn-a8.S;name=ssvb" - -SRC_URI[mru.md5sum] = "823abc72c2cd448e87df9bc5355a4456" -SRC_URI[mru.sha256sum] = "01d9fc04f83740c513c25401dcc89c11b2a5a6013e70bfca42b7b02129f88cd2" -SRC_URI[ssvb.md5sum] = "ba0ef2939a3b3b487523448c67544e94" -SRC_URI[ssvb.sha256sum] = "ce42ebdc71c876a33d9f7534355ef76cefa0d00ddb19ad69cf05a266c861d08d" - -S = "${WORKDIR}" - -do_compile() { - ${CC} ${CFLAGS} ${LDFLAGS} burn.S -o burn - ${CC} ${CFLAGS} ${LDFLAGS} cpuburn-a8.S -o burn-neona8 -} - -do_install() { - install -d ${D}${bindir} - install -m 0755 ${S}/burn ${D}${bindir}/burn-neon - install -m 0755 ${S}/burn-neona8 ${D}${bindir}/ -} - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch deleted file mode 100644 index cdf09faec..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/0001-Fix-clang-warnings.patch +++ /dev/null @@ -1,31 +0,0 @@ -From 35e9f80518d666db5f9c62e8072ffbc307b4af4f Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Sat, 26 Aug 2017 08:30:01 -0700 -Subject: [PATCH] Fix clang warnings - -../src/native-state-drm.cpp:334:20: error: cannot pass object of non-trivial type 'std::__cxx11::basic_string<char>' through variadic function; call will abort at runtime [-Wnon-pod-varargs] - dev_path); - ^ -1 error generated. - -Signed-off-by: Khem Raj <raj.khem@gmail.com> ---- - src/native-state-drm.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/native-state-drm.cpp b/src/native-state-drm.cpp -index dc2b323..62566ee 100644 ---- a/src/native-state-drm.cpp -+++ b/src/native-state-drm.cpp -@@ -331,7 +331,7 @@ static int open_using_udev_scan() - if (!valid_fd(fd)) { - // %m is GLIBC specific... Maybe use strerror here... - Log::error("Tried to use '%s' but failed.\nReason : %m", -- dev_path); -+ dev_path.c_str()); - } - else - Log::debug("Success!\n"); --- -2.14.1 - diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch deleted file mode 100644 index 7de05ee58..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/Fix-configure-for-sqrt-check.patch +++ /dev/null @@ -1,21 +0,0 @@ -From 9fb298c398f88a63d71432be1410d52fae089063 Mon Sep 17 00:00:00 2001 -From: Tom Hochstein <tom.hochstein@nxp.com> -Date: Mon, 8 Aug 2016 11:39:54 -0500 - ---- - wscript | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/wscript b/wscript -index ca843f4..eb4a26a 100644 ---- a/wscript -+++ b/wscript -@@ -84,7 +84,7 @@ def configure(ctx): - ctx.check_cc(lib = lib, uselib_store = uselib) - - # Check required functions -- req_funcs = [('memset', 'string.h', []) ,('sqrt', 'math.h', ['m'])] -+ req_funcs = [('memset', 'string.h', [])] - for func, header, uselib in req_funcs: - ctx.check_cc(function_name = func, header_name = header, - uselib = uselib, mandatory = True) diff --git a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch deleted file mode 100644 index 72b8debe5..000000000 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/files/build-Check-packages-to-be-used-by-the-enabled-flavo.patch +++ /dev/null @@ -1,43 +0,0 @@ -From: Otavio Salvador <otavio@ossystems.com.br> -Subject: [PATCH] build: Check packages to be used by the enabled flavors -Organization: O.S. Systems Software LTDA. - -The packages shouldn't be dynamically detected otherwise the build -predictability is lost. We now have all packages as mandatory but -dependent of the flavors which use them. - -Upstream-Status: Submitted [https://github.com/glmark2/glmark2/pull/8] - -Signed-off-by: Otavio Salvador <otavio@ossystems.com.br> ---- - wscript | 10 +++++++--- - 1 file changed, 7 insertions(+), 3 deletions(-) - -diff --git a/wscript b/wscript -index cab62a3..e7eaed0 100644 ---- a/wscript -+++ b/wscript -@@ -121,13 +121,17 @@ def configure(ctx): - ('mirclient','mirclient', '0.13', list_contains(ctx.options.flavors, 'mir')), - ('wayland-client','wayland-client', None, list_contains(ctx.options.flavors, 'wayland')), - ('wayland-egl','wayland-egl', None, list_contains(ctx.options.flavors, 'wayland'))] -- for (pkg, uselib, atleast, mandatory) in opt_pkgs: -+ for (pkg, uselib, atleast, check) in opt_pkgs: -+ # Check packages required by the flavors -+ if not check: -+ continue -+ - if atleast is None: - ctx.check_cfg(package = pkg, uselib_store = uselib, -- args = '--cflags --libs', mandatory = mandatory) -+ args = '--cflags --libs', mandatory = True) - else: - ctx.check_cfg(package = pkg, uselib_store = uselib, atleast_version=atleast, -- args = '--cflags --libs', mandatory = mandatory) -+ args = '--cflags --libs', mandatory = True) - - - # Prepend CXX flags so that they can be overriden by the --- -2.4.6 - 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 99050e704..7ed5cd028 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/glmark2/glmark2_git.bb @@ -10,16 +10,12 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504 \ DEPENDS = "libpng jpeg udev" -PV = "2017.07+${SRCPV}" +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 \ - file://build-Check-packages-to-be-used-by-the-enabled-flavo.patch \ - file://Fix-configure-for-sqrt-check.patch \ - file://0001-Fix-clang-warnings.patch \ - " -SRCREV = "ed20c633f1926d1dd78e3e89043c85a81302cbe6" +SRC_URI = "git://github.com/glmark2/glmark2.git;protocol=https" +SRCREV = "0c90dd48df43a6b0db1d9aabca6298240f4968f7" S = "${WORKDIR}/git" @@ -31,9 +27,6 @@ PACKAGECONFIG ?= "${@bb.utils.contains('DISTRO_FEATURES', 'x11 opengl', 'x11-gl ${@bb.utils.contains('DISTRO_FEATURES', 'wayland opengl', 'wayland-gl wayland-gles2', '', d)} \ drm-gl drm-gles2" -# Enable C++11 features -CXXFLAGS += "-std=c++11" - PACKAGECONFIG[x11-gl] = ",,virtual/libgl virtual/libx11" PACKAGECONFIG[x11-gles2] = ",,virtual/libgles2 virtual/libx11" PACKAGECONFIG[drm-gl] = ",,virtual/libgl libdrm virtual/libgbm" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_20110206.bb b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb index f534c73b5..e81389431 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_20110206.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/libc-bench/libc-bench_git.bb @@ -3,15 +3,19 @@ DESCRIPTION = "libc-bench is a set of time- and memory-efficiency tests to compa implementations of various C/POSIX standard library functions." HOMEPAGE = "http://www.etalabs.net/libc-bench.html" SECTION = "console/utils" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://Makefile;md5=e12f113da27dfe9cfb6c2c537da8d8df" +LICENSE = "MIT" +LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=9a825c63897c53f487ef900598c31527" -SRC_URI = "http://www.etalabs.net/releases/${BPN}-${PV}.tar.gz" +SRCREV = "b6b2ce5f9f87a09b14499cb00c600c601f022634" +PV = "20110206+git${SRCPV}" -SRC_URI[md5sum] = "f763de90f95fe68e4e03e5b6f49698ac" -SRC_URI[sha256sum] = "6825260aa5f15f4fbc7957ec578e9c859cbbe210e025ec74c4a0d05677523794" +SRC_URI = "git://git.musl-libc.org/libc-bench \ + " + +S = "${WORKDIR}/git" do_install () { install -d ${D}${bindir} install -m 0755 ${B}/libc-bench ${D}${bindir} } + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb b/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb index 22bb0416a..b4d55be1b 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/nbench-byte/nbench-byte_2.2.3.bb @@ -7,7 +7,7 @@ LICENSE = "nbench-byte" LIC_FILES_CHKSUM = "file://README;beginline=57;endline=66;md5=020ef579f8fa5746b7e307a54707834f" SECTION = "console/utils" -SRC_URI = "https://fossies.org/linux/misc/${BP}.tar.gz \ +SRC_URI = "https://fossies.org/linux/misc/old/${BP}.tar.gz \ file://nbench_32bits.patch \ file://Makefile-add-more-dependencies-to-pointer.h.patch" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.0.1.bb b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.6.0.bb index b1fa51bf0..4c7b05752 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.0.1.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/phoronix-test-suite/phoronix-test-suite_8.6.0.bb @@ -6,8 +6,8 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=d32239bcb673463ab874e80d47fae504" SECTION = "console/tests" SRC_URI = "http://www.phoronix-test-suite.com/releases/${BP}.tar.gz" -SRC_URI[md5sum] = "3dc3a0e490e909f188379a9e05fd4780" -SRC_URI[sha256sum] = "6306549109c7254baf31edb385265b19557b5692217d2dfcf96f6fb17de8e842" +SRC_URI[md5sum] = "a3d9e81f5abc1921d3aaf710ac4f4046" +SRC_URI[sha256sum] = "acb9dfcf4a3452aaf82cce59ccc04fa4cf51a43617a6cca9d1f9c5c670a5655d" S = "${WORKDIR}/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 77d172814..47d21d36c 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,7 +2,7 @@ SUMMARY = "Small collection of benchmarks for storage I/O" LICENSE = "GPLv2" LIC_FILES_CHKSUM = "file://COPYING;md5=b529aaa6a0c50f15d29f89609b5c22f3" -SRCREV = "79698f645bfb28d0d966484ddad3a1efb562246d" +SRCREV = "d05006865f68829fa7603bdb92bd51649f5ba1b6" PV = "0.0+git${SRCPV}" SRC_URI = "git://github.com/Algodev-github/S.git;protocol=https;branch=master" @@ -17,11 +17,13 @@ do_install() { install -m0755 -p ${S}/$(basename $i)/* ${D}/opt/S-suite/$(basename $i) done + install -m0755 ${S}/def_config.sh ${D}/opt/S-suite install -m0755 ${S}/config_params.sh ${D}/opt/S-suite - install -m0755 ${S}/def_config_params.sh ${D}/opt/S-suite + install -m0755 ${S}/process_config.sh ${D}/opt/S-suite } -RDEPENDS_${PN} = "bash bc coreutils gawk g++ gcc fio libaio libaio-dev sysstat" +RDEPENDS_${PN} = "bash bc coreutils gawk g++ gcc fio libaio libaio-dev sysstat \ + git" FILES_${PN} = "/opt/S-suite/" diff --git a/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench/0001-asm-Delete-.func-.endfunc-directives.patch b/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench/0001-asm-Delete-.func-.endfunc-directives.patch new file mode 100644 index 000000000..c09070076 --- /dev/null +++ b/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench/0001-asm-Delete-.func-.endfunc-directives.patch @@ -0,0 +1,444 @@ +From b0a64ddebb517a1678c44d9baf24d8bbe39d02cd Mon Sep 17 00:00:00 2001 +From: Khem Raj <raj.khem@gmail.com> +Date: Tue, 29 Jan 2019 13:15:07 -0800 +Subject: [PATCH] asm: Delete .func/.endfunc directives + +These are useful only with stabs debug format, which is not used on +linux systems, gas ignores them silently, but clang assembler does not +and rightly so. + +Signed-off-by: Khem Raj <raj.khem@gmail.com> +--- + aarch64-asm.S | 14 +------------- + arm-neon.S | 24 ------------------------ + mips-32.S | 5 ++--- + x86-sse2.S | 21 ++++++++++----------- + 4 files changed, 13 insertions(+), 51 deletions(-) + +diff --git a/aarch64-asm.S b/aarch64-asm.S +index 842b9e2..165c8ac 100644 +--- a/aarch64-asm.S ++++ b/aarch64-asm.S +@@ -31,8 +31,7 @@ + + .macro asm_function function_name + .global \function_name +- .type \function_name,%function +-.func \function_name ++ .type \function_name,%function + \function_name: + DST .req x0 + SRC .req x1 +@@ -54,7 +53,6 @@ asm_function aligned_block_copy_ldpstp_x_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + asm_function aligned_block_copy_ldpstp_q_aarch64 + 0: +@@ -67,7 +65,6 @@ asm_function aligned_block_copy_ldpstp_q_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + asm_function aligned_block_copy_ldpstp_q_pf32_l2strm_aarch64 + 0: +@@ -82,7 +79,6 @@ asm_function aligned_block_copy_ldpstp_q_pf32_l2strm_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + asm_function aligned_block_copy_ldpstp_q_pf64_l2strm_aarch64 + 0: +@@ -96,7 +92,6 @@ asm_function aligned_block_copy_ldpstp_q_pf64_l2strm_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + asm_function aligned_block_copy_ldpstp_q_pf32_l1keep_aarch64 + 0: +@@ -111,7 +106,6 @@ asm_function aligned_block_copy_ldpstp_q_pf32_l1keep_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + asm_function aligned_block_copy_ldpstp_q_pf64_l1keep_aarch64 + 0: +@@ -125,7 +119,6 @@ asm_function aligned_block_copy_ldpstp_q_pf64_l1keep_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + asm_function aligned_block_fill_stp_x_aarch64 + 0: +@@ -137,7 +130,6 @@ asm_function aligned_block_fill_stp_x_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + asm_function aligned_block_fill_stp_q_aarch64 + 0: +@@ -147,7 +139,6 @@ asm_function aligned_block_fill_stp_q_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + asm_function aligned_block_fill_stnp_x_aarch64 + 0: +@@ -159,7 +150,6 @@ asm_function aligned_block_fill_stnp_x_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + asm_function aligned_block_fill_stnp_q_aarch64 + 0: +@@ -169,7 +159,6 @@ asm_function aligned_block_fill_stnp_q_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + asm_function aligned_block_copy_ld1st1_aarch64 + 0: +@@ -180,6 +169,5 @@ asm_function aligned_block_copy_ld1st1_aarch64 + subs SIZE, SIZE, #64 + bgt 0b + ret +-.endfunc + + #endif +diff --git a/arm-neon.S b/arm-neon.S +index 4db78ce..9631d82 100644 +--- a/arm-neon.S ++++ b/arm-neon.S +@@ -32,7 +32,6 @@ + + .macro asm_function function_name + .global \function_name +-.func \function_name + \function_name: + DST .req r0 + SRC .req r1 +@@ -66,7 +65,6 @@ asm_function aligned_block_read_neon + vpadd.u32 d31, d31, d31 + vmov.u32 r0, d31[0] + bx lr +-.endfunc + + /* Actually this calculates a sum of 32-bit values */ + asm_function aligned_block_read_pf32_neon +@@ -97,7 +95,6 @@ asm_function aligned_block_read_pf32_neon + vpadd.u32 d31, d31, d31 + vmov.u32 r0, d31[0] + bx lr +-.endfunc + + /* Actually this calculates a sum of 32-bit values */ + asm_function aligned_block_read_pf64_neon +@@ -127,7 +124,6 @@ asm_function aligned_block_read_pf64_neon + vpadd.u32 d31, d31, d31 + vmov.u32 r0, d31[0] + bx lr +-.endfunc + + /* Actually this calculates a sum of 32-bit values */ + asm_function aligned_block_read2_neon +@@ -156,7 +152,6 @@ asm_function aligned_block_read2_neon + vpadd.u32 d31, d31, d31 + vmov.u32 r0, d31[0] + bx lr +-.endfunc + + /* Actually this calculates a sum of 32-bit values */ + asm_function aligned_block_read2_pf32_neon +@@ -187,7 +182,6 @@ asm_function aligned_block_read2_pf32_neon + vpadd.u32 d31, d31, d31 + vmov.u32 r0, d31[0] + bx lr +-.endfunc + + /* Actually this calculates a sum of 32-bit values */ + asm_function aligned_block_read2_pf64_neon +@@ -217,7 +211,6 @@ asm_function aligned_block_read2_pf64_neon + vpadd.u32 d31, d31, d31 + vmov.u32 r0, d31[0] + bx lr +-.endfunc + + asm_function aligned_block_copy_neon + 0: +@@ -226,7 +219,6 @@ asm_function aligned_block_copy_neon + subs SIZE, SIZE, #32 + bgt 0b + bx lr +-.endfunc + + asm_function aligned_block_copy_unrolled_neon + vpush {d8-d15} +@@ -244,7 +236,6 @@ asm_function aligned_block_copy_unrolled_neon + bgt 0b + vpop {d8-d15} + bx lr +-.endfunc + + asm_function aligned_block_copy_pf32_neon + 0: +@@ -254,7 +245,6 @@ asm_function aligned_block_copy_pf32_neon + subs SIZE, SIZE, #32 + bgt 0b + bx lr +-.endfunc + + asm_function aligned_block_copy_unrolled_pf32_neon + vpush {d8-d15} +@@ -280,7 +270,6 @@ asm_function aligned_block_copy_unrolled_pf32_neon + bgt 0b + vpop {d8-d15} + bx lr +-.endfunc + + asm_function aligned_block_copy_pf64_neon + 0: +@@ -292,7 +281,6 @@ asm_function aligned_block_copy_pf64_neon + subs SIZE, SIZE, #64 + bgt 0b + bx lr +-.endfunc + + asm_function aligned_block_copy_unrolled_pf64_neon + vpush {d8-d15} +@@ -314,7 +302,6 @@ asm_function aligned_block_copy_unrolled_pf64_neon + bgt 0b + vpop {d8-d15} + bx lr +-.endfunc + + asm_function aligned_block_copy_backwards_neon + add SRC, SRC, SIZE +@@ -328,7 +315,6 @@ asm_function aligned_block_copy_backwards_neon + subs SIZE, SIZE, #32 + bgt 0b + bx lr +-.endfunc + + asm_function aligned_block_copy_backwards_pf32_neon + add SRC, SRC, SIZE +@@ -343,7 +329,6 @@ asm_function aligned_block_copy_backwards_pf32_neon + subs SIZE, SIZE, #32 + bgt 0b + bx lr +-.endfunc + + asm_function aligned_block_copy_backwards_pf64_neon + add SRC, SRC, SIZE +@@ -360,7 +345,6 @@ asm_function aligned_block_copy_backwards_pf64_neon + subs SIZE, SIZE, #64 + bgt 0b + bx lr +-.endfunc + + asm_function aligned_block_fill_neon + vld1.8 {d0, d1, d2, d3}, [SRC]! +@@ -370,7 +354,6 @@ asm_function aligned_block_fill_neon + subs SIZE, SIZE, #64 + bgt 0b + bx lr +-.endfunc + + asm_function aligned_block_fill_backwards_neon + add SRC, SRC, SIZE +@@ -383,7 +366,6 @@ asm_function aligned_block_fill_backwards_neon + subs SIZE, SIZE, #32 + bgt 0b + bx lr +-.endfunc + + /* some code for older ARM processors */ + +@@ -398,7 +380,6 @@ asm_function aligned_block_fill_stm4_armv4 + subs SIZE, SIZE, #64 + bgt 0b + pop {r4-r12, pc} +-.endfunc + + asm_function aligned_block_fill_stm8_armv4 + push {r4-r12, lr} +@@ -409,7 +390,6 @@ asm_function aligned_block_fill_stm8_armv4 + subs SIZE, SIZE, #64 + bgt 0b + pop {r4-r12, pc} +-.endfunc + + asm_function aligned_block_fill_strd_armv5te + push {r4-r12, lr} +@@ -426,7 +406,6 @@ asm_function aligned_block_fill_strd_armv5te + subs SIZE, SIZE, #64 + bgt 0b + pop {r4-r12, pc} +-.endfunc + + asm_function aligned_block_copy_incr_armv5te + push {r4-r12, lr} +@@ -442,7 +421,6 @@ asm_function aligned_block_copy_incr_armv5te + stmia DST!, {r8-r11} + bgt 0b + pop {r4-r12, pc} +-.endfunc + + asm_function aligned_block_copy_wrap_armv5te + push {r4-r12, lr} +@@ -458,7 +436,6 @@ asm_function aligned_block_copy_wrap_armv5te + stmia DST!, {r8-r11} + bgt 0b + pop {r4-r12, pc} +-.endfunc + + asm_function aligned_block_copy_vfp + push {r4-r12, lr} +@@ -470,6 +447,5 @@ asm_function aligned_block_copy_vfp + bgt 0b + vpop {d8-d15} + pop {r4-r12, pc} +-.endfunc + + #endif +diff --git a/mips-32.S b/mips-32.S +index 17b2b7f..4f7ddae 100644 +--- a/mips-32.S ++++ b/mips-32.S +@@ -32,7 +32,6 @@ + .macro asm_function function_name + .global \function_name + .type \function_name, @function +- .func \function_name + \function_name: + .endm + +@@ -93,7 +92,7 @@ asm_function aligned_block_fill_pf32_mips32 + 2: + jr $ra + nop +-.endfunc ++ + + /* + * void aligned_block_copy_pf32_mips32(int64_t *dst, int64_t *src, int size) +@@ -178,6 +177,6 @@ asm_function aligned_block_copy_pf32_mips32 + lw $s7, 28($sp) + jr $ra + addi $sp, $sp, 32 +-.endfunc ++ + + #endif +diff --git a/x86-sse2.S b/x86-sse2.S +index d8840e4..409031b 100644 +--- a/x86-sse2.S ++++ b/x86-sse2.S +@@ -30,7 +30,6 @@ + + .macro asm_function_helper function_name + .global \function_name +-.func \function_name + \function_name: + #ifdef __amd64__ + #ifdef _WIN64 +@@ -90,7 +89,7 @@ asm_function aligned_block_copy_movsb + pop3 edi esi ecx + #endif + ret +-.endfunc ++ + + asm_function aligned_block_copy_movsd + 0: +@@ -110,7 +109,7 @@ asm_function aligned_block_copy_movsd + pop3 edi esi ecx + #endif + ret +-.endfunc ++ + + asm_function aligned_block_copy_sse2 + 0: +@@ -127,7 +126,7 @@ asm_function aligned_block_copy_sse2 + sub SIZE, 64 + jg 0b + ret +-.endfunc ++ + + asm_function aligned_block_copy_nt_sse2 + 0: +@@ -144,7 +143,7 @@ asm_function aligned_block_copy_nt_sse2 + sub SIZE, 64 + jg 0b + ret +-.endfunc ++ + + asm_function aligned_block_copy_pf32_sse2 + 0: +@@ -163,7 +162,7 @@ asm_function aligned_block_copy_pf32_sse2 + sub SIZE, 64 + jg 0b + ret +-.endfunc ++ + + asm_function aligned_block_copy_nt_pf32_sse2 + 0: +@@ -182,7 +181,7 @@ asm_function aligned_block_copy_nt_pf32_sse2 + sub SIZE, 64 + jg 0b + ret +-.endfunc ++ + + asm_function aligned_block_copy_pf64_sse2 + 0: +@@ -200,7 +199,7 @@ asm_function aligned_block_copy_pf64_sse2 + sub SIZE, 64 + jg 0b + ret +-.endfunc ++ + + asm_function aligned_block_copy_nt_pf64_sse2 + 0: +@@ -218,7 +217,7 @@ asm_function aligned_block_copy_nt_pf64_sse2 + sub SIZE, 64 + jg 0b + ret +-.endfunc ++ + + asm_function aligned_block_fill_sse2 + movdqa xmm0, [SRC + 0] +@@ -231,7 +230,7 @@ asm_function aligned_block_fill_sse2 + sub SIZE, 64 + jg 0b + ret +-.endfunc ++ + + asm_function aligned_block_fill_nt_sse2 + movdqa xmm0, [SRC + 0] +@@ -244,7 +243,7 @@ asm_function aligned_block_fill_nt_sse2 + sub SIZE, 64 + jg 0b + ret +-.endfunc ++ + + /*****************************************************************************/ + diff --git a/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb b/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb index 8cb59da73..2ce10f9c4 100644 --- a/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb +++ b/meta-openembedded/meta-oe/recipes-benchmark/tinymembench/tinymembench_git.bb @@ -8,8 +8,10 @@ LIC_FILES_CHKSUM = "file://main.c;endline=22;md5=879b9bbb60851454885b5fa47eb6b34 PV = "0.4.0+git${SRCPV}" -SRCREV = "2c789849709d837b4bd114c11ed2d9bdc65afbc6" -SRC_URI = "git://github.com/ssvb/tinymembench.git" +SRCREV = "a2cf6d7e382e3aea1eb39173174d9fa28cad15f3" +SRC_URI = "git://github.com/ssvb/tinymembench.git \ + file://0001-asm-Delete-.func-.endfunc-directives.patch \ + " S = "${WORKDIR}/git" |
