Regress Olympia on MacOS

.github/actions/build/entrypoint.sh

@@ -2,7 +2,7 @@
 
 set -x
 
-source "/usr/share/miniconda/etc/profile.d/conda.sh"
+source $CONDA/etc/profile.d/conda.sh
 conda activate riscv_perf_model
 
 echo "Starting Build Entry"

.github/workflows/conda/macos_env.yml

@@ -0,0 +1,14 @@
+name: riscv_perf_model
+channels:
+  - conda-forge
+dependencies:
+  - doxygen>=1.8.20
+  - cmake>=3.25.2
+  - hdf5>=1.10.6
+  - sqlite>=3.40.0
+  - boost>=1.76.0
+  - boost-cpp>=1.76.0
+  - xz>=5.2.6
+  - yaml-cpp>=0.7.0
+  - rapidjson>=1.1.0
+  - cppcheck>=2.7.5

.github/workflows/macos-build.yml

@@ -0,0 +1,87 @@
+on:
+  pull_request:
+    branches:
+      - master
+
+env:
+  CACHE_VERSION: v1
+
+name: Regress Olympia on MacOS
+jobs:
+  build_test_job:
+    strategy:
+      # Strategy is a matrix of debug and release builds/regression
+      matrix:
+        os: [macos-12]
+        BUILD_TYPE: [Debug]
+        COMPILER: [clang]
+
+    name: MacOS-${{ matrix.BUILD_TYPE }}-${{matrix.COMPILER}}
+    runs-on: ${{ matrix.os }}
+
+    # Set up a global environment variable for build scripts
+    env:
+      OLYMPIA_BUILD_TYPE: ${{ matrix.BUILD_TYPE }}
+      COMPILER:           ${{ matrix.COMPILER }}
+
+    steps:
+
+      # Get Olympia
+      - name: Checkout Olympia
+        uses: actions/checkout@v3
+        with:
+          submodules: recursive
+
+      # Get Sparta
+      - name: Checkout Sparta
+        uses: actions/checkout@v3
+        with:
+          repository: sparcians/map
+          path: map
+          ref: map_v2.0.13
+
+      # Setup Conda and build environment
+      - name: Grab Python v3.8
+        uses: actions/setup-python@v3
+        with:
+          python-version: 3.8
+
+      # Cache the conda dependencies to
+      - name: Cache conda deps
+        uses: actions/cache@v3
+        with:
+          key: ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-conda-${{ hashFiles('.github/workflows/conda/macos_env.yml') }}
+          path: /usr/share/miniconda/envs/riscv_perf_model # Default path for conda
+
+      # Setup CCache to cache builds
+      - name: ccache
+        uses: hendrikmuhs/[email protected]
+        with:
+          key: ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-ccache-${{ github.ref_name }}
+          restore-keys: |
+            ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-ccache-master
+            ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-ccache
+
+      - name: Setup Conda Environment
+        run: |
+          # $CONDA is an environment variable pointing to the root of the miniconda directory
+          $CONDA/bin/conda config --set channel_priority strict
+          $CONDA/bin/conda env update --file  ${{ github.workspace }}/.github/workflows/conda/macos_env.yml
+          $CONDA/bin/conda init bash
+
+      # Build
+      - name: Build & Regress
+        run: ./.github/actions/build/entrypoint.sh
+
+      # Save error logs, etc
+      - name: Save artifacts
+        if: failure()
+        uses: actions/upload-artifact@main
+        with:
+          name: ErrorLogs-${{matrix.BUILD_TYPE}}-${{matrix.COMPILER}}
+          path: ${{matrix.BUILD_TYPE}}/test/
+
+      #- name: CTest
+      #  # Run CTests without Valgrind tests otherwise the runtime will be TOO long
+      #  if: ${{ env.DABBLE_BUILD_TYPE == 'release' }} && ${{ env.VALGRIND == 'false' }}
+      #  uses: ./.github/actions/ctest  # Uses an action.yml in directory

core/MavisUnit.cpp

@@ -16,7 +16,11 @@ namespace olympia
     std::vector<std::string> getISAFiles(sparta::TreeNode *n, const std::string & isa_file_path,
                                          const std::string& pseudo_file_path)
     {
-        std::vector<std::string> isa_files = {isa_file_path + "/isa_rv64g.json",
+        std::vector<std::string> isa_files = {isa_file_path + "/isa_rv64i.json",
+                                              isa_file_path + "/isa_rv64m.json",
+                                              isa_file_path + "/isa_rv64a.json",
+                                              isa_file_path + "/isa_rv64f.json",
+                                              isa_file_path + "/isa_rv64d.json",
                                               isa_file_path + "/isa_rv64zba.json",
                                               isa_file_path + "/isa_rv64zbb.json",
                                               isa_file_path + "/isa_rv64zbs.json",