diff --git a/.gitea/workflows/run_act.yaml b/.gitea/workflows/run_act.yaml deleted file mode 100644 index 3c37860..0000000 --- a/.gitea/workflows/run_act.yaml +++ /dev/null @@ -1,63 +0,0 @@ -name: Run architectural test suite on backends -on: push -jobs: - build_and_test_job: - name: Build ISS, Setup TGC-COMPLIANCE, Run tests on backends - runs-on: ubuntu-latest - container: - image: git.minres.com/tooling/riscof_sail:latest - valid_volumes: - - act-runtime - volumes: - - act-runtime:/mnt/act-runtime - steps: - - name: Checkout repository code - run: git clone --recursive -b ${{gitea.ref_name}} https://git.minres.com/TGFS/TGC-ISS.git - - - name: Checkout TGC-COMPLIANCE - run: | - echo "${{ secrets.ACTRUNNER_PRIVATE_SSHKEY }}" > ssh_key - chmod 600 ssh_key - git clone --recursive -c core.sshCommand="/usr/bin/ssh -i ssh_key -o StrictHostKeyChecking=accept-new" ssh://git@git.minres.com:2221/TGFS/TGC-COMPLIANCE.git - - - name: Build tgc-sim executable - run: | - conan profile new --detect --force default - cmake -S TGC-ISS -B TGC-ISS/build -DCMAKE_BUILD_TYPE=Debug -DWITH_ASMJIT=ON -DWITH_TCC=OFF -DWITH_LLVM=OFF - cmake --build TGC-ISS/build -j24 - - - name: Test interp backend - continue-on-error: true - id: interp - run: | - mkdir interp - python3 TGC-COMPLIANCE/run_act.py -core TGC5C -sim TGC-ISS/build/dbt-rise-tgc/tgc-sim -w interp --dockerless --backend interp - - - name: Test llvm backend - continue-on-error: true - id: llvm - run: | - mkdir llvm - echo "llvm takes too long to build, so it is skipped" - exit 1 - ##run: python3 TGC-COMPLIANCE/run_act.py -core TGC5C -sim TGC-ISS/build/dbt-rise-tgc/tgc-sim -w llvm --dockerless --backend llvm - - - name: Test tcc backend - continue-on-error: true - id: tcc - run: | - mkdir tcc - echo "tcc is disabled for now" - exit 1 - ##python3 TGC-COMPLIANCE/run_act.py -core TGC5C -sim TGC-ISS/build/dbt-rise-tgc/tgc-sim -w tcc --dockerless --backend tcc - - - name: Test asmjit backend - continue-on-error: true - id: asmjit - run: | - mkdir asmjit - python3 TGC-COMPLIANCE/run_act.py -core TGC5C -sim TGC-ISS/build/dbt-rise-tgc/tgc-sim -w asmjit --dockerless --backend asmjit - - - name: Indicate Failure - if: steps.*.outcome != 'success' - run: echo "Failure detected"; exit 1 \ No newline at end of file diff --git a/Jenkinsfile b/Jenkinsfile index 4390ec0..5acf522 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -15,28 +15,31 @@ void checkout_project(String repoUrl, String branch = 'develop') { ]) } - - pipeline { agent { docker { image 'git.minres.com/tooling/riscof_sail:latest' - environment { - CONAN_USER_HOME = '/var/jenkins_home/workspace/riscof_sail' - } + args ' -e CONAN_USER_HOME=/var/jenkins_home/workspace/riscof_sail' } } - stages { + stage("Checkout TGC-ISS"){ + steps { + checkout_project("https://git.minres.com/TGFS/TGC-ISS.git", "develop") + } + } stage("build TGC-ISS"){ steps { - sh 'cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_ASMJIT=OFF -DWITH_TCC=OFF -DWITH_LLVM=OFF' + sh 'conan profile new default --detect --force ' + sh 'cmake -S . -B build -DCMAKE_BUILD_TYPE=Release -DWITH_ASMJIT=ON -DWITH_TCC=OFF -DWITH_LLVM=ON' sh 'cmake --build build -j' } } stage("Checkout TGC-Compliance"){ steps { - checkout_project("https://git.minres.com/TGFS/TGC-COMPLIANCE.git", "master") + dir("TGC-COMPLIANCE"){ + checkout_project("https://git.minres.com/TGFS/TGC-COMPLIANCE.git", "master") + } } } stage("Test backends"){ @@ -44,11 +47,22 @@ pipeline { stage("Test interp") { steps { sh "mkdir interp" - sh "python3 run_act.py -core TGC5C -sim build/dbt-rise-tgc/tgc-sim -w interp --dockerless --backend interp" + sh "python3 TGC-COMPLIANCE/run_act.py -core TGC5C -sim build/dbt-rise-tgc/tgc-sim -w interp --dockerless --backend interp" + } + } + stage("Test asmjit") { + steps { + sh "mkdir asmjit" + sh "python3 TGC-COMPLIANCE/run_act.py -core TGC5C -sim build/dbt-rise-tgc/tgc-sim -w asmjit --dockerless --backend asmjit" + } + } + stage("Test llvm") { + steps { + sh "mkdir llvm" + sh "python3 TGC-COMPLIANCE/run_act.py -core TGC5C -sim build/dbt-rise-tgc/tgc-sim -w llvm --dockerless --backend llvm" } } } - } - + } } } diff --git a/dbt-rise-tgc b/dbt-rise-tgc index b76c5bf..58fb815 160000 --- a/dbt-rise-tgc +++ b/dbt-rise-tgc @@ -1 +1 @@ -Subproject commit b76c5bf0d65b0d3a93e24d4c71dbf8ed220c6366 +Subproject commit 58fb815f329b92fc8cb71ebaa9ccbc0db8e23620