Skip to content

Commit b0ac6d9

Browse files
authored
vm: use the llvmbpf as submodule (#336)
* rename vm/llvmjit * add submodule * remove test for llvmjit * refactor the CI * rename llvm_jit_vm to llvm_vm * fix compile the llvm and ubpf jit * remove old llvm-jit * remove unmaintained tools * remove test runner * remove test tools
1 parent fb21d6e commit b0ac6d9

File tree

221 files changed

+188
-74085
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

221 files changed

+188
-74085
lines changed

.github/workflows/test-llvm-jit.yml

Lines changed: 0 additions & 41 deletions
This file was deleted.

.github/workflows/test-aot-cli.yml renamed to .github/workflows/test-tools.yml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: Build and test AOT cli
1+
name: Build and test bpftime tools
22

33
on:
44
push:
@@ -27,20 +27,10 @@ jobs:
2727
- name: Build and install everything
2828
run: |
2929
make release-with-llvm-jit -j
30-
- name: Do compilation & run
31-
run: |
32-
export PATH=$PATH:~/.bpftime
33-
cd .github/assets
34-
bpftime-vm build sum.bpf.o
35-
echo "AwAAAAEAAAACAAAAAwAAAA==" | base64 -d > test.bin
36-
program_output=$(bpftime-vm run test.o test.bin)
37-
echo $program_output
38-
if echo $program_output | grep "Output: 6"; then
39-
echo "Successful!"
40-
exit 0
41-
else
42-
echo "Not found!"
43-
exit 1
44-
fi
30+
# TODO: add test for the tools
31+
# - name: Run the test scripts
32+
# run: |
33+
# export PATH=$PATH:~/.bpftime
34+
4535

4636

.github/workflows/test-vm.yml

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,3 @@ jobs:
3636
python-version: '3.8'
3737
- name: build
3838
run: make build-vm
39-
- name: run tests x86
40-
shell: bash
41-
run: |
42-
python3.8 -m venv vm/test
43-
source vm/test/bin/activate
44-
pip install -r vm/test/requirements.txt
45-
# make build # or build-arm32 build-arm64
46-
make -C vm test-vm -j

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,3 +16,6 @@
1616
[submodule "third_party/ubpf"]
1717
path = third_party/ubpf
1818
url = https://github.com/iovisor/ubpf
19+
[submodule "vm/llvm-jit"]
20+
path = vm/llvm-jit
21+
url = https://github.com/eunomia-bpf/llvmbpf

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -162,7 +162,7 @@ set(UBPF_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/vm/ubpf-vm/ubpf)
162162
message(STATUS " Adding libraries to single static archive file")
163163
bpftime_add_static_lib_component_command(bpftime_vm)
164164
if(${BPFTIME_LLVM_JIT})
165-
bpftime_add_static_lib_component_command(bpftime_llvm_jit_vm)
165+
bpftime_add_static_lib_component_command(bpftime_llvm_vm)
166166
else()
167167
bpftime_add_static_lib_component_command(bpftime_ubpf_vm)
168168
bpftime_add_libs_component_command(${UBPF_BUILD_DIR}/lib/libubpf.a)

example/libbpf-tools/gethostlatency/Makefile

Lines changed: 0 additions & 138 deletions
This file was deleted.

example/libbpf-tools/gethostlatency/README.md

Lines changed: 0 additions & 3 deletions
This file was deleted.

example/libbpf-tools/gethostlatency/gethostlatency.bpf.c

Lines changed: 0 additions & 75 deletions
This file was deleted.

0 commit comments

Comments
 (0)