Merge pull request #32 from xdoardo/cheriot-runner

Author: xdoardo

.cirrus.yml

@@ -30,8 +30,7 @@ pr_check_commits_task:
     fi
 
 x_check_task:
-  skip: $CIRRUS_PR == ""
-  name: (PR) Run ./x check
+  name: Run ./x check
   # TODO(xdoardo): Figure out when it makes sense to have this dependency, or
   #   how that dependency should actually work. Having this dependency would
   #   pretty much mean making every PR that merges changes on `beta` to `master`
@@ -65,10 +64,9 @@ x_check_task:
   ui_test_script: CC="clang" CXX="clang++" ./x test ui
 
 build_core_task:
-  skip: $CIRRUS_PR == ""
-  name: (PR) Build `core` library  for `riscv32cheriot-unknown-cheriotrtos`
+  name: Build `core` library  for `riscv32cheriot-unknown-cheriotrtos`
   depends_on:
-    - (PR) Run ./x check
+    - Run ./x check
   timeout_in: 240m
   gce_instance: &arm_vm
     image_project: ubuntu-os-cloud
@@ -93,4 +91,41 @@ build_core_task:
   pull_master_script: git fetch origin master
   build_script: CC="clang" CXX="clang++" ./x build compiler std --target=riscv32cheriot-unknown-cheriotrtos
 
+run_cheri_tests_task:
+  name: Run CHERIoT-specific tests
+  depends_on:
+    - Build `core` library  for `riscv32cheriot-unknown-cheriotrtos`
+  timeout_in: 240m
+  gce_instance: &arm_vm
+    image_project: ubuntu-os-cloud
+    image_family: ubuntu-2404-lts-arm64
+    architecture: arm64
+    zone: us-east1-b
+    type: c4a-standard-16
+    disk: 60
+    spot: true
+  env:
+      CIRRUS_CLONE_DEPTH: 0
+      CARGO_HOME: /tmp/cargo
+      RUSTUP_HOME: /tmp/cargo
+      XMAKE_ROOT: "y"
+
+  dependencies_script:
+    - set -eo pipefail
+    - apt-get update
+    - apt-get install -y clang ninja-build lld cmake ccache perl opam z3 libgmp-dev
+  install_xmake_script: curl -fsSL https://xmake.io/shget.text | bash || true # The installer will fail without any informations.
+  verify_xmake_script: /root/.local/bin/xmake -v
+  install_rust_script: curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | bash -s -- -y && . "$CARGO_HOME/env"
+  verify_rust_script: . "$CARGO_HOME/env" && cargo --version
+  build_sail_sim_script: git clone --recurse-submodules https://github.com/CHERIoT-Platform/cheriot-sail && cd cheriot-sail && opam init --reinit --bypass-check --disable-sandboxing --disable-shell-hook && eval $(opam env) && opam install sail --confirm-level=unsafe-yes && make csim && cp c_emulator/cheriot_sim /usr/local/bin
+  gen_bootstrap_script: ./cheri/gen_bootstrap.sh --build-clang
+  setup_env_script:
+    - export CCACHE_REMOTE_STORAGE="http://${CIRRUS_HTTP_CACHE_HOST}/${CIRRUS_OS}/"
+    - export CCACHE_REMOTE_ONLY=1
+    - env
+  pull_master_script: git fetch origin master
+  build_rustc_script: CC="clang" CXX="clang++" ./x build compiler std --target=riscv32cheriot-unknown-cheriotrtos
+  build_test_runner_script: cd ./cheri/tests/runner && . "$CARGO_HOME/env" && cargo build --release
+  run_tests_script: cd ./cheri/tests && ./runner/target/release/cheriot-runner -vvvvv . --sysroot=../../build/host/llvm --rustc=../../build/host/stage1/bin/rustc --xmake=/root/.local/bin/xmake
 # -- End PR tasks

cheri/gen_bootstrap.sh

@@ -2,6 +2,12 @@
 
 FILE="bootstrap.toml"
 
+if  [[ $1 = "--build-clang" ]]; then
+    LLVM_PROJECTS=", LLVM_ENABLE_PROJECTS=\"clang;lld\""
+else
+    LLVM_PROJECTS=""
+fi
+
 if [ -e "$FILE" ]; then
   echo "$FILE already exists!"
   exit 1
@@ -27,7 +33,7 @@ std-features = ["compiler-builtins-mem"]
 targets = "all"
 experimental-targets = ""
 download-ci-llvm = false
-build-config = {CMAKE_C_COMPILER="clang", CMAKE_CXX_COMPILER="clang++"}
+build-config = {CMAKE_C_COMPILER="clang", CMAKE_CXX_COMPILER="clang++" $LLVM_PROJECTS}
 
 [target.riscv32cheriot-unknown-cheriotrtos]
 no-std = true

cheri/tests/runner/.gitignore

@@ -0,0 +1,102 @@
+# This file should only ignore things that are generated during a `x.py` build,
+# generated by common IDEs, and optional files controlled by the user that
+# affect the build (such as bootstrap.toml).
+# In particular, things like `mir_dump` should not be listed here; they are only
+# created during manual debugging and many people like to clean up instead of
+# having git ignore such leftovers. You can use `.git/info/exclude` to
+# configure your local ignore list.
+
+## File system
+.DS_Store
+desktop.ini
+
+## Editor
+*.swp
+*.swo
+Session.vim
+.cproject
+.idea
+*.iml
+.vscode
+.project
+.vim/
+.helix/
+.zed/
+.favorites.json
+.settings/
+.vs/
+.dir-locals.el
+
+## Tool
+.valgrindrc
+.cargo
+# Included because it is part of the test case
+!/tests/run-make/thumb-none-qemu/example/.cargo
+
+## Configuration
+/bootstrap.toml
+/config.toml
+/Makefile
+config.mk
+config.stamp
+no_llvm_build
+
+## Build
+/dl/
+/doc/
+/inst/
+/llvm/
+/mingw-build/
+/build
+/build-rust-analyzer/
+/dist/
+/unicode-downloads
+/target
+/library/target
+/src/bootstrap/target
+/src/ci/citool/target
+/src/tools/x/target
+# Created by `x vendor`
+/vendor
+# Created by default with `src/ci/docker/run.sh`
+/obj/
+# Created by nix dev shell / .envrc
+src/tools/nix-dev-shell/flake.lock
+
+## ICE reports
+rustc-ice-*.txt
+
+## Temporary files
+*~
+\#*
+\#*\#
+.#*
+
+## Tags
+tags
+tags.*
+TAGS
+TAGS.*
+
+## Python
+__pycache__/
+*.py[cod]
+*$py.class
+
+## Node
+node_modules
+/src/doc/rustc-dev-guide/mermaid.min.js
+
+## Rustdoc GUI tests
+tests/rustdoc-gui/src/**.lock
+
+## direnv
+/.envrc
+/.direnv/
+
+## nix
+/flake.nix
+flake.lock
+/default.nix
+
+# Before adding new lines, see the comment at the top.