From 933f2cd65c4fa8e45c91ddd74ac013dec67b9e3b Mon Sep 17 00:00:00 2001
From: Luke Wren <wren6991@gmail.com>
Date: Sat, 11 Dec 2021 09:53:39 +0000
Subject: [PATCH] Fix remaining fallout from tb args change

---
 test/sim/coremark/Makefile                | 4 ++--
 test/sim/embench/embench-iot              | 2 +-
 test/sim/riscv-compliance/riscv-arch-test | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/test/sim/coremark/Makefile b/test/sim/coremark/Makefile
index d292375..840fa8c 100644
--- a/test/sim/coremark/Makefile
+++ b/test/sim/coremark/Makefile
@@ -1,7 +1,7 @@
 APP          := coremark
 MAX_CYCLES   := 100000000
 
-CROSS_PREFIX ?= /opt/riscv/unstable/bin/riscv32-unknown-elf-
+CROSS_PREFIX ?= riscv32-unknown-elf-
 TBDIR        ?= ../tb_cxxrtl
 
 
@@ -13,7 +13,7 @@ TBDIR        ?= ../tb_cxxrtl
 all: run
 
 run: $(APP).bin
-	$(TBDIR)/tb $(APP).bin --cycles $(MAX_CYCLES)
+	$(TBDIR)/tb --bin $(APP).bin --cycles $(MAX_CYCLES)
 
 waves: $(APP).bin
 	$(TBDIR)/tb $(APP).bin $(APPNAME)_run.vcd --cycles $(MAX_CYCLES)
diff --git a/test/sim/embench/embench-iot b/test/sim/embench/embench-iot
index 6425003..97bf4b8 160000
--- a/test/sim/embench/embench-iot
+++ b/test/sim/embench/embench-iot
@@ -1 +1 @@
-Subproject commit 64250035f295b76f25a1c42eb9b8deedd3392de5
+Subproject commit 97bf4b8e15e3bb8654896aaca66399f26db6d657
diff --git a/test/sim/riscv-compliance/riscv-arch-test b/test/sim/riscv-compliance/riscv-arch-test
index c0d882b..b436dd0 160000
--- a/test/sim/riscv-compliance/riscv-arch-test
+++ b/test/sim/riscv-compliance/riscv-arch-test
@@ -1 +1 @@
-Subproject commit c0d882b47181b63b22b4cf4e41b50bf707e2f3e5
+Subproject commit b436dd0939c968f2c3da86bb9b63bb2dfe03b134