Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build perf with support for bpf #117

Merged
merged 2 commits into from
Dec 10, 2024
Merged

build perf with support for bpf #117

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8bdf10b
build perf with support for bpf
harp-intel Dec 9, 2024
3381d5f
put perf build in its own Dockerfile stage
harp-intel Dec 10, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion tools/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ PERF_LINUX_VERSION := 6.1.52
perf:
wget https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-$(PERF_LINUX_VERSION).tar.xz
tar -xf linux-$(PERF_LINUX_VERSION).tar.xz && mv linux-$(PERF_LINUX_VERSION)/ linux_perf/
cd linux_perf/tools/perf && make LDFLAGS="-static --static"
cd linux_perf/tools/perf && make LDFLAGS="-static --static" BUILD_BPF_SKEL=1 NO_JVMTI=1

spectre-meltdown-checker:
ifeq ("$(wildcard spectre-meltdown-checker)","")
Expand Down
16 changes: 12 additions & 4 deletions tools/build.Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,25 @@
# build output oss_source* will be in workdir
# build image (from project root directory):
# $ docker build -f tools/build.Dockerfile --tag perfspect-tools:$TAG ./tools
FROM ubuntu:18.04 AS builder
FROM ubuntu:22.04 AS builder
ENV http_proxy=${http_proxy}
ENV https_proxy=${https_proxy}
ENV LANG=en_US.UTF-8
ARG DEBIAN_FRONTEND=noninteractive
RUN apt-get update && apt-get install -y apt-utils locales wget curl git netcat-openbsd software-properties-common jq zip unzip
RUN locale-gen en_US.UTF-8 && echo "LANG=en_US.UTF-8" > /etc/default/locale
RUN add-apt-repository ppa:git-core/ppa -y
RUN apt-get update && apt-get install -y git build-essential autotools-dev automake \
gawk zlib1g-dev libtool libaio-dev libaio1 pandoc pkgconf libcap-dev docbook-utils \
libreadline-dev default-jre default-jdk cmake flex bison libssl-dev
RUN apt-get update && apt-get install -y \
automake autotools-dev binutils-dev bison build-essential clang cmake debuginfod \
default-jdk default-jre docbook-utils flex gawk git libaio-dev libaio1 \
libbabeltrace-dev libbpf-dev libc6 libcap-dev libdw-dev libdwarf-dev libelf-dev \
libiberty-dev liblzma-dev libnuma-dev libperl-dev libpfm4-dev libreadline-dev \
libslang2-dev libssl-dev libtool libtraceevent-dev libunwind-dev libzstd-dev \
libzstd1 llvm-13 pandoc pkgconf python-setuptools python2-dev python3 python3-dev \
python3-pip systemtap-sdt-dev zlib1g-dev

RUN bash -c "$(wget -O - https://apt.llvm.org/llvm.sh)"
harp-intel marked this conversation as resolved.
Show resolved Hide resolved
ENV PATH="${PATH}:/usr/lib/llvm-18/bin"

ENV JAVA_HOME=/usr/lib/jvm/java-1.11.0-openjdk-amd64

Expand Down
Loading