Merge master to my branch (#248)

Signed-off-by: Knute <56927209+klingaard@users.noreply.github.com>
Co-authored-by: Knute <56927209+klingaard@users.noreply.github.com>
Co-authored-by: Kathlene Magnus <kathlene.hurt@gmail.com>
Co-authored-by: Arup <arupc@users.noreply.github.com>
Co-authored-by: Knute Lingaard <klingaard@gmail.com>

Author: 4 people

.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

@@ -0,0 +1 @@
+TBD: how to contribute to this project

CMakeLists.txt

@@ -0,0 +1,15 @@
+See [CONTRIBUTING.md](CONTRIBUTING.md) for details on how to contribute to this project
+
+The following people from multiple organizations have contributed to this project:
+
+* (Ventana Micro Systems)[https://www.ventanamicro.com]
+  * (Arup Chakraborty)[https://github.com/arupc]
+
+* (MIPS)[https://mips.com] 
+  * (Knute Lingaard)[https://github.com/klingaard]
+  * (Kathlene Magnus)[https://github.com/kathlenemagnus]
+
+* (Condor Computing)[https://condorcomputing.com]
+  * (Jeff Nye)[https://github.com/jeffnye-gh]
+
+List is incomplete and more contributor names/organizations to be added. 

CONTRIBUTING.md

@@ -29,12 +29,12 @@ top.cpu.core0.extension.core_extensions:
     ["int", "mul"], # exe2
     ["int", "mul", "i2f", "cmov"], # exe3
     ["int"], # exe4
-    ["int"], # exe5
+    ["int", "vset"], # exe5
     ["float", "faddsub", "fmac"], # exe6
     ["float", "f2i"], # exe7
     ["br"], # exe8
     ["br"], # exe9
-    ["vint", "vset", "vdiv", "vmul"]
+    ["vint", "vdiv", "vmul", "vfixed", "vmask", "vmv", "v2s", "vfloat", "vfdiv", "vfmul", "vpermute", "vload", "vstore"] # exe10
   ]
   # this is used to set how many units per queue
   # ["0", "3"] means iq0 has exe0, exe1, exe2, and exe3, so it's inclusive