Moved to latest conda incubator (#242)

Signed-off-by: Knute <56927209+klingaard@users.noreply.github.com>

Author: klingaard

.github/actions/build/entrypoint.sh

@@ -15,6 +15,11 @@ echo "PWD:" `pwd`
 CXX_COMPILER=${COMPILER/clang/clang++}
 CXX_COMPILER=${CXX_COMPILER/gcc/g++}
 
+NUM_CORES=$(nproc 2>/dev/null || sysctl -n hw.logicalcpu)
+
+# Print the ulimits
+ulimit -a
+
 #
 # Compile Sparta Infra (always build with release)
 #   Have other build types point to release
@@ -28,7 +33,7 @@ if [ $? -ne 0 ]; then
     echo "ERROR: Cmake for Sparta framework failed"
     exit 1
 fi
-make -j$(nproc --all) install
+make -j$NUM_CORES install
 BUILD_SPARTA=$?
 if [ ${BUILD_SPARTA} -ne 0 ]; then
     echo "ERROR: build sparta FAILED!!!"
@@ -43,7 +48,7 @@ if [ $? -ne 0 ]; then
     echo "ERROR: Cmake for olympia failed"
     exit 1
 fi
-make -j$(nproc --all) regress
+make -j$NUM_CORES regress
 BUILD_OLYMPIA=$?
 if [ ${BUILD_OLYMPIA} -ne 0 ]; then
     echo "ERROR: build/regress of olympia FAILED!!!"

conda/environment.yml renamed to .github/workflows/conda/environment.yml

@@ -12,7 +12,7 @@ jobs:
     strategy:
       # Strategy is a matrix of debug and release builds/regression
       matrix:
-        os: [macos-14]
+        os: [macos-latest]
         BUILD_TYPE: [Debug]
         COMPILER: [clang]
 
@@ -63,9 +63,8 @@ jobs:
             ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-ccache
 
       - name: Setup Conda Environment
-        uses: conda-incubator/setup-miniconda@v2
+        uses: conda-incubator/setup-miniconda@v3
         with:
-          miniforge-variant: Mambaforge
           channels: conda-forge,defaults
           channel-priority: true
           activate-environment: riscv_perf_model

.github/workflows/conda/macos_env.yml

@@ -50,7 +50,7 @@ jobs:
       - name: Cache conda deps
         uses: actions/cache@v3
         with:
-          key: ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-conda-${{ hashFiles('conda/environment.yml') }}
+          key: ${{ matrix.os }}-${{ matrix.BUILD_TYPE }}-${{ matrix.COMPILER }}-conda-${{ hashFiles('.github/workflows/conda/environment.yml') }}
           path: /usr/share/miniconda/envs/riscv_perf_model # Default path for conda
 
       # Setup CCache to cache builds
@@ -66,7 +66,7 @@ jobs:
         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 }}/conda/environment.yml
+          $CONDA/bin/conda env update --file  ${{ github.workspace }}/.github/workflows/conda/environment.yml
           $CONDA/bin/conda init bash
 
       # Build

.github/workflows/macos-build.yml

@@ -58,7 +58,7 @@ add_definitions(-DOLYMPIA_VERSION=\"${OLYMPIA_VERSION}\")
 # Profile build flags
 set(CMAKE_CXX_FLAGS_PROFILE   "-O3 -pg -g -ftime-trace")
 set(CMAKE_CXX_FLAGS_FASTDEBUG "-O3 -g")
-set(CMAKE_CXX_FLAGS_DEBUG     "-O0 -g")
+set(CMAKE_CXX_FLAGS_DEBUG     "-O0 -g -U_FORTIFY_SOURCE")
 
 # Include directories
 include_directories (core mss sim)
@@ -128,4 +128,3 @@ add_custom_target(clangformat-check
   COMMENT
      "Formatting ${prefix} with ${CLANGFORMAT_EXECUTABLE} ..."
   )
-

.github/workflows/ubuntu-build.yml

@@ -33,7 +33,7 @@ add_subdirectory(core/rename)
 add_subdirectory(core/lsu)
 add_subdirectory(core/issue_queue)
 add_subdirectory(core/icache)
-add_subdirectory(core/branch_pred)
+#add_subdirectory(core/branch_pred)
 add_subdirectory(core/dcache)
 add_subdirectory(core/vector)
 add_subdirectory(core/unit_template)