[simple_system_cosim] Switch to latest cosim version

ci/install-build-deps.sh

@@ -59,7 +59,7 @@ case "$ID-$VERSION_ID" in
         libelf-dev \
         clang-format \
         "verilator-$VERILATOR_VERSION" \
-        spike-cosim \
+        "ibex-cosim-$IBEX_COSIM_VERSION" \
         xz-utils
 
       # Python dependencies

ci/vars.yml

@@ -7,6 +7,7 @@
 # end up as float otherwise).
 variables:
   VERILATOR_VERSION: "4.104"
+  IBEX_COSIM_VERSION: "0.2"
   RISCV_TOOLCHAIN_TAR_VERSION: "20220210-1"
   RISCV_TOOLCHAIN_TAR_VARIANT: "lowrisc-toolchain-gcc-rv32imcb"
   RISCV_COMPLIANCE_GIT_VERSION: "844c6660ef3f0d9b96957991109dfd80cc4938e2"

dv/verilator/simple_system_cosim/README.md

@@ -24,11 +24,8 @@ cd build
 # Installs in /opt/spike-cosim
 sudo make -j8 install
 
-# Setup IBEX_COSIM_ISS_ROOT for fusesoc build below
-export IBEX_COSIM_ISS_ROOT=/opt/spike-cosim
-
-# Spike's libsoftfloat.so needs to be accessible so add it to LD_LIBRARY_PATH
-export LD_LIBRARY_PATH=/opt/spike-cosim/lib:$LD_LIBRARY_PATH
+# Setup PKG_CONFIG_PATH so pkg-config can find libs and cflags for the cosim
+export PKG_CONFIG_PATH=/opt/spike-cosim/lib/pkgconfig:$PKG_CONFIG_PATH
 
 # Switch to a checkout of the Ibex repository
 cd <ibex_repo>

dv/verilator/simple_system_cosim/ibex_simple_system_cosim.core

@@ -158,8 +158,8 @@ targets:
           - '--trace-structs'
           - '--trace-params'
           - '--trace-max-array 1024'
-          - '-CFLAGS "-std=c++11 -Wall -DVL_USER_STOP -DVM_TRACE_FMT_FST -DTOPLEVEL_NAME=ibex_simple_system -g -I${IBEX_COSIM_ISS_ROOT}/include -I${IBEX_COSIM_ISS_ROOT}/include/softfloat"'
-          - '-LDFLAGS "-pthread -lutil -lelf -L${IBEX_COSIM_ISS_ROOT}/lib/ -g -lriscv -lsoftfloat -lfdt -ldisasm -ldl"'
+          - '-CFLAGS "-std=c++11 -Wall -DVL_USER_STOP -DVM_TRACE_FMT_FST -DTOPLEVEL_NAME=ibex_simple_system -g `pkg-config --cflags riscv-riscv riscv-disasm riscv-fdt`"'
+          - '-LDFLAGS "-pthread -lutil -lelf `pkg-config --libs riscv-riscv riscv-disasm riscv-fdt`"'
           - "-Wall"
           - "-Wwarn-IMPERFECTSCH"
           # RAM primitives wider than 64bit (required for ECC) fail to build in

dv/verilator/simple_system_cosim/util/ibex_cosim_setup_check.sh

@@ -4,10 +4,11 @@
 # Licensed under the Apache License, Version 2.0, see LICENSE for details.
 # SPDX-License-Identifier: Apache-2.0
 
-if [[ ! -v IBEX_COSIM_ISS_ROOT ]]; then
-  echo "IBEX_COSIM_ISS_ROOT must be set to the root directory of a suitable" \
-       "modified spike implementation, see" \
-       "dv/verilator/simple_system_cosim/README.md for more details"
-  exit 1;
-fi
+SPIKE_PCS="riscv-riscv riscv-disasm riscv-fdt"
 
+if !(pkg-config --exists $SPIKE_PCS)
+then
+  echo "Failed to find Spike pkg-config packages. Did you add lib/pkgconfig"\
+       "from your spike install to PKG_CONFIG_PATH?"
+  exit 1
+fi