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

.github/workflows/test-aot-cli.yml → .github/workflows/test-tools.yml

@@ -1,4 +1,4 @@
-name: Build and test AOT cli
+name: Build and test bpftime tools
 
 on:
   push:
@@ -27,20 +27,10 @@ jobs:
     - name: Build and install everything
       run: |
         make release-with-llvm-jit -j
-    - name: Do compilation & run
-      run: |
-        export PATH=$PATH:~/.bpftime
-        cd .github/assets
-        bpftime-vm build sum.bpf.o
-        echo "AwAAAAEAAAACAAAAAwAAAA==" | base64 -d > test.bin
-        program_output=$(bpftime-vm run test.o test.bin)
-        echo $program_output
-        if echo $program_output | grep "Output: 6"; then
-          echo "Successful!"
-          exit 0
-        else
-          echo "Not found!"
-          exit 1
-        fi
+    # TODO: add test for the tools
+    # - name: Run the test scripts
+    #   run: |
+    #     export PATH=$PATH:~/.bpftime
+
 
 

.github/workflows/test-vm.yml

@@ -36,11 +36,3 @@ jobs:
         python-version: '3.8'
     - name: build
       run: make build-vm
-    - name: run tests x86
-      shell: bash
-      run: |
-        python3.8 -m venv vm/test
-        source vm/test/bin/activate
-        pip install -r vm/test/requirements.txt
-        # make build # or build-arm32 build-arm64
-        make -C vm test-vm -j

.gitmodules

@@ -16,3 +16,6 @@
 [submodule "third_party/ubpf"]
 	path = third_party/ubpf
 	url = https://github.com/iovisor/ubpf
+[submodule "vm/llvm-jit"]
+	path = vm/llvm-jit
+	url = https://github.com/eunomia-bpf/llvmbpf

CMakeLists.txt

@@ -162,7 +162,7 @@ set(UBPF_BUILD_DIR ${CMAKE_CURRENT_BINARY_DIR}/vm/ubpf-vm/ubpf)
 message(STATUS " Adding libraries to single static archive file")
 bpftime_add_static_lib_component_command(bpftime_vm)
 if(${BPFTIME_LLVM_JIT})
-bpftime_add_static_lib_component_command(bpftime_llvm_jit_vm)
+bpftime_add_static_lib_component_command(bpftime_llvm_vm)
 else()
 bpftime_add_static_lib_component_command(bpftime_ubpf_vm)
 bpftime_add_libs_component_command(${UBPF_BUILD_DIR}/lib/libubpf.a)