Merge pull request #353 from ChampSim/release/2023-06

May 2023 Release Candidate

.github/workflows/buildcheck.yml

@@ -11,7 +11,7 @@ on:
       - '.github/workflows/*.yml'
       # re-include current file to not be excluded
       - '!.github/workflows/buildcheck.yml'
-      
+
   pull_request:
     branches:
       - master
@@ -22,27 +22,64 @@ on:
       - '.github/workflows/*.yml'
       # re-include current file to not be excluded
       - '!.github/workflows/buildcheck.yml'
-      
+
 jobs:
-  build:
+  single_core:
     runs-on: ubuntu-latest
 
     steps:
-    - uses: actions/checkout@v2.3.4
+    - uses: actions/checkout@v3
+      with:
+        submodules : 'true'
+
+    - name: Set up
+      run: |
+        vcpkg/bootstrap-vcpkg.sh
+        vcpkg/vcpkg install
 
     - name: Configure
       run: ./config.sh
-
+
+    - name: Make
+      run: make
+
+    # TODO run an actual set of checks
+    - name: Run tests
+      run: ./bin/champsim -w50000000 -i50000000 --json=single_core_result.json -- <(curl -s https://dpc3.compas.cs.stonybrook.edu/champsim-traces/speccpu/400.perlbench-41B.champsimtrace.xz | xz -dc)
+
+    # We upload the generated files under github actions assets
+    - name: Upload Results
+      uses: actions/upload-artifact@v3
+      with:
+        name: champsim-singlecore-results
+        path: single_core_result.json
+
+  multi_core:
+    runs-on: ubuntu-latest
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules : 'true'
+
+    - name: Set up
+      run: |
+        vcpkg/bootstrap-vcpkg.sh
+        vcpkg/vcpkg install
+
+    - name: Configure
+      run: './config.sh <(echo "{\"num_cores\": 2}")'
+
     - name: Make
       run: make
-      
+
     # TODO run an actual set of checks
     - name: Run tests
-      run: ./bin/champsim -w50000000 -i50000000 -- https://dpc3.compas.cs.stonybrook.edu/champsim-traces/speccpu/400.perlbench-41B.champsimtrace.xz > result.txt
+      run: ./bin/champsim -w50000000 -i50000000 --json=multi_core_result.json -- <(curl -s https://dpc3.compas.cs.stonybrook.edu/champsim-traces/speccpu/400.perlbench-41B.champsimtrace.xz | xz -dc) <(curl -s https://dpc3.compas.cs.stonybrook.edu/champsim-traces/speccpu/401.bzip2-226B.champsimtrace.xz | xz -dc)
 
     # We upload the generated files under github actions assets
     - name: Upload Results
-      uses: actions/upload-artifact@v2
+      uses: actions/upload-artifact@v3
       with:
-        name: champsim-results
-        path: result.txt
+        name: champsim-multicore-results
+        path: multi_core_result.json

.github/workflows/configurations.yml

@@ -0,0 +1,61 @@
+name: Compile-only configurations
+
+on:
+  push:
+    branches: 
+      - master
+      - develop
+    paths-ignore:
+      - '.gitignore'
+      - '*.md'
+      - '.github/workflows/*.yml'
+      # re-include current file to not be excluded
+      - '!.github/workflows/configurations.yml'
+
+  pull_request:
+    branches:
+      - master
+      - develop
+    paths-ignore:
+      - '.gitignore'
+      - '*.md'
+      - '.github/workflows/*.yml'
+      # re-include current file to not be excluded
+      - '!.github/workflows/configurations.yml'
+
+jobs:
+  matrix-generate:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - id: set-matrix
+        name: Parse output
+        run: python3 -c 'import os, json; print("matrix="+json.dumps(os.listdir("test/config/compile-only")))' >> $GITHUB_OUTPUT
+
+    outputs:
+      matrix: ${{ steps.set-matrix.outputs.matrix }}
+
+  check-configurations:
+    runs-on: ubuntu-latest
+    needs: matrix-generate
+    strategy:
+      matrix:
+        file: ${{ fromJSON(needs.matrix-generate.outputs.matrix) }}
+
+    steps:
+    - uses: actions/checkout@v3
+      with:
+        submodules: 'true'
+
+    - name: Set up
+      run: |
+        vcpkg/bootstrap-vcpkg.sh
+        vcpkg/vcpkg install
+
+    - name: Configure
+      run: ./config.sh $(pwd)/test/config/compile-only/${{ matrix.file }}
+
+    - name: Make
+      run: make
+

.github/workflows/main.yml

@@ -11,15 +11,15 @@ jobs:
   build: 
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2
-      - uses: DoozyX/clang-format-lint-action@v0.13
+      - uses: actions/checkout@v3
+      - uses: DoozyX/clang-format-lint-action@v0.16
         with:
-          source: 'src inc prefetcher branch replacement btb'
+          source: 'src inc prefetcher branch replacement btb tracer'
           style: file
           clangFormatVersion: 13.0.0
           inplace: True
-      - uses: EndBug/add-and-commit@v4
+      - uses: EndBug/add-and-commit@v9
         with:
           message: 'Formatted with clang-format'
           default_author: github_actions
-          add: 'src inc prefetcher branch replacement btb'
+          add: 'src inc prefetcher branch replacement btb tracer'