diff --git a/Makefile b/Makefile index e70e41420219d7d37bfba41bc9213145da47b346..daae8aebada8ea498c4d7f65f7e19eac3c57deb0 100644 --- a/Makefile +++ b/Makefile @@ -23,11 +23,11 @@ EMPER_BUILD_TARGETS := $(addprefix emper-,$(EMPER_VARIANTS)) .PHONY: eval eval: all - ./eval.py + ./eval.py --measure-energy .PHONY: stats stats: all - ./eval.py --desc-stats=desc-stats.yml + ./eval.py --desc-stats=desc-stats.yml --measure-energy .PHONY: docker-eval docker-eval: diff --git a/docker.sh b/docker.sh index a5f047190e5d980a148cd69d9db1719aa1a6e8c0..e2631595a19109c5164f00c4a4d8dd8d0f923371 100755 --- a/docker.sh +++ b/docker.sh @@ -7,6 +7,7 @@ IMAGE=$(sed --regexp-extended --quiet 's;^image: "([^"]*)"$;\1;p' "${ROOT}/.gitl docker run \ --volume="${ROOT}:${ROOT}" \ + --privileged \ --interactive \ --tty \ --security-opt=seccomp:unconfined \ diff --git a/tools/docker-prepare b/tools/docker-prepare index c23f19a232e8ba28d6c135b6c92e6ac547951db0..67713b11c7208c614fe50762f6c29a196b28e68c 100755 --- a/tools/docker-prepare +++ b/tools/docker-prepare @@ -1,6 +1,11 @@ #!/usr/bin/env bash set -euo pipefail +apt update +apt install -y linux-perf + +sysctl -w kernel.perf_event_paranoid=-1 + useradd -u "${USER_ID}" -o -m user groupmod -g "${GROUP_ID}" user