From 7664e59f82bb6ec040ddae729fe995d58c8fba75 Mon Sep 17 00:00:00 2001
From: "-T.K.-" <t_k_233@outlook.com>
Date: Sun, 8 Sep 2024 14:33:33 -0700
Subject: [PATCH] FIX: fix CI

---
 .github/scripts/run-tests.sh | 32 ++++++++++++++++++++++++--------
 1 file changed, 24 insertions(+), 8 deletions(-)

diff --git a/.github/scripts/run-tests.sh b/.github/scripts/run-tests.sh
index 8a7528501..e7ae398c7 100755
--- a/.github/scripts/run-tests.sh
+++ b/.github/scripts/run-tests.sh
@@ -32,7 +32,9 @@ case $1 in
     chipyard-rocket)
         run_bmark LOADMEM=1
         run_asm LOADMEM=1
-        make -C $LOCAL_CHIPYARD_DIR/tests
+        cmake $LOCAL_CHIPYARD_DIR/tests/ -S $LOCAL_CHIPYARD_DIR/tests/ -B $LOCAL_CHIPYARD_DIR/tests/build/ -D CMAKE_BUILD_TYPE=Debug
+        cmake --build $LOCAL_CHIPYARD_DIR/tests/build/ --target all
+
         # Test run-binary with and without loadmem
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/hello.riscv LOADMEM=1
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/hello.riscv
@@ -77,7 +79,9 @@ case $1 in
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/generators/compress-acc/software-zstd/compress/009987_cl0_ws12.riscv LOADMEM=1
         ;;
     chipyard-manymmioaccels)
-	make -C $LOCAL_CHIPYARD_DIR/tests
+	cmake $LOCAL_CHIPYARD_DIR/tests/ -S $LOCAL_CHIPYARD_DIR/tests/ -B $LOCAL_CHIPYARD_DIR/tests/build/ -D CMAKE_BUILD_TYPE=Debug
+    cmake --build $LOCAL_CHIPYARD_DIR/tests/build/ --target all
+
 
 	# test streaming-passthrough
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/streaming-passthrough.riscv LOADMEM=1
@@ -89,29 +93,41 @@ case $1 in
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/fft.riscv LOADMEM=1
 	;;
     chipyard-nvdla)
-	make -C $LOCAL_CHIPYARD_DIR/tests
+	    cmake $LOCAL_CHIPYARD_DIR/tests/ -S $LOCAL_CHIPYARD_DIR/tests/ -B $LOCAL_CHIPYARD_DIR/tests/build/ -D CMAKE_BUILD_TYPE=Debug
+        cmake --build $LOCAL_CHIPYARD_DIR/tests/build/ --target all
+
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/nvdla.riscv LOADMEM=1
 	;;
     chipyard-manyperipherals)
 	# SPI Flash read tests
-        make -C $LOCAL_CHIPYARD_DIR/tests
+        cmake $LOCAL_CHIPYARD_DIR/tests/ -S $LOCAL_CHIPYARD_DIR/tests/ -B $LOCAL_CHIPYARD_DIR/tests/build/ -D CMAKE_BUILD_TYPE=Debug
+        cmake --build $LOCAL_CHIPYARD_DIR/tests/build/ --target all
+
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/spiflashread.riscv
         ;;
     chipyard-spiflashwrite)
-        make -C $LOCAL_CHIPYARD_DIR/tests
+        cmake $LOCAL_CHIPYARD_DIR/tests/ -S $LOCAL_CHIPYARD_DIR/tests/ -B $LOCAL_CHIPYARD_DIR/tests/build/ -D CMAKE_BUILD_TYPE=Debug
+        cmake --build $LOCAL_CHIPYARD_DIR/tests/build/ --target all
+
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/spiflashwrite.riscv LOADMEM=1
         [[ "`xxd $LOCAL_CHIPYARD_DIR/tests/spiflash.img  | grep 1337\ 00ff\ aa55\ face | wc -l`" == "6" ]] || false
         ;;
     chipyard-tethered)
-        make -C $LOCAL_CHIPYARD_DIR/tests
+        cmake $LOCAL_CHIPYARD_DIR/tests/ -S $LOCAL_CHIPYARD_DIR/tests/ -B $LOCAL_CHIPYARD_DIR/tests/build/ -D CMAKE_BUILD_TYPE=Debug
+        cmake --build $LOCAL_CHIPYARD_DIR/tests/build/ --target all
+
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/hello.riscv LOADMEM=1 EXTRA_SIM_FLAGS="+cflush_addr=0x2010200"
         ;;
     chipyard-symmetric)
-        make -C $LOCAL_CHIPYARD_DIR/tests
+        cmake $LOCAL_CHIPYARD_DIR/tests/ -S $LOCAL_CHIPYARD_DIR/tests/ -B $LOCAL_CHIPYARD_DIR/tests/build/ -D CMAKE_BUILD_TYPE=Debug
+        cmake --build $LOCAL_CHIPYARD_DIR/tests/build/ --target all
+
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/symmetric.riscv LOADMEM=1
         ;;
     chipyard-llcchiplet)
-        make -C $LOCAL_CHIPYARD_DIR/tests
+        cmake $LOCAL_CHIPYARD_DIR/tests/ -S $LOCAL_CHIPYARD_DIR/tests/ -B $LOCAL_CHIPYARD_DIR/tests/build/ -D CMAKE_BUILD_TYPE=Debug
+        cmake --build $LOCAL_CHIPYARD_DIR/tests/build/ --target all
+
         run_binary BINARY=$LOCAL_CHIPYARD_DIR/tests/hello.riscv LOADMEM=1
         ;;
     chipyard-rerocc)