From cc7fa85ad2faabbe6e9a1548b74e4247fd293352 Mon Sep 17 00:00:00 2001 From: Anuj Mittal Date: Wed, 20 Jan 2021 15:40:58 +0800 Subject: rt-tests/hwlatdetect: upgrade 1.9 -> 1.10 (From OE-Core rev: a831789158881bade4e431d88f54e4ec926d9fbe) Signed-off-by: Anuj Mittal Signed-off-by: Richard Purdie --- ...file-Allow-for-CC-and-AR-to-be-overridden.patch | 10 +++-- ...oslat-Allow-build-for-not-supported-archs.patch | 52 ---------------------- meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb | 26 +++++++++++ meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb | 26 ----------- meta/recipes-rt/rt-tests/rt-tests.inc | 2 +- meta/recipes-rt/rt-tests/rt-tests_1.10.bb | 35 +++++++++++++++ meta/recipes-rt/rt-tests/rt-tests_1.9.bb | 36 --------------- 7 files changed, 68 insertions(+), 119 deletions(-) delete mode 100644 meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch create mode 100644 meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb delete mode 100644 meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb create mode 100644 meta/recipes-rt/rt-tests/rt-tests_1.10.bb delete mode 100644 meta/recipes-rt/rt-tests/rt-tests_1.9.bb diff --git a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch index 8fd94b176c..b177ff7c5f 100644 --- a/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch +++ b/meta/recipes-rt/rt-tests/files/0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch @@ -1,4 +1,4 @@ -From f89d6d6d23e0dacfd0008f686a457d536edc406a Mon Sep 17 00:00:00 2001 +From b608a817df2b652cd5fa1b5a7cf14b7d2d8afd5f Mon Sep 17 00:00:00 2001 From: Randy Witt Date: Fri, 16 Oct 2020 16:54:30 -0700 Subject: [PATCH] Makefile: Allow for CC and AR to be overridden @@ -9,17 +9,16 @@ commit 7763cf316d7896fa05b816a46998f0827ab6e6eb. Signed-off-by: Randy Witt Upstream-Status: Inappropriate [other] - --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile -index c3ebbd7..2176835 100644 +index 636f191..9f57d2c 100644 --- a/Makefile +++ b/Makefile @@ -1,6 +1,6 @@ - VERSION = 1.9 + VERSION = 1.10 -CC = $(CROSS_COMPILE)gcc -AR = $(CROSS_COMPILE)ar +CC ?= $(CROSS_COMPILE)gcc @@ -27,3 +26,6 @@ index c3ebbd7..2176835 100644 OBJDIR = bld +-- +2.29.2 + diff --git a/meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch b/meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch deleted file mode 100644 index 1ee7539f7d..0000000000 --- a/meta/recipes-rt/rt-tests/files/0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch +++ /dev/null @@ -1,52 +0,0 @@ -From 165b597e3003c6870f5980e8902014d9344e6cf3 Mon Sep 17 00:00:00 2001 -From: Peter Xu -Date: Thu, 1 Oct 2020 14:47:26 -0400 -Subject: [PATCH] rt-tests: oslat: Allow build for not supported archs - -Now rt-tests won't build for archs other than x86/i386/ppc64 after oslat is -merged. Instead of failing the build, let's make it pass. However, whenever -oslat is executed, instead of running the real program, dump an error message, -so that people can try to implement the frc() function for it when there's a -real need for the new arch. - -Upstream-Status: Backport [https://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git/commit/?id=165b597e3003c6870f5980e8902014d9344e6cf3] - -Signed-off-by: Peter Xu -Signed-off-by: John Kacur -Signed-off-by: Peter Bergin - ---- - src/oslat/oslat.c | 10 +++++++++- - 1 file changed, 9 insertions(+), 1 deletion(-) - -diff --git a/src/oslat/oslat.c b/src/oslat/oslat.c -index f1a82f2..a8b6155 100644 ---- a/src/oslat/oslat.c -+++ b/src/oslat/oslat.c -@@ -69,7 +69,9 @@ static inline void frc(uint64_t *pval) - __asm__ __volatile__("mfspr %0, 268\n" : "=r" (*pval)); - } - # else --# error Need frc() for this platform. -+# define relax() do { } while (0) -+# define frc(x) -+# define FRC_MISSING - # endif - #else - # error Need to add support for this compiler. -@@ -810,6 +812,12 @@ int main(int argc, char *argv[]) - int i, n_cores; - cpu_set_t cpu_set; - -+#ifdef FRC_MISSING -+ printf("This architecture is not yet supported. " -+ "Please implement frc() function first for %s.\n", argv[0]); -+ return 0; -+#endif -+ - CPU_ZERO(&cpu_set); - - g.app_name = argv[0]; --- -2.25.1 - diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb b/meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb new file mode 100644 index 0000000000..5f61c4ecdd --- /dev/null +++ b/meta/recipes-rt/rt-tests/hwlatdetect_1.10.bb @@ -0,0 +1,26 @@ +SUMMARY = "Hardware latency detector" +DESCRIPTION = "Python utility for controlling the kernel hardware latency detection module (hwlat_detector.ko)." +HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" +SECTION = "tests" +LICENSE = "GPLv2" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +require rt-tests.inc +inherit python3-dir + +EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages" + +do_compile() { + oe_runmake hwlatdetect +} + +do_install() { + oe_runmake install_hwlatdetect DESTDIR=${D} SBINDIR=${sbindir} \ + MANDIR=${mandir} INCLUDEDIR=${includedir} + + sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py +} + +FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py" +RDEPENDS_${PN} = "python3-core " +RRECOMMENDS_${PN} = "kernel-module-hwlat-detector" diff --git a/meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb b/meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb deleted file mode 100644 index 5f61c4ecdd..0000000000 --- a/meta/recipes-rt/rt-tests/hwlatdetect_1.9.bb +++ /dev/null @@ -1,26 +0,0 @@ -SUMMARY = "Hardware latency detector" -DESCRIPTION = "Python utility for controlling the kernel hardware latency detection module (hwlat_detector.ko)." -HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" -SECTION = "tests" -LICENSE = "GPLv2" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -require rt-tests.inc -inherit python3-dir - -EXTRA_OEMAKE += "PYLIB=${libdir}/python${PYTHON_BASEVERSION}/dist-packages" - -do_compile() { - oe_runmake hwlatdetect -} - -do_install() { - oe_runmake install_hwlatdetect DESTDIR=${D} SBINDIR=${sbindir} \ - MANDIR=${mandir} INCLUDEDIR=${includedir} - - sed -i -e '1s,#!.*python.*,#!${bindir}/python3,' ${D}${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py -} - -FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py" -RDEPENDS_${PN} = "python3-core " -RRECOMMENDS_${PN} = "kernel-module-hwlat-detector" diff --git a/meta/recipes-rt/rt-tests/rt-tests.inc b/meta/recipes-rt/rt-tests/rt-tests.inc index 2dd890cf95..9358f13d06 100644 --- a/meta/recipes-rt/rt-tests/rt-tests.inc +++ b/meta/recipes-rt/rt-tests/rt-tests.inc @@ -1,5 +1,5 @@ # Version 1.8 -SRCREV = "21c1df7d2ee199ac619cbb1806a38d15e7e95c09" +SRCREV = "32819581cc0509c9d58c33c3061f57abe0c40c88" PE = "1" SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git;branch=unstable/devel/latest" diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.10.bb b/meta/recipes-rt/rt-tests/rt-tests_1.10.bb new file mode 100644 index 0000000000..2834cabcd4 --- /dev/null +++ b/meta/recipes-rt/rt-tests/rt-tests_1.10.bb @@ -0,0 +1,35 @@ +SUMMARY = "Real-Time preemption testcases" +HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" +SECTION = "tests" +DEPENDS = "linux-libc-headers virtual/libc numactl" +LICENSE = "GPLv2 & GPLv2+" +LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" + +require rt-tests.inc +inherit ptest + +SRC_URI += " \ + file://run-ptest \ + file://rt_bmark.py \ + file://0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch \ + " + +# rt-tests needs PI mutex support in libc +COMPATIBLE_HOST_libc-musl = 'null' + +# Do not install hwlatdetect +EXTRA_OEMAKE += "PYLIB=''" + +do_install() { + oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \ + INCLUDEDIR=${includedir} +} + +do_install_ptest() { + cp ${WORKDIR}/rt_bmark.py ${D}${PTEST_PATH} +} + +RDEPENDS_${PN}-ptest += " stress-ng python3 python3-multiprocessing python3-datetime python3-misc" + +FILES_${PN} += "${prefix}/src/backfire" +RDEPENDS_${PN} += "bash" diff --git a/meta/recipes-rt/rt-tests/rt-tests_1.9.bb b/meta/recipes-rt/rt-tests/rt-tests_1.9.bb deleted file mode 100644 index b916a7fe60..0000000000 --- a/meta/recipes-rt/rt-tests/rt-tests_1.9.bb +++ /dev/null @@ -1,36 +0,0 @@ -SUMMARY = "Real-Time preemption testcases" -HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest" -SECTION = "tests" -DEPENDS = "linux-libc-headers virtual/libc numactl" -LICENSE = "GPLv2 & GPLv2+" -LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe" - -require rt-tests.inc -inherit ptest - -SRC_URI += " \ - file://run-ptest \ - file://rt_bmark.py \ - file://0001-Makefile-Allow-for-CC-and-AR-to-be-overridden.patch \ - file://0001-rt-tests-oslat-Allow-build-for-not-supported-archs.patch \ - " - -# rt-tests needs PI mutex support in libc -COMPATIBLE_HOST_libc-musl = 'null' - -# Do not install hwlatdetect -EXTRA_OEMAKE += "PYLIB=''" - -do_install() { - oe_runmake install DESTDIR=${D} SBINDIR=${sbindir} MANDIR=${mandir} \ - INCLUDEDIR=${includedir} -} - -do_install_ptest() { - cp ${WORKDIR}/rt_bmark.py ${D}${PTEST_PATH} -} - -RDEPENDS_${PN}-ptest += " stress-ng python3 python3-multiprocessing python3-datetime python3-misc" - -FILES_${PN} += "${prefix}/src/backfire" -RDEPENDS_${PN} += "bash" -- cgit v1.2.3-54-g00ecf