Actually run InlineInstances pass

Makefrag

@@ -16,9 +16,16 @@ CXX ?= g++
 CXXFLAGS := -O1
 JVM_MEMORY ?= 2G
 
+EMPTY :=
+SPACE := $(EMPTY) $(EMPTY)
+COMMA := ,
+
 SBT ?= java -Xmx$(JVM_MEMORY) -Xss8M -XX:MaxPermSize=256M -jar $(base_dir)/sbt-launch.jar
 SHELL := /bin/bash
 
+FIRRTL_TRANSFORMS := \
+	firrtl.passes.InlineInstances \
+
 ROCKET_CLASSES ?= "$(base_dir)/target/scala-2.12/classes:$(base_dir)/chisel3/target/scala-2.12/*"
 FIRRTL_JAR ?= $(base_dir)/firrtl/utils/bin/firrtl.jar
 FIRRTL ?= java -Xmx$(JVM_MEMORY) -Xss8M -XX:MaxPermSize=256M -cp "$(FIRRTL_JAR)":"$(ROCKET_CLASSES)" firrtl.Driver

emulator/Makefrag-verilator

@@ -14,7 +14,14 @@ $(generated_dir)/%.fir $(generated_dir)/%.d: $(FIRRTL_JAR) $(chisel_srcs) $(boot
 
 %.v %.conf: %.fir $(FIRRTL_JAR)
 	mkdir -p $(dir $@)
-	$(FIRRTL) $(patsubst %,-i %,$(filter %.fir,$^)) -o $*.v -X verilog --infer-rw $(MODEL) --repl-seq-mem -c:$(MODEL):-o:$*.conf -faf $*.anno.json -td $(generated_dir)/$(long_name)/
+	$(FIRRTL) $(patsubst %,-i %,$(filter %.fir,$^)) \
+    -o $*.v \
+    -X verilog \
+    --infer-rw $(MODEL) \
+    --repl-seq-mem -c:$(MODEL):-o:$*.conf \
+    -faf $*.anno.json \
+    -td $(generated_dir)/$(long_name)/ \
+    -fct $(subst $(SPACE),$(COMMA),$(FIRRTL_TRANSFORMS)) \
 
 $(generated_dir)/$(long_name).behav_srams.v : $(generated_dir)/$(long_name).conf $(VLSI_MEM_GEN)
 	cd $(generated_dir) && \

vsim/Makefrag-verilog

@@ -14,7 +14,14 @@ $(generated_dir)/%.fir $(generated_dir)/%.d: $(FIRRTL_JAR) $(chisel_srcs) $(boot
 
 $(generated_dir)/%.v $(generated_dir)/%.conf: $(generated_dir)/%.fir $(FIRRTL_JAR)
 	mkdir -p $(dir $@)
-	$(FIRRTL) -i $< -o $(generated_dir)/$*.v -X verilog --infer-rw $(MODEL) --repl-seq-mem -c:$(MODEL):-o:$(generated_dir)/$*.conf -faf $(generated_dir)/$*.anno.json -td $(generated_dir)/$(long_name)/
+	$(FIRRTL) -i $< \
+    -o $(generated_dir)/$*.v \
+    -X verilog \
+    --infer-rw $(MODEL) \
+    --repl-seq-mem -c:$(MODEL):-o:$(generated_dir)/$*.conf \
+    -faf $(generated_dir)/$*.anno.json \
+    -td $(generated_dir)/$(long_name)/ \
+    -fct $(subst $(SPACE),$(COMMA),$(FIRRTL_TRANSFORMS)) \
 
 $(generated_dir)/$(long_name).behav_srams.v : $(generated_dir)/$(long_name).conf $(mem_gen)
 	cd $(generated_dir) && \