From efb4b7dcbffc704762a3d95a7a78bac8c150804c Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Sun, 5 Feb 2023 21:51:54 -0800
Subject: [PATCH] Fix barstools for 1.29.0 firtool

---
 common.mk       | 3 ++-
 tools/barstools | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/common.mk b/common.mk
index 96767e0d..cddbf5b7 100644
--- a/common.mk
+++ b/common.mk
@@ -177,8 +177,9 @@ endif
 		--annotation-file $(FINAL_ANNO_FILE) \
 		--log-level $(FIRRTL_LOGLEVEL) \
 		--allow-unrecognized-annotations \
+		-DX $(SFC_LEVEL) \
 		-X $(SFC_LEVEL) \
-		$(EXTRA_FIRRTL_OPTIONS))
+		$(EXTRA_FIRRTL_OPTIONS)) # -X and -DX are duplicates to allow for extra FIRRTL passes to be run
 	-mv $(SFC_FIRRTL_BASENAME).lo.fir $(SFC_FIRRTL_FILE) # Optionally change file type when SFC generates LowFIRRTL
 	@if [ "$(SFC_LEVEL)" = low ]; then cat $(SFC_ANNO_FILE) | jq 'del(.[] | select(.target | test("io.cpu"))?)' > /tmp/unnec-anno-deleted.sfc.anno.json; fi
 	@if [ "$(SFC_LEVEL)" = low ]; then cat /tmp/unnec-anno-deleted.sfc.anno.json | jq 'del(.[] | select(.class | test("SRAMAnnotation"))?)' > /tmp/unnec-anno-deleted2.sfc.anno.json; fi
diff --git a/tools/barstools b/tools/barstools
index df3232f7..653989c0 160000
--- a/tools/barstools
+++ b/tools/barstools
@@ -1 +1 @@
-Subproject commit df3232f7d967d22570dd3c90706ce9422c25df07
+Subproject commit 653989c092eef55059e4720523927d52d43ffebf