From d54a178f3621365e6894430cd07fd4f366d5d758 Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Wed, 6 Nov 2019 11:18:08 -0800
Subject: [PATCH 1/2] partition objdir

---
 vlsi/Makefile | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/vlsi/Makefile b/vlsi/Makefile
index bdbeb1bb..4606492f 100644
--- a/vlsi/Makefile
+++ b/vlsi/Makefile
@@ -28,11 +28,16 @@ ifeq ($(tech_name),asap7)
 else
 	MACROCOMPILER_MODE ?= -l $(SMEMS_CACHE) -hir $(SMEMS_HAMMER)
 endif
-OBJ_DIR            ?= $(vlsi_dir)/build
-ENV_YML            ?= $(vlsi_dir)/env.yml
-INPUT_CONFS        ?= example.yml
+ENV_YML            ?= $(vlsi_dir)/bwrc-env.yml
+INPUT_CONFS        ?= example.yml $(dir $(tech_dir))/bwrc.yml
 HAMMER_EXEC        ?= ./example-vlsi
 VLSI_TOP           ?= $(TOP)
+VLSI_OBJ_DIR       ?= $(vlsi_dir)/build
+ifneq($(CUSTOM_VLOG), )
+	OBJ_DIR        ?= $(VLSI_OBJ_DIR)/custom-$(VLSI_TOP)
+else
+	OBJ_DIR        ?= $(VLSI_OBJ_DIR)/$(long_name)-$(VLSI_TOP)
+endif
 
 #########################################################################################
 # general rules
@@ -119,4 +124,4 @@ $(OBJ_DIR)/hammer.d: $(HAMMER_D_DEPS)
 #########################################################################################
 .PHONY: clean
 clean:
-	rm -rf $(OBJ_DIR) hammer-vlsi*.log __pycache__ output.json $(GENERATED_CONFS) $(gen_dir)
+	rm -rf $(VLSI_OBJ_DIR) hammer-vlsi*.log __pycache__ output.json $(GENERATED_CONFS) $(gen_dir)

From 443be014958fa8066dba1f64f923abd90c56726b Mon Sep 17 00:00:00 2001
From: abejgonzalez <abe.j.gonza@gmail.com>
Date: Wed, 6 Nov 2019 13:48:24 -0800
Subject: [PATCH 2/2] remove notion of bwrc-env and remove from INPUT_CONFS
 [skip ci]

---
 sims/firesim  | 2 +-
 vlsi/Makefile | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/sims/firesim b/sims/firesim
index 21475d1c..afad1b6a 160000
--- a/sims/firesim
+++ b/sims/firesim
@@ -1 +1 @@
-Subproject commit 21475d1c90500c01d3eb18a684831be93de6b089
+Subproject commit afad1b6accfaba5efbc0cfeea66372abae5ab2eb
diff --git a/vlsi/Makefile b/vlsi/Makefile
index 4606492f..d7135bb5 100644
--- a/vlsi/Makefile
+++ b/vlsi/Makefile
@@ -28,8 +28,8 @@ ifeq ($(tech_name),asap7)
 else
 	MACROCOMPILER_MODE ?= -l $(SMEMS_CACHE) -hir $(SMEMS_HAMMER)
 endif
-ENV_YML            ?= $(vlsi_dir)/bwrc-env.yml
-INPUT_CONFS        ?= example.yml $(dir $(tech_dir))/bwrc.yml
+ENV_YML            ?= $(vlsi_dir)/env.yml
+INPUT_CONFS        ?= example.yml
 HAMMER_EXEC        ?= ./example-vlsi
 VLSI_TOP           ?= $(TOP)
 VLSI_OBJ_DIR       ?= $(vlsi_dir)/build