diff --git a/.github/workflows/sel4bench-pr.yml b/.github/workflows/sel4bench-pr.yml index 5f48537f..e7ea4a5d 100644 --- a/.github/workflows/sel4bench-pr.yml +++ b/.github/workflows/sel4bench-pr.yml @@ -38,16 +38,18 @@ jobs: fail-fast: false matrix: march: [armv7a, armv8a, nehalem, rv64imac] + compiler: [gcc, clang] steps: - name: Build uses: seL4/ci-actions/sel4bench@master with: xml: ${{ needs.code.outputs.xml }} march: ${{ matrix.march }} + compiler: ${{ matrix.compiler }} - name: Upload images uses: actions/upload-artifact@v4 with: - name: images-${{ matrix.march }} + name: images-${{ matrix.march }}-${{matrix.compiler}} path: '*-images.tar.gz' hw-run: @@ -73,6 +75,9 @@ jobs: - tx1 - tx2 - hifive + compiler: + - gcc + - clang include: - platform: pc99 req: skylake @@ -94,7 +99,7 @@ jobs: - name: Download image uses: actions/download-artifact@v4 with: - name: images-${{ steps.plat.outputs.march }} + name: images-${{ steps.plat.outputs.march }}-${{matrix.compiler}} - name: Run uses: seL4/ci-actions/sel4bench-hw@master with: @@ -107,5 +112,5 @@ jobs: uses: actions/upload-artifact@v4 with: # funky expression below is to work around lack of ternary operator - name: sel4bench-results-${{ matrix.platform }}${{ matrix.req != '' && format('-{0}', matrix.req) || '' }} + name: sel4bench-results-${{ matrix.platform }}${{ matrix.req != '' && format('-{0}', matrix.req) || '' }}-${{matrix.compiler}} path: '*.json' diff --git a/.github/workflows/sel4bench.yml b/.github/workflows/sel4bench.yml index 22c4fcb6..b9ae9ab3 100644 --- a/.github/workflows/sel4bench.yml +++ b/.github/workflows/sel4bench.yml @@ -40,16 +40,18 @@ jobs: fail-fast: false matrix: march: [armv7a, armv8a, nehalem, rv64imac] + compiler: [gcc, clang] steps: - name: Build uses: seL4/ci-actions/sel4bench@master with: xml: ${{ needs.code.outputs.xml }} march: ${{ matrix.march }} + compiler: ${{ matrix.compiler }} - name: Upload images uses: actions/upload-artifact@v4 with: - name: images-${{ matrix.march }} + name: images-${{ matrix.march }}-${{matrix.compiler}} path: '*-images.tar.gz' hw-run: @@ -69,6 +71,9 @@ jobs: - tx1 - tx2 - hifive + compiler: + - gcc + - clang include: - platform: pc99 req: skylake @@ -90,7 +95,7 @@ jobs: - name: Download image uses: actions/download-artifact@v4 with: - name: images-${{ steps.plat.outputs.march }} + name: images-${{ steps.plat.outputs.march }}-${{matrix.compiler}} - name: Run uses: seL4/ci-actions/sel4bench-hw@master with: @@ -103,7 +108,7 @@ jobs: uses: actions/upload-artifact@v4 with: # funky expression below is to work around lack of ternary operator - name: sel4bench-results-${{ matrix.platform }}${{ matrix.req != '' && format('-{0}', matrix.req) || '' }} + name: sel4bench-results-${{ matrix.platform }}${{ matrix.req != '' && format('-{0}', matrix.req) || '' }}-${{matrix.compiler}} path: '*.json' deploy: @@ -128,23 +133,23 @@ jobs: - name: Get results for web deployment (sabre) uses: actions/download-artifact@v4 with: - name: sel4bench-results-sabre + name: sel4bench-results-sabre-gcc - name: Get results for web deployment (haswell) uses: actions/download-artifact@v4 with: - name: sel4bench-results-pc99-haswell3 + name: sel4bench-results-pc99-haswell3-gcc - name: Get results for web deployment (skylake) uses: actions/download-artifact@v4 with: - name: sel4bench-results-pc99-skylake + name: sel4bench-results-pc99-skylake-gcc - name: Get results for web deployment (tx1) uses: actions/download-artifact@v4 with: - name: sel4bench-results-tx1 + name: sel4bench-results-tx1-gcc - name: Get results for web deployment (hifive) uses: actions/download-artifact@v4 with: - name: sel4bench-results-hifive + name: sel4bench-results-hifive-gcc - name: Generate web page uses: seL4/ci-actions/sel4bench-web@master with: