diff --git a/.github/workflows/benchmarks.yml b/.github/workflows/benchmarks.yml index 438614bfe..2cd9761e1 100644 --- a/.github/workflows/benchmarks.yml +++ b/.github/workflows/benchmarks.yml @@ -30,8 +30,6 @@ jobs: - name: install deps run: | - sudo apt update - wget https://apt.llvm.org/llvm.sh && chmod +x llvm.sh && sudo ./llvm.sh 17 sudo apt update sudo apt install -y --no-install-recommends \ libelf1 libelf-dev zlib1g-dev make cmake git libboost-all-dev \ @@ -46,8 +44,8 @@ jobs: sudo apt install -y python3-pip pip3 install -r benchmark/requirements.txt - - name: verify llvm-17 installation - run: llvm-config-17 --version + - name: verify llvm-18 installation + run: llvm-config-18 --version - name: clear cmake cache run: rm -rf build diff --git a/Dockerfile b/Dockerfile index aa1a50995..4b3f142fa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,24 +4,24 @@ WORKDIR /bpftime RUN apt-get update && apt-get install -y --no-install-recommends \ libelf1 libelf-dev zlib1g-dev make cmake git libboost1.74-all-dev \ binutils-dev libyaml-cpp-dev gcc g++ ca-certificates \ - clang-17 llvm-17 llvm-17-dev + clang llvm llvm-dev COPY . . RUN git submodule update --init --recursive ENV BPFTIME_VM_NAME=llvm -ENV LLVM_DIR=/usr/lib/llvm-17/lib/cmake/llvm -ENV PATH="${PATH}:/usr/lib/llvm-17/bin" +ENV LLVM_DIR=/usr/lib/llvm-18/lib/cmake/llvm +ENV PATH="${PATH}:/usr/lib/llvm-18/bin" RUN rm -rf build && mkdir build && cmake -Bbuild \ -DCMAKE_BUILD_TYPE=RelWithDebInfo \ -DBUILD_BPFTIME_DAEMON=1 \ - -DCMAKE_C_COMPILER=/usr/lib/llvm-17/bin/clang \ - -DCMAKE_CXX_COMPILER=/usr/lib/llvm-17/bin/clang++ \ - -DLLVM_CONFIG=/usr/lib/llvm-17/bin/llvm-config \ - -DLLVM_DIR=/usr/lib/llvm-17/lib/cmake/llvm + -DCMAKE_C_COMPILER=/usr/lib/llvm-18/bin/clang \ + -DCMAKE_CXX_COMPILER=/usr/lib/llvm-18/bin/clang++ \ + -DLLVM_CONFIG=/usr/lib/llvm-18/bin/llvm-config \ + -DLLVM_DIR=/usr/lib/llvm-18/lib/cmake/llvm RUN cd build && make -j$(nproc) RUN cd build && make install -ENV PATH="${PATH}:/root/.bpftime/" \ No newline at end of file +ENV PATH="${PATH}:/root/.bpftime/"