From 9c4e4bdf6a9e1323d7af2c5cae7cf0673d5de77c Mon Sep 17 00:00:00 2001
From: Greg Chadwick <gac@lowrisc.org>
Date: Mon, 22 Aug 2022 21:53:06 +0100
Subject: [PATCH] [ci] Download cosim from lowRISC GCP bucket

---
 ci/ibex-rtl-ci-steps.yml |  1 +
 ci/install-build-deps.sh | 10 +++++-----
 ci/setup-cosim.sh        |  3 +++
 ci/vars.yml              |  2 +-
 4 files changed, 10 insertions(+), 6 deletions(-)
 create mode 100644 ci/setup-cosim.sh

diff --git a/ci/ibex-rtl-ci-steps.yml b/ci/ibex-rtl-ci-steps.yml
index ede6b629..72e13245 100644
--- a/ci/ibex-rtl-ci-steps.yml
+++ b/ci/ibex-rtl-ci-steps.yml
@@ -67,6 +67,7 @@ steps:
       displayName: Run RISC-V Compliance test for Ibex RV32IMC for ${{ config }}
 
     - bash: |
+        source ci/setup-cosim.sh
         # Build simple system with co-simulation
         fusesoc --cores-root=. run --target=sim --setup --build lowrisc:ibex:ibex_simple_system_cosim $IBEX_CONFIG_OPTS
 
diff --git a/ci/install-build-deps.sh b/ci/install-build-deps.sh
index 1748de1a..4f2b03a9 100755
--- a/ci/install-build-deps.sh
+++ b/ci/install-build-deps.sh
@@ -61,12 +61,12 @@ case "$ID-$VERSION_ID" in
         wget \
         "verilator-$VERILATOR_VERSION" \
         xz-utils
-       # "ibex-cosim-$IBEX_COSIM_VERSION" \
 
-    # TODO: Remove this hack, workaround due to OBS mirrors not syncing
-    # correctly
-    wget https://download.opensuse.org/repositories/home:/gac_lowrisc/xUbuntu_18.04/amd64/ibex-cosim-0.4_0.4-1_amd64.deb
-    $SUDO_CMD dpkg -i ibex-cosim-0.4_0.4-1_amd64.deb
+    wget https://storage.googleapis.com/ibex-cosim-builds/ibex-cosim-$IBEX_COSIM_VERSION.tar.gz
+    $SUDO_CMD mkdir -p /tools/riscv-isa-sim
+    $SUDO_CMD chmod 777 /tools/riscv-isa-sim
+    $SUDO_CMD tar -C /tools/riscv-isa-sim -xvzf ibex-cosim-$IBEX_COSIM_VERSION.tar.gz --strip-components=1
+    echo "##vso[task.prependpath]/tools/riscv-isa-sim/bin"
 
     # Python dependencies
     #
diff --git a/ci/setup-cosim.sh b/ci/setup-cosim.sh
new file mode 100644
index 00000000..d29ecae9
--- /dev/null
+++ b/ci/setup-cosim.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+export PKG_CONFIG_PATH=/tools/riscv-isa-sim/lib/pkgconfig:$PATH
diff --git a/ci/vars.yml b/ci/vars.yml
index 37f91d5d..7fb40a26 100644
--- a/ci/vars.yml
+++ b/ci/vars.yml
@@ -7,7 +7,7 @@
 # end up as float otherwise).
 variables:
   VERILATOR_VERSION: "4.104"
-  IBEX_COSIM_VERSION: "0.4"
+  IBEX_COSIM_VERSION: "d14e109e"
   RISCV_TOOLCHAIN_TAR_VERSION: "20220210-1"
   RISCV_TOOLCHAIN_TAR_VARIANT: "lowrisc-toolchain-gcc-rv32imcb"
   RISCV_COMPLIANCE_GIT_VERSION: "844c6660ef3f0d9b96957991109dfd80cc4938e2"