summaryrefslogtreecommitdiffstats
path: root/yocto-poky/meta/recipes-rt
diff options
context:
space:
mode:
authorPatrick Williams <patrick@stwcx.xyz>2016-08-17 14:31:25 -0500
committerPatrick Williams <patrick@stwcx.xyz>2016-08-22 16:43:26 +0000
commit60f9d69e016b11c468c98ea75ba0a60c44afbbc4 (patch)
treeecb49581a9e41a37943c22cd9ef3f63451b20ee7 /yocto-poky/meta/recipes-rt
parente18c61205e0234b03697129c20cc69c9b3940efc (diff)
downloadblackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.tar.gz
blackbird-openbmc-60f9d69e016b11c468c98ea75ba0a60c44afbbc4.zip
yocto-poky: Move to import-layers subdir
We are going to import additional layers, so create a subdir to hold all of the layers that we import with git-subtree. Change-Id: I6f732153a22be8ca663035c518837e3cc5ec0799 Signed-off-by: Patrick Williams <patrick@stwcx.xyz>
Diffstat (limited to 'yocto-poky/meta/recipes-rt')
-rw-r--r--yocto-poky/meta/recipes-rt/README13
-rw-r--r--yocto-poky/meta/recipes-rt/images/core-image-rt-sdk.bb12
-rw-r--r--yocto-poky/meta/recipes-rt/images/core-image-rt.bb9
-rw-r--r--yocto-poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch30
-rwxr-xr-xyocto-poky/meta/recipes-rt/rt-tests/files/rt_bmark.py412
-rw-r--r--yocto-poky/meta/recipes-rt/rt-tests/files/run-ptest3
-rw-r--r--yocto-poky/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb23
-rw-r--r--yocto-poky/meta/recipes-rt/rt-tests/rt-tests.inc13
-rw-r--r--yocto-poky/meta/recipes-rt/rt-tests/rt-tests_0.96.bb33
9 files changed, 0 insertions, 548 deletions
diff --git a/yocto-poky/meta/recipes-rt/README b/yocto-poky/meta/recipes-rt/README
deleted file mode 100644
index 7d7558de4..000000000
--- a/yocto-poky/meta/recipes-rt/README
+++ /dev/null
@@ -1,13 +0,0 @@
-The recipes-rt recipes provide package and image recipes for using and testing
-the PREEMPT_RT kernel. The core-image-rt*.bb images are minimal images with
-a couple extra packages, including rt-tests. In order to build the image with
-the linux-yocto-rt kernel, be sure to include the following line in your
-local.conf, bblayers.conf, or your $MACHINE.conf.
-
-PREFERRED_PROVIDER_virtual/kernel = "linux-yocto-rt"
-
-If you are creating a new BSP which should use linux-yocto-rt by default,
-use the line above in the $MACHINE.conf in your BSP layer, and specify the
-following in a linux-yocto-rt bbappend recipe:
-
-COMPATIBLE_MACHINE_$MACHINE = $MACHINE
diff --git a/yocto-poky/meta/recipes-rt/images/core-image-rt-sdk.bb b/yocto-poky/meta/recipes-rt/images/core-image-rt-sdk.bb
deleted file mode 100644
index db7d58183..000000000
--- a/yocto-poky/meta/recipes-rt/images/core-image-rt-sdk.bb
+++ /dev/null
@@ -1,12 +0,0 @@
-require recipes-core/images/core-image-minimal.bb
-
-DESCRIPTION = "Small image capable of booting a device with a test suite and \
-tools for real-time use. It includes the full meta-toolchain, development \
-headers and libraries to form a standalone SDK."
-DEPENDS = "linux-yocto-rt"
-
-IMAGE_FEATURES += "dev-pkgs tools-sdk tools-debug eclipse-debug tools-profile tools-testapps debug-tweaks"
-
-IMAGE_INSTALL += "rt-tests hwlatdetect kernel-dev"
-
-LICENSE = "MIT"
diff --git a/yocto-poky/meta/recipes-rt/images/core-image-rt.bb b/yocto-poky/meta/recipes-rt/images/core-image-rt.bb
deleted file mode 100644
index cab6f8b74..000000000
--- a/yocto-poky/meta/recipes-rt/images/core-image-rt.bb
+++ /dev/null
@@ -1,9 +0,0 @@
-require recipes-core/images/core-image-minimal.bb
-
-DESCRIPTION = "A small image just capable of allowing a device to boot plus a \
-real-time test suite and tools appropriate for real-time use."
-DEPENDS = "linux-yocto-rt"
-
-IMAGE_INSTALL += "rt-tests hwlatdetect"
-
-LICENSE = "MIT"
diff --git a/yocto-poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch b/yocto-poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch
deleted file mode 100644
index 00fcc7d72..000000000
--- a/yocto-poky/meta/recipes-rt/rt-tests/files/0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 9640dde4241e1314b8e8ea35b0c8dab0b30ae51f Mon Sep 17 00:00:00 2001
-From: Khem Raj <raj.khem@gmail.com>
-Date: Sun, 3 Jan 2016 10:50:56 -0800
-Subject: [PATCH] Makefile: Set CC/AR variable only if it doesn't have a value
-
-This helps it compile with clang or any other compilers besides gcc
-
-Signed-off-by: Khem Raj <raj.khem@gmail.com>
----
-Upstream-Status: Submitted
-
- Makefile | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 1e4b7d1..2c2d396 100644
---- a/Makefile
-+++ b/Makefile
-@@ -1,6 +1,6 @@
- VERSION = 0.96
--CC=$(CROSS_COMPILE)gcc
--AR=$(CROSS_COMPILE)ar
-+CC?=$(CROSS_COMPILE)gcc
-+AR?=$(CROSS_COMPILE)ar
-
- OBJDIR = bld
-
---
-2.6.4
-
diff --git a/yocto-poky/meta/recipes-rt/rt-tests/files/rt_bmark.py b/yocto-poky/meta/recipes-rt/rt-tests/files/rt_bmark.py
deleted file mode 100755
index e2280e43e..000000000
--- a/yocto-poky/meta/recipes-rt/rt-tests/files/rt_bmark.py
+++ /dev/null
@@ -1,412 +0,0 @@
-#!/usr/bin/python
-# -*- coding: utf-8 -*-
-
-# SPDX-License-Identifier: BSD-3-Clause
-# Copyright (C) 2015 Enea Software AB
-# Author: Thomas Lundström <thomas.lundstrom@enea.com>
-
-# The script measures interrupt latency together with different types of
-# system load. This is done using the programs cyclictest and stress.
-#
-# The main output is:
-#
-# Best case (min) latency
-# This has very limited value, but is presented since it can be done
-# easily
-#
-# Average latency
-# This value is of interrest for throughput oriented systems. Limited
-# value for a real-time system. Also presented because it is easy to do.
-#
-# Worst case (max) latency
-# This is the interesting number for a real-time system. The number
-# presented is (of cource) the largest number observed. The challenge
-# is to know how the observed worst case relates to the actual worst case.
-#
-# To get an indication of the confidence, the following method is used:
-# 1) Instead of one long run, the measurement is made as a set of shorter
-# runs. The number of runs must be a power of 2 for reasons that will
-# shorlty be obvious
-#
-# 2) First, a list of the max values are created.
-#
-# 3) The smallest value in that list is recorded.
-#
-# 4) Then a new list is create by taking the max value of each pair of
-# values in the original list. In this list the smallest value is
-# recorded.
-#
-# 5) Step 3 is repeated until there is only one value in the list. See
-# example below:
-#
-# Samples:
-# | 44 | | | | |
-# | 77 | 77 | | | |
-# | 118 | | | | |
-# | 119 | 119 | 119 | | |
-# | 138 | | | | |
-# | 57 | 138 | | | |
-# | 175 | | | | |
-# | 130 | 175 | 175 | 175 | |
-# | 54 | | | | |
-# | 150 | 150 | | | |
-# | 47 | | | | |
-# | 59 | 59 | 150 | | |
-# | 199 | | | | |
-# | 115 | 199 | | | |
-# | 177 | | | | |
-# | 129 | 177 | 199 | 199 | 199 |
-#
-# Smallest value:
-# | 44 | 59 | 119 | 175 | 199 |
-#
-# 6) The generated list of smallest values is analyzed. In this case, it
-# can be observed that the values are increasing significantly through
-# the entire list, which leads to the conclusion that the number of
-# samples is too small.
-# If instead the list had been (167, 191, 196, 199, 199), there had
-# been a very small, or no, increase at the end of the list. We might
-# then suspect that the number of samples is probably large enough.
-# There is however no guarantee for that.
-#
-# Steps 1-2 are done in run_cyclictest_suite
-# Steps 3-5 are done in gen_minmax_list.
-# Step 6 needs to be done manually since there is (yet) no well defined
-# FAIL criterion and a theoretically solid PASS criterion may never be
-# available.
-
-import multiprocessing
-import os
-import re
-import signal
-import subprocess
-import time
-import traceback
-
-# See comment on the function set_hung_tmo
-has_hung_task_detection = True
-
-#-------------------------------------------------------------------------------
-
-class TestFail(Exception):
- def __init__(self, msg):
- self.msg = msg
-
- def __str__(self):
- return "Test failure: (" + self.msg + ")"
-
-#-------------------------------------------------------------------------------
-
-def tc_name(sub_name):
- return "rt_bmark.intlat." + sub_name
-
-#-------------------------------------------------------------------------------
-# log() does the same job as print except that a '#' is added at the beginning
-# of each line. This causes TEFEL to ignore it
-
-def log(*msg):
- tmp = "".join(map(str, msg)) # 'map(str, ...' allows numbers
- for line in tmp.split("\n"):
- print "#", line
-
-#-------------------------------------------------------------------------------
-# Like log(), but with a timestamp added
-
-def log_ts(*msg):
- ts = time.localtime()
- stamp = "%2d:%02d:%02d: " % (ts.tm_hour, ts.tm_min, ts.tm_sec)
- log(stamp, *msg)
-
-#-------------------------------------------------------------------------------
-
-def log_test_header(seq_no, nr_of_tests, name):
- log("=" * 78)
- log()
- log(" Test case (%d/%d): %s" % (seq_no, nr_of_tests, tc_name(name)))
- log()
- log("." * 78)
- log()
-
-#-------------------------------------------------------------------------------
-
-def start_stress(*args):
- stress_cmd = [ "stress" ]
- added_stress_types = []
- req_stress_types = set(args)
- cpu_cnt = str(multiprocessing.cpu_count())
-
- # The function cond_add_stress appends the options to the stress
- # command if the stress type is in the set of requested stress types
-
- def cond_add_stress(stress_type, options):
- if stress_type in req_stress_types:
- req_stress_types.remove(stress_type)
- added_stress_types.append(stress_type)
- stress_cmd.extend(options)
-
- #----------
-
- cond_add_stress("io", ["-i", cpu_cnt])
- cond_add_stress("cpu", ["-c", cpu_cnt])
- cond_add_stress("hdd", ["-d", cpu_cnt, "--hdd-bytes", "20M"])
- cond_add_stress("vm", ["-m", cpu_cnt, "--vm-bytes", "10M"])
-
- unknown = ", ".join(req_stress_types)
- if unknown != "":
- raise TestFail("Unknown stress type(s): %s" % unknown)
-
- if not added_stress_types:
- log("No stress requested")
- return None
-
- added = "+".join(added_stress_types)
- stress_cmd_str = " ".join(stress_cmd)
-
- log("Starting stress(", added, ")")
- log(" Command: '", stress_cmd_str, "'")
- log()
-
- # preexec_fn=os.setsid causes stress to be executed in a separate
- # session, => it gets a new process group (incl. children). It
- # can then be terminated using os.killpg in end_stress without
- # terminating this script.
-
- p = subprocess.Popen(stress_cmd, preexec_fn=os.setsid)
-
- return p
-
-#-------------------------------------------------------------------------------
-
-def end_stress(p):
- if p is None:
- # The value None indicates that no stress scenario was started
- return
-
- if p.poll() is not None:
- raise TestFail("stress prematurely terminated.")
-
- os.killpg(os.getpgid(p.pid), signal.SIGTERM)
- log("Terminated stress")
-
-#-------------------------------------------------------------------------------
-
-def us2hms_str(us):
- s = (us+500000) // 1000000 # Round microseconds to s
- m = s//60
- s -= 60*m;
- h = m//60
- m -= 60*h
-
- return "%d:%02d:%02d" % (h, m, s)
-
-#-------------------------------------------------------------------------------
-# Sometime the hung task supervision is triggered during execution of
-# cyclictest (cyclictest starves stress). To avoid that, the supervision
-# is temporarily disabled
-
-def set_hung_tmo(new_tmo):
- global has_hung_task_detection
-
- tmo_file = "/proc/sys/kernel/hung_task_timeout_secs"
-
- if not has_hung_task_detection:
- return
-
- if not os.access(tmo_file, os.W_OK):
- log("Hung task detection not supported")
- log(" (File ", tmo_file, " not found)")
- has_hung_task_detection = False
- return
-
- orig_tmo = int(subprocess.check_output(["cat", tmo_file]).strip())
- if new_tmo != orig_tmo:
- cmd = ( "echo " + str(new_tmo) + " > " + tmo_file )
- subprocess.check_output(cmd, shell=True)
- log("Changed timeout for detection of hung tasks: ",
- orig_tmo, " -> ", new_tmo)
-
- return orig_tmo
-
-#-------------------------------------------------------------------------------
-
-def gen_minmax_list(max_list):
- res = [min(max_list)]
-
- while True:
- tmp = max_list
- max_list = []
- while tmp:
- max_list.append(max(tmp.pop(0), tmp.pop(0)))
-
- res.append(min(max_list))
-
- if len(max_list) < 2:
- return res
-
-#-------------------------------------------------------------------------------
-# Parameters for cyclictest:
-#
-# On the -S option (from cyclictest.c):
-# -S implies options -a -t -n and same priority of all threads
-# -a: One thread per core
-# -n: use clock_nanosleep instead of posix interval timers
-# -t: (without argument) Set number of threads to the number
-# of cpus
-
-interval_core_0 = 100 # Timer interval on core 0 [us]
-interval_delta = 20 # Interval increment for each core [us]
-loop_count = 30000 # Number of loops (on core 0).
-
-cmd = ("cyclictest",
- "-S", # Standard SMP testing. See below
- "-p", "99", # RT priority 99
- "-q", # Quiet mode, i.e. print only a summary
- "-i", str(interval_core_0),
- "-d", str(interval_delta),
- "-l", str(loop_count)
- )
-rex = re.compile("C:\s*(\d+).*Min:\s*(\d+).*Avg:\s*(\d+).*Max:\s*(\d+)")
-
-def run_cyclictest_once():
- res = subprocess.check_output(cmd)
-
- # minlist and maxlist are lists with the extremes for each core
- # avg_cnt is the sum of cycles for all cores
- # avg_sum is the sum of (cycle count*average) for each core
- # Since cyclictest runs different number of cycles on
- # different cores, avg_sum/avg_cnt gives a more accurate
- # value of the overall average than just taking the average
- # of each core's averages
-
- minlist = []
- maxlist = []
- avg_sum = 0
- avg_cnt = 0
-
- for line in res.split("\n"):
- m = rex.search(line)
- if m is not None:
- minlist.append(int(m.group(2)))
- maxlist.append(int(m.group(4)))
- n = int(m.group(1))
- avg_sum += n * int(m.group(3))
- avg_cnt += n
-
- return min(minlist), [avg_sum, avg_cnt], max(maxlist)
-
-#-------------------------------------------------------------------------------
-# A precondition for the tracking of min-max values is that
-# the suite size os a power of 2.
-
-N = 5
-suite_size = 2**N
-
-est_exec_time_once = interval_core_0 * loop_count
-est_exec_time_suite = suite_size * est_exec_time_once
-
-def run_cyclictest_suite():
- log("Starting cyclictest")
- log(" Command : ", " ".join(cmd))
- log(" Number of cycles : ", loop_count*suite_size,
- " (", suite_size, " sets of ", loop_count, " cycles)")
- log(" Exec. time (est) : ", us2hms_str(est_exec_time_suite))
- log()
-
- orig_tmo = set_hung_tmo(0) # 0 => Disable
-
- # float('inf') emulates infinity. At least in the sense that it is
- # guaranteed to be larger than any actual number.
- ack_min = float('inf')
- ack_avg = [0, 0]
-
- log()
- log_ts("Start of execution")
- t = time.time()
- max_list = []
-
- for i in xrange(0, suite_size):
- tmp_min, tmp_avg, tmp_max = run_cyclictest_once()
-
- msg = "%2d/%2d:" % (i+1, suite_size)
- msg += " min: %4d" % tmp_min
- msg += " avg: %5.1f" % (float(tmp_avg[0])/tmp_avg[1])
- msg += " max: %4d" % tmp_max
- log_ts(msg)
-
- # Track minimum value
- if tmp_min < ack_min:
- ack_min = tmp_min
-
- # Track smallest max value
- max_list.append(tmp_max)
-
- ack_avg[0] += tmp_avg[0]
- ack_avg[1] += tmp_avg[1]
-
- t = time.time()-t
- log_ts("Cyclictest completed. Actual execution time:",
- us2hms_str(t*1000000))
- log()
- set_hung_tmo(orig_tmo)
-
- return ack_min, float(ack_avg[0])/ack_avg[1], gen_minmax_list(max_list)
-
-#-------------------------------------------------------------------------------
-
-class cyclictest_runner:
- def run_test(self, seq_no, nr_of_tests, name, stressparams):
-
- try:
- log_test_header(seq_no, nr_of_tests, name)
-
- p = start_stress(*stressparams)
-
- bm_min, bm_avg, bm_max_list = run_cyclictest_suite()
-
- end_stress(p)
-
- bm_max = bm_max_list[-1]
-
- log()
- log("Min: %d us" % bm_min)
- log("Avg: %.1f us" % bm_avg)
- log("Max: %d us" % bm_max)
- log()
- log("Max list: ", bm_max_list)
- log()
- log("PASS")
-
- print
- print tc_name(name), "[Min/us,Avg/us,Max/us]:",
- print "%d,%.1f,%d" % (bm_min,bm_avg, bm_max)
- print "PASS:", tc_name(name)
- print
-
- except Exception:
- log()
- log("Exception!")
- log()
- log("Traceback:", traceback.format_exc())
- log()
- log("WD: ", os.getcwd())
- log()
- log("FAIL")
- print
- print "FAIL:", tc_name(name)
- print
-
-#-------------------------------------------------------------------------------
-
-runner = cyclictest_runner()
-
-tests = (("no_stress", []),
- ("cpu", ["cpu"]),
- ("hdd", ["hdd"]),
- ("io", ["io"]),
- ("vm", ["vm"]),
- ("full", ["io", "cpu", "hdd", "vm"]),
- )
-
-nr_of_tests = len(tests)
-for seq_no, params in enumerate(tests, start=1):
- runner.run_test(seq_no, nr_of_tests, *params)
diff --git a/yocto-poky/meta/recipes-rt/rt-tests/files/run-ptest b/yocto-poky/meta/recipes-rt/rt-tests/files/run-ptest
deleted file mode 100644
index 8e6d3e358..000000000
--- a/yocto-poky/meta/recipes-rt/rt-tests/files/run-ptest
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-python ./rt_bmark.py
diff --git a/yocto-poky/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb b/yocto-poky/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
deleted file mode 100644
index 962069e3d..000000000
--- a/yocto-poky/meta/recipes-rt/rt-tests/hwlatdetect_0.96.bb
+++ /dev/null
@@ -1,23 +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
-
-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}
-}
-
-FILES_${PN} += "${libdir}/python${PYTHON_BASEVERSION}/dist-packages/hwlatdetect.py"
-RDEPENDS_${PN} = "python python-subprocess python-textutils"
-RRECOMMENDS_${PN} = "kernel-module-hwlat-detector"
diff --git a/yocto-poky/meta/recipes-rt/rt-tests/rt-tests.inc b/yocto-poky/meta/recipes-rt/rt-tests/rt-tests.inc
deleted file mode 100644
index 76f9b3a34..000000000
--- a/yocto-poky/meta/recipes-rt/rt-tests/rt-tests.inc
+++ /dev/null
@@ -1,13 +0,0 @@
-# Version v0.96
-PV = "0.96"
-SRCREV = "24f8c0175e04bab78e7555698e34d7002b01c87f"
-
-SRC_URI = "git://git.kernel.org/pub/scm/utils/rt-tests/rt-tests.git"
-
-S = "${WORKDIR}/git"
-
-# need to append rt-tests' default CFLAGS to ours
-CFLAGS += "-I${S}/src/include -D_GNU_SOURCE -Wall -Wno-nonnull"
-
-# calling 'uname -m' is broken on crossbuilds
-EXTRA_OEMAKE = "NUMA=0"
diff --git a/yocto-poky/meta/recipes-rt/rt-tests/rt-tests_0.96.bb b/yocto-poky/meta/recipes-rt/rt-tests/rt-tests_0.96.bb
deleted file mode 100644
index 2f96fea9b..000000000
--- a/yocto-poky/meta/recipes-rt/rt-tests/rt-tests_0.96.bb
+++ /dev/null
@@ -1,33 +0,0 @@
-SUMMARY = "Real-Time preemption testcases"
-HOMEPAGE = "https://rt.wiki.kernel.org/index.php/Cyclictest"
-SECTION = "tests"
-DEPENDS = "linux-libc-headers virtual/libc"
-LICENSE = "GPLv2 & GPLv2+"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe \
- file://src/cyclictest/cyclictest.c;beginline=7;endline=9;md5=e768b8da44555fe63f65e5c497844cb5 \
- file://src/pi_tests/pi_stress.c;beginline=6;endline=19;md5=bd426a634a43ec612e9fbf125dfcc949"
-
-require rt-tests.inc
-inherit ptest
-
-SRC_URI += "file://0001-Makefile-Set-CC-AR-variable-only-if-it-doesn-t-have-.patch \
- file://run-ptest \
- file://rt_bmark.py \
- "
-# Do not install hwlatdetect
-EXTRA_OEMAKE += "PYLIB='' CROSS_COMPILE=${TARGET_PREFIX}"
-
-CFLAGS_prepend = "${HOST_CC_ARCH}${TOOLCHAIN_OPTIONS}"
-
-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 python python-subprocess python-multiprocessing python-datetime python-re python-lang"
-
-FILES_${PN} += "${prefix}/src/backfire"
OpenPOWER on IntegriCloud