From 105fd7fd23230b8f2ec0623ab0d3c08f8589c0e3 Mon Sep 17 00:00:00 2001
From: Jerry Zhao <jerryz123@berkeley.edu>
Date: Mon, 22 Apr 2024 20:10:53 -0700
Subject: [PATCH] Remove useless GenerateModelStageMain

---
 common.mk    | 16 ++--------------
 variables.mk |  5 -----
 2 files changed, 2 insertions(+), 19 deletions(-)

diff --git a/common.mk b/common.mk
index 9913a778..02d2a313 100644
--- a/common.mk
+++ b/common.mk
@@ -194,17 +194,6 @@ endif
 
 $(SFC_MFC_TARGETS) &: $(TAPEOUT_CLASSPATH_TARGETS) $(FIRRTL_FILE) $(FINAL_ANNO_FILE) $(MFC_LOWERING_OPTIONS)
 	rm -rf $(GEN_COLLATERAL_DIR)
-	$(call run_jar_scala_main,$(TAPEOUT_CLASSPATH),tapeout.transforms.GenerateModelStageMain,\
-		--no-dedup \
-		--output-file $(SFC_FIRRTL_BASENAME) \
-		--output-annotation-file $(SFC_ANNO_FILE) \
-		--target-dir $(GEN_COLLATERAL_DIR) \
-		--input-file $(FIRRTL_FILE) \
-		--annotation-file $(FINAL_ANNO_FILE) \
-		--log-level $(FIRRTL_LOGLEVEL) \
-		-X none \
-		--allow-unrecognized-annotations)
-	-mv $(SFC_FIRRTL_BASENAME).lo.fir $(SFC_FIRRTL_FILE)
 	firtool \
 		--format=fir \
 		--export-module-hierarchy \
@@ -216,11 +205,10 @@ $(SFC_MFC_TARGETS) &: $(TAPEOUT_CLASSPATH_TARGETS) $(FIRRTL_FILE) $(FINAL_ANNO_F
 		--lowering-options=$(shell cat $(MFC_LOWERING_OPTIONS)) \
 		--repl-seq-mem \
 		--repl-seq-mem-file=$(MFC_SMEMS_CONF) \
-		--annotation-file=$(SFC_ANNO_FILE) \
+		--annotation-file=$(FINAL_ANNO_FILE) \
 		--split-verilog \
 		-o $(GEN_COLLATERAL_DIR) \
-		$(SFC_FIRRTL_FILE)
-	$(SED) -i 's/.*/& /' $(MFC_SMEMS_CONF) # need trailing space for SFC macrocompiler
+		$(FIRRTL_FILE)
 	touch $(MFC_BB_MODS_FILELIST) # if there are no BB's then the file might not be generated, instead always generate it
 # DOC include end: FirrtlCompiler
 
diff --git a/variables.mk b/variables.mk
index 72b1bd2b..2511c23a 100644
--- a/variables.mk
+++ b/variables.mk
@@ -176,11 +176,6 @@ CHISEL_LOG_FILE ?= $(build_dir)/$(long_name).chisel.log
 MFC_EXTRA_ANNO_FILE ?= $(build_dir)/$(long_name).extrafirtool.anno.json
 FINAL_ANNO_FILE ?= $(build_dir)/$(long_name).appended.anno.json
 
-# scala firrtl compiler (sfc) outputs
-SFC_FIRRTL_BASENAME ?= $(build_dir)/$(long_name).sfc
-SFC_FIRRTL_FILE ?= $(SFC_FIRRTL_BASENAME).fir
-SFC_ANNO_FILE ?= $(build_dir)/$(long_name).sfc.anno.json
-
 # firtool compiler outputs
 MFC_TOP_HRCHY_JSON ?= $(build_dir)/top_module_hierarchy.json
 MFC_MODEL_HRCHY_JSON ?= $(build_dir)/model_module_hierarchy.json