From a912f32149f5c4502b945a230b4644a208245b3d Mon Sep 17 00:00:00 2001
From: Yinan Xu <xuyinan@ict.ac.cn>
Date: Fri, 19 Jan 2024 10:53:16 +0800
Subject: [PATCH] Bump Chisel 6.0.0 (#164)

---
 Makefile | 16 ----------------
 build.sc |  4 ++--
 difftest |  2 +-
 3 files changed, 3 insertions(+), 19 deletions(-)

diff --git a/Makefile b/Makefile
index 7c00fb07..13ab6308 100644
--- a/Makefile
+++ b/Makefile
@@ -24,22 +24,6 @@ CORE  ?= inorder  # inorder  ooo  embedded
 MILL_ARGS = -td $(RTL_DIR) BOARD=$(BOARD) CORE=$(CORE)
 FPGA_ARGS =
 
-# If firtool is not specified and not found in PATH, download and cache it.
-ifeq ($(FIRTOOL),)
-ifeq ($(shell which firtool 2>/dev/null),)
-FIRTOOL_VERSION = 1.61.0
-FIRTOOL_DIR = $(HOME)/.cache/firtool
-FIRTOOL_BIN = $(FIRTOOL_DIR)/firtool-$(FIRTOOL_VERSION)/bin/firtool
-ifeq ($(wildcard $(HOME)/.cache/firtool/firtool-$(FIRTOOL_VERSION)/bin),)
-$(info [INFO] Firtool not found.)
-FIRTOOL_URL = https://github.com/llvm/circt/releases/download/firtool-$(FIRTOOL_VERSION)/firrtl-bin-linux-x64.tar.gz
-$(info [INFO] Downloading from $(FIRTOOL_URL) to $(FIRTOOL_BIN))
-$(shell mkdir -p $(FIRTOOL_DIR) && curl -L $(FIRTOOL_URL) | tar -xzC $(FIRTOOL_DIR))
-endif
-FIRTOOL = $(FIRTOOL_BIN)
-endif
-endif
-
 ifneq ($(FIRTOOL),)
 MILL_ARGS += --firtool-binary-path $(FIRTOOL)
 endif
diff --git a/build.sc b/build.sc
index ec747926..993cc429 100644
--- a/build.sc
+++ b/build.sc
@@ -3,8 +3,8 @@ import coursier.maven.MavenRepository
 
 object ivys {
   val scala = "2.13.12"
-  val chisel = ivy"org.chipsalliance::chisel:6.0.0-RC2"
-  val chiselPlugin = ivy"org.chipsalliance:::chisel-plugin:6.0.0-RC2"
+  val chisel = ivy"org.chipsalliance::chisel:6.0.0"
+  val chiselPlugin = ivy"org.chipsalliance:::chisel-plugin:6.0.0"
 }
 
 trait CommonModule extends ScalaModule {
diff --git a/difftest b/difftest
index 207cceb6..ab7820f3 160000
--- a/difftest
+++ b/difftest
@@ -1 +1 @@
-Subproject commit 207cceb65e168f69c6830d618bfbf712600274c8
+Subproject commit ab7820f33c72e45df0781d954931bef7f6da66dd