diff --git a/lisa/_assets/binaries/arm64/README.json-c b/lisa/_assets/binaries/arm64/README.json-c index 7d8417f9447b6c796712587fd030f47822cf1b6e..2dbd8d216884eb80c01eb93dec2719ab0befda02 100644 --- a/lisa/_assets/binaries/arm64/README.json-c +++ b/lisa/_assets/binaries/arm64/README.json-c @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.1 +VERSION_ID=3.16.3 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -16,7 +16,7 @@ BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" Build recipe: export ARCH=arm64 -export BUILD_DIR=/tmp/tmpwlo34ncm/arm64/source +export BUILD_DIR=/tmp/tmpwk5ghb33/arm64/source export LISA_ARCH_ASSETS=/lisa/_assets/binaries/arm64 export LISA_HOME='' #! /bin/bash @@ -63,7 +63,8 @@ download() { git clone https://github.com/douglas-raillard-arm/rt-app.git # Branch: lisa - git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4 + git -C rt-app checkout 857d6a6624469ba275a37493a10ebba00a50b467 + } build() { diff --git a/lisa/_assets/binaries/arm64/README.libnumactl b/lisa/_assets/binaries/arm64/README.libnumactl index 6630a4bf73ce2467632ffbbc35b3473f9698e355..d70acd7890d0569a607fcaa9e71547b96f95d651 100644 --- a/lisa/_assets/binaries/arm64/README.libnumactl +++ b/lisa/_assets/binaries/arm64/README.libnumactl @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.1 +VERSION_ID=3.16.3 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -16,7 +16,7 @@ BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" Build recipe: export ARCH=arm64 -export BUILD_DIR=/tmp/tmpwlo34ncm/arm64/source +export BUILD_DIR=/tmp/tmpwk5ghb33/arm64/source export LISA_ARCH_ASSETS=/lisa/_assets/binaries/arm64 export LISA_HOME='' #! /bin/bash @@ -63,7 +63,8 @@ download() { git clone https://github.com/douglas-raillard-arm/rt-app.git # Branch: lisa - git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4 + git -C rt-app checkout 857d6a6624469ba275a37493a10ebba00a50b467 + } build() { diff --git a/lisa/_assets/binaries/arm64/README.rt-app b/lisa/_assets/binaries/arm64/README.rt-app index 842bc3214a14bb115368fe5e8044c27fca65588f..33ad36f2d80037c9afbfc5a87af56483a799874a 100644 --- a/lisa/_assets/binaries/arm64/README.rt-app +++ b/lisa/_assets/binaries/arm64/README.rt-app @@ -1,5 +1,5 @@ Sources of rt-app available at: -Git commit: 341f1f944023524c18ac6d254d83315434554ee4 +Git commit: 857d6a6624469ba275a37493a10ebba00a50b467 Git repository: https://github.com/douglas-raillard-arm/rt-app.git @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.1 +VERSION_ID=3.16.3 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -16,7 +16,7 @@ BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" Build recipe: export ARCH=arm64 -export BUILD_DIR=/tmp/tmpwlo34ncm/arm64/source +export BUILD_DIR=/tmp/tmpwk5ghb33/arm64/source export LISA_ARCH_ASSETS=/lisa/_assets/binaries/arm64 export LISA_HOME='' #! /bin/bash @@ -63,7 +63,8 @@ download() { git clone https://github.com/douglas-raillard-arm/rt-app.git # Branch: lisa - git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4 + git -C rt-app checkout 857d6a6624469ba275a37493a10ebba00a50b467 + } build() { diff --git a/lisa/_assets/binaries/arm64/rt-app b/lisa/_assets/binaries/arm64/rt-app index 9e8866e70967dc3ee63b5730a341a720e864ab9e..23b7ad078862182fa1e471c23ed514e04c8e0a96 100755 Binary files a/lisa/_assets/binaries/arm64/rt-app and b/lisa/_assets/binaries/arm64/rt-app differ diff --git a/lisa/_assets/binaries/armeabi/README.json-c b/lisa/_assets/binaries/armeabi/README.json-c index 3d6f6e267ec9af6d841cd8035e62314ea4c5ba4b..599e33ceaa0d663b01a6cd5a8601f9ecbaa52b47 100644 --- a/lisa/_assets/binaries/armeabi/README.json-c +++ b/lisa/_assets/binaries/armeabi/README.json-c @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.1 +VERSION_ID=3.16.3 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -16,7 +16,7 @@ BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" Build recipe: export ARCH=armeabi -export BUILD_DIR=/tmp/tmpwlo34ncm/armeabi/source +export BUILD_DIR=/tmp/tmpwk5ghb33/armeabi/source export LISA_ARCH_ASSETS=/lisa/_assets/binaries/armeabi export LISA_HOME='' #! /bin/bash @@ -63,7 +63,8 @@ download() { git clone https://github.com/douglas-raillard-arm/rt-app.git # Branch: lisa - git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4 + git -C rt-app checkout 857d6a6624469ba275a37493a10ebba00a50b467 + } build() { diff --git a/lisa/_assets/binaries/armeabi/README.libnumactl b/lisa/_assets/binaries/armeabi/README.libnumactl index c4afc3e509f6c0e4a4a14fbfb7a402f8f7c9061d..5b3f3e944398ac44400ccc2546f500a07359036b 100644 --- a/lisa/_assets/binaries/armeabi/README.libnumactl +++ b/lisa/_assets/binaries/armeabi/README.libnumactl @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.1 +VERSION_ID=3.16.3 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -16,7 +16,7 @@ BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" Build recipe: export ARCH=armeabi -export BUILD_DIR=/tmp/tmpwlo34ncm/armeabi/source +export BUILD_DIR=/tmp/tmpwk5ghb33/armeabi/source export LISA_ARCH_ASSETS=/lisa/_assets/binaries/armeabi export LISA_HOME='' #! /bin/bash @@ -63,7 +63,8 @@ download() { git clone https://github.com/douglas-raillard-arm/rt-app.git # Branch: lisa - git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4 + git -C rt-app checkout 857d6a6624469ba275a37493a10ebba00a50b467 + } build() { diff --git a/lisa/_assets/binaries/armeabi/README.rt-app b/lisa/_assets/binaries/armeabi/README.rt-app index 7ec34d3e9420d867b870dd3e405fcee0a6fb5bd1..97acff084a7c9caee9ef357234450ef7beb47848 100644 --- a/lisa/_assets/binaries/armeabi/README.rt-app +++ b/lisa/_assets/binaries/armeabi/README.rt-app @@ -1,5 +1,5 @@ Sources of rt-app available at: -Git commit: 341f1f944023524c18ac6d254d83315434554ee4 +Git commit: 857d6a6624469ba275a37493a10ebba00a50b467 Git repository: https://github.com/douglas-raillard-arm/rt-app.git @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.1 +VERSION_ID=3.16.3 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -16,7 +16,7 @@ BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" Build recipe: export ARCH=armeabi -export BUILD_DIR=/tmp/tmpwlo34ncm/armeabi/source +export BUILD_DIR=/tmp/tmpwk5ghb33/armeabi/source export LISA_ARCH_ASSETS=/lisa/_assets/binaries/armeabi export LISA_HOME='' #! /bin/bash @@ -63,7 +63,8 @@ download() { git clone https://github.com/douglas-raillard-arm/rt-app.git # Branch: lisa - git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4 + git -C rt-app checkout 857d6a6624469ba275a37493a10ebba00a50b467 + } build() { diff --git a/lisa/_assets/binaries/armeabi/rt-app b/lisa/_assets/binaries/armeabi/rt-app index 52e6b984676a3456b37e60f5f1a23ff22085ee7b..87bafa5e574c86a31e99756878eb28950e100bd2 100755 Binary files a/lisa/_assets/binaries/armeabi/rt-app and b/lisa/_assets/binaries/armeabi/rt-app differ diff --git a/lisa/_assets/binaries/x86_64/README.json-c b/lisa/_assets/binaries/x86_64/README.json-c index df5c13f84963d8ea85ad05f7a824db8478326056..c0537e33663c40dc6026d8b975211909e2ef3d09 100644 --- a/lisa/_assets/binaries/x86_64/README.json-c +++ b/lisa/_assets/binaries/x86_64/README.json-c @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.1 +VERSION_ID=3.16.3 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -16,7 +16,7 @@ BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" Build recipe: export ARCH=x86_64 -export BUILD_DIR=/tmp/tmpwlo34ncm/x86_64/source +export BUILD_DIR=/tmp/tmpwk5ghb33/x86_64/source export LISA_ARCH_ASSETS=/lisa/_assets/binaries/x86_64 export LISA_HOME='' #! /bin/bash @@ -63,7 +63,8 @@ download() { git clone https://github.com/douglas-raillard-arm/rt-app.git # Branch: lisa - git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4 + git -C rt-app checkout 857d6a6624469ba275a37493a10ebba00a50b467 + } build() { diff --git a/lisa/_assets/binaries/x86_64/README.libnumactl b/lisa/_assets/binaries/x86_64/README.libnumactl index f21593e34db3ea35649466cfa87b5b9fd8dc718a..f4a0c76f0de1ec449d6f8c081ebb6f6c267c1b0a 100644 --- a/lisa/_assets/binaries/x86_64/README.libnumactl +++ b/lisa/_assets/binaries/x86_64/README.libnumactl @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.1 +VERSION_ID=3.16.3 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -16,7 +16,7 @@ BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" Build recipe: export ARCH=x86_64 -export BUILD_DIR=/tmp/tmpwlo34ncm/x86_64/source +export BUILD_DIR=/tmp/tmpwk5ghb33/x86_64/source export LISA_ARCH_ASSETS=/lisa/_assets/binaries/x86_64 export LISA_HOME='' #! /bin/bash @@ -63,7 +63,8 @@ download() { git clone https://github.com/douglas-raillard-arm/rt-app.git # Branch: lisa - git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4 + git -C rt-app checkout 857d6a6624469ba275a37493a10ebba00a50b467 + } build() { diff --git a/lisa/_assets/binaries/x86_64/README.rt-app b/lisa/_assets/binaries/x86_64/README.rt-app index c56ac2d5cb44d23010d8496d352bad908c7bb790..cb34784c4f29da067d74851eb0a850464bd32c43 100644 --- a/lisa/_assets/binaries/x86_64/README.rt-app +++ b/lisa/_assets/binaries/x86_64/README.rt-app @@ -1,5 +1,5 @@ Sources of rt-app available at: -Git commit: 341f1f944023524c18ac6d254d83315434554ee4 +Git commit: 857d6a6624469ba275a37493a10ebba00a50b467 Git repository: https://github.com/douglas-raillard-arm/rt-app.git @@ -7,7 +7,7 @@ Build host info: NAME="Alpine Linux" ID=alpine -VERSION_ID=3.16.1 +VERSION_ID=3.16.3 PRETTY_NAME="Alpine Linux v3.16" HOME_URL="https://alpinelinux.org/" BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" @@ -16,7 +16,7 @@ BUG_REPORT_URL="https://gitlab.alpinelinux.org/alpine/aports/-/issues" Build recipe: export ARCH=x86_64 -export BUILD_DIR=/tmp/tmpwlo34ncm/x86_64/source +export BUILD_DIR=/tmp/tmpwk5ghb33/x86_64/source export LISA_ARCH_ASSETS=/lisa/_assets/binaries/x86_64 export LISA_HOME='' #! /bin/bash @@ -63,7 +63,8 @@ download() { git clone https://github.com/douglas-raillard-arm/rt-app.git # Branch: lisa - git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4 + git -C rt-app checkout 857d6a6624469ba275a37493a10ebba00a50b467 + } build() { diff --git a/lisa/_assets/binaries/x86_64/rt-app b/lisa/_assets/binaries/x86_64/rt-app index c7f2a13e3c2f208061b7700aad5b8b8bcb43572f..2a21ab862f10339c241f81773d0c9497828588bb 100755 Binary files a/lisa/_assets/binaries/x86_64/rt-app and b/lisa/_assets/binaries/x86_64/rt-app differ diff --git a/lisa/wlgen/rta.py b/lisa/wlgen/rta.py index 4d44e1c11f12125be4544ce6c954205f0bafb0de..75e299292ab63f485d9fee21029d4186a73dc549 100644 --- a/lisa/wlgen/rta.py +++ b/lisa/wlgen/rta.py @@ -541,6 +541,14 @@ class RTA(Workload): :param json_file: Path to the rt-app json description :type json_file: str + :param log_level: Set rt-app log level. One of: + * ``critical`` + * ``error`` + * ``notice`` + * ``info`` + * ``debug`` + :type log_level: str or None + .. warning:: The class constructor only deals with pre-constructed json files. For creating rt-app workloads through other means, see :meth:`from_profile` @@ -553,7 +561,7 @@ class RTA(Workload): REQUIRED_TOOLS = ['rt-app'] @kwargs_forwarded_to(Workload.__init__, ignore=['command']) - def _early_init(self, *, log_stats=False, update_cpu_capacities=None, **kwargs): + def _early_init(self, *, log_stats=False, update_cpu_capacities=None, log_level=None, **kwargs): """ Initialize everything that is not related to the contents of the json file """ @@ -565,8 +573,26 @@ class RTA(Workload): json_file = f'{self.name}.json' self.local_json = ArtifactPath.join(self.res_dir, json_file) self.remote_json = self.target.path.join(self.run_dir, json_file) - self._settings['command'] = f'rt-app {quote(self.remote_json)} 2>&1' + if log_level is None: + log_level = '' + else: + log_level = self._resolve_log_level(log_level) + log_level = f'--log {log_level}' + self._settings['command'] = f'rt-app {log_level} {quote(self.remote_json)} 2>&1' + + @staticmethod + def _resolve_log_level(level): + if level in('error', 'critical'): + return 10 + elif level == 'notice': + return 50 + elif level == 'info': + return 75 + elif level == 'debug': + return 100 + else: + raise ValueError(f'Unknown rt-app verbosity level: {level}') def _late_init(self, conf): """ @@ -911,6 +937,9 @@ class RTA(Workload): # Disable CPU capacities update, since that leads to infinite # recursion update_cpu_capacities=False, + # TODO: revisit this + # Set level to debug to track down calibration issue. + log_level='debug', ) with rta, target.freeze_userspace(): diff --git a/pytest.ini b/pytest.ini index dc1d73d2282c89b2c4455141ee9a1384c29a8e5a..7e4f19075e8a30907c8f62f09082a345997c0d8c 100644 --- a/pytest.ini +++ b/pytest.ini @@ -13,3 +13,4 @@ filterwarnings = # Ignore this warning: https://github.com/erdewit/nest_asyncio/issues/70 ignore::DeprecationWarning:nest_asyncio.*: ignore::PendingDeprecationWarning:: + ignore::DeprecationWarning:jupyter_client.*: diff --git a/tools/recipes/rt-app.manifest.yaml b/tools/recipes/rt-app.manifest.yaml index ae5918796178d56ffcac90163690e7bf0580847d..00080830a21be8e542ca8c2bcb90f80a6bf49255 100644 --- a/tools/recipes/rt-app.manifest.yaml +++ b/tools/recipes/rt-app.manifest.yaml @@ -29,6 +29,12 @@ rebase-conf: base: master tip: tracefs_path_set + - + remote: github + base: master + tip: log_calib + + remotes: github: url: https://github.com/douglas-raillard-arm/rt-app.git diff --git a/tools/recipes/rt-app.recipe b/tools/recipes/rt-app.recipe index ac50c85860604f81a6e4c1393fd035e8bc8af145..8ca69047fe8de283d19c967b35ed0ceb931b220b 100644 --- a/tools/recipes/rt-app.recipe +++ b/tools/recipes/rt-app.recipe @@ -42,7 +42,8 @@ download() { git clone https://github.com/douglas-raillard-arm/rt-app.git # Branch: lisa - git -C rt-app checkout 341f1f944023524c18ac6d254d83315434554ee4 + git -C rt-app checkout 857d6a6624469ba275a37493a10ebba00a50b467 + } build() {