Configure CI for new backends

rtic-rs · Feb 8, 2025 · fd403e9 · fd403e9
1 parent 46f3686
commit fd403e9
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 24 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -66,8 +66,33 @@ jobs:
 
       - run: cargo xtask --deny-warnings --platform lm3s6965 --backend ${{ matrix.backend }} check
 
-  # Compilation check (hifive1) TODO
-  # checkhifive1:
+  # Compilation check (hifive1)
+  checkhifive1:
+    name: check (hifive1)
+    runs-on: ubuntu-22.04
+    strategy:
+      matrix:
+        backend:
+          - riscv32-imac-clint
+          - riscv32-imac-mecall
+        toolchain:
+          - stable
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      - name: Install Rust ${{ matrix.toolchain }}
+        run: |
+          rustup override set ${{ matrix.toolchain }}
+
+      - name: Configure Rust target
+        run: |
+          rustup target add riscv32imac-unknown-none-elf
+
+      - name: Cache Dependencies
+        uses: Swatinem/rust-cache@v2
+
+      - run: cargo xtask --deny-warnings --platform hifive1 --backend ${{ matrix.backend }} check
 
   # Clippy (lm3s6965)
   clippylm3s6965:
@@ -155,7 +180,7 @@ jobs:
       matrix:
         backend:
           - riscv32-imc-clint
-          - riscv32-imac-clint
+          - riscv32-imc-mecall
         toolchain:
           - stable
     steps:
@@ -168,18 +193,12 @@ jobs:
 
       - name: Configure Rust target
         run: |
-          rustup target add riscv32imac-unknown-none-elf
           rustup target add riscv32imc-unknown-none-elf
 
       - name: Cache Dependencies
         uses: Swatinem/rust-cache@v2
 
       - name: Check the examples
-        if: ${{ matrix.backend == 'riscv32-imc-clint' }}
-        run: cargo xtask --platform hifive1 --backend ${{ matrix.backend }} --exampleexclude static example-check
-
-      - name: Check the examples
-        if: ${{ matrix.backend != 'riscv32-imc-clint' }}
         run: cargo xtask --platform hifive1 --backend ${{ matrix.backend }} example-check
 
   # Platform esp32c3: verify all examples, checks
@@ -341,7 +360,7 @@ jobs:
       matrix:
         backend:
           - riscv32-imc-clint
-          - riscv32-imac-clint
+          - riscv32-imc-mecall
         toolchain:
           - stable
     steps:
@@ -355,7 +374,6 @@ jobs:
 
       - name: Configure Rust target
         run: |
-          rustup target add riscv32imac-unknown-none-elf
           rustup target add riscv32imc-unknown-none-elf
 
       - name: Add Rust component llvm-tools-preview
@@ -389,11 +407,6 @@ jobs:
           which qemu-system-riscv32
       
       - name: Run-pass tests
-        if: ${{ matrix.backend == 'riscv32-imc-clint' }}
-        run: cargo xtask --deny-warnings --platform hifive1 --backend ${{ matrix.backend }} --exampleexclude static qemu
-
-      - name: Run-pass tests
-        if: ${{ matrix.backend != 'riscv32-imc-clint' }}
         run: cargo xtask --deny-warnings --platform hifive1 --backend ${{ matrix.backend }} qemu
 
   # Platform esp32c3: verify the example output with run-pass tests
@@ -897,7 +910,7 @@ jobs:
     needs:
       - formatcheck
       - checklm3s6965
-      # checkhifive1 TODO
+      - checkhifive1
       - clippylm3s6965
       # clippyhifive1 TODO
       - checkexampleslm3s6965

diff --git a/rtic-macros/CHANGELOG.md b/rtic-macros/CHANGELOG.md
@@ -7,6 +7,8 @@ For each category, *Added*, *Changed*, *Fixed* add new entries at the top!
 
 ## [Unreleased]
 
+- Adapt `slic` backends to new version with `mecall`
+
 ## [v2.1.1] - 2024-12-06
 
 ### Changed

diff --git a/xtask/src/argument_parsing.rs b/xtask/src/argument_parsing.rs
@@ -252,12 +252,7 @@ impl Platforms {
         let c = "-C".to_string();
         match self {
             Platforms::Esp32C3 => vec![c, "link-arg=-Tlinkall.x".to_string()],
-            Platforms::Hifive1 => vec![
-                c.clone(),
-                "link-arg=-Thifive1-link.x".to_string(),
-                c,
-                "portable_atomic_target_feature=\"zaamo\"".to_string(),
-            ],
+            Platforms::Hifive1 => vec![c, "link-arg=-Thifive1-link.x".to_string()],
             Platforms::Lm3s6965 => vec![c, "link-arg=-Tlink.x".to_string()],
             Platforms::Nrf52840 => vec![
                 c.clone(),
@@ -315,7 +310,7 @@ impl Platforms {
                 _ => Err(()),
             },
             Platforms::Hifive1 => match backend.to_target() {
-                RISCV32IMC | RISCV32IMAC => Ok(None),
+                RISCV32IMC => Ok(None),
                 _ => Err(()),
             },
             Platforms::Lm3s6965 => match backend.to_target() {