From 1b93c22966298683c136a8a3f0ab7ef76e3240fe Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Wed, 7 Jun 2023 12:25:05 -0700
Subject: [PATCH 01/30] Makefile add openframe target

---
 Makefile | 41 +++++++++++++++++++++++++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/Makefile b/Makefile
index 03c90d20..84d3b5a3 100644
--- a/Makefile
+++ b/Makefile
@@ -194,6 +194,47 @@ __truck:
 	@cd $(CARAVEL_ROOT)/mag && PDKPATH=${PDK_ROOT}/$(PDK) MAGTYPE=mag magic -noc -dnull -rcfile ./.magicrc $(UPRJ_ROOT)/mag/mag2gds_caravan.tcl 2>&1 | tee $(UPRJ_ROOT)/signoff/build/make_truck.out
 ###	@rm $(UPRJ_ROOT)/mag/mag2gds_caravan.tcl
 
+.PHONY: ship
+openframe: check-env uncompress uncompress-caravel
+ifeq ($(FOREGROUND),1)
+	@echo "Running make openframe in the foreground..."
+	$(MAKE) -f $(CARAVEL_ROOT)/Makefile __openframe
+	@echo "Make openframe completed." 2>&1 | tee -a ./signoff/build/make_openframe.out
+else
+	@echo "Running make openframe in the background..."
+	nohup $(MAKE) -f $(CARAVEL_ROOT)/Makefile __ship >/dev/null 2>&1 &
+	tail -f signoff/build/make_openframe.out
+	@echo "Make openframe completed."  2>&1 | tee -a ./signoff/build/make_openframe.out
+endif
+
+__openframe:
+	@echo "###############################################"
+	@echo "Generating Caravel GDS (sources are in the 'gds' directory)"
+	@sleep 1
+#### Runs from the CARAVEL_ROOT mag directory
+	@echo "\
+		drc off; \
+		crashbackups stop; \
+		addpath hexdigits; \
+		addpath $(UPRJ_ROOT)/mag; \
+		load openframe_project_wrapper; \
+		property LEFview true; \
+		property GDS_FILE $(UPRJ_ROOT)/gds/openframe_project_wrapper.gds; \
+		property GDS_START 0; \
+		load $(CARAVEL_ROOT)/maglef/simple_por; \
+		load caravel -dereference; \
+		select top cell; \
+		expand; \
+		cif *hier write disable; \
+		cif *array write disable; \
+		gds write $(UPRJ_ROOT)/gds/caravel.gds; \
+		quit -noprompt;" > $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl
+### Runs from CARAVEL_ROOT
+	@mkdir -p ./signoff/build
+	#@cd $(CARAVEL_ROOT)/mag && PDKPATH=${PDK_ROOT}/$(PDK) MAGTYPE=mag magic -noc -dnull -rcfile ${PDK_ROOT}/$(PDK)/libs.tech/magic/$(PDK).magicrc $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl 2>&1 | tee $(UPRJ_ROOT)/signoff/build/make_ship.out
+	@cd $(CARAVEL_ROOT)/mag && PDKPATH=${PDK_ROOT}/$(PDK) MAGTYPE=mag magic -noc -dnull -rcfile ./.magicrc $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl 2>&1 | tee $(UPRJ_ROOT)/signoff/build/make_ship.out
+###	@rm $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl
+
 .PHONY: clean
 clean:
 	cd $(CARAVEL_ROOT)/verilog/dv/caravel/mgmt_soc/ && \

From bf4325dc16e4e93c46625e4b5edf72d69a1f68c9 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Wed, 7 Jun 2023 12:29:04 -0700
Subject: [PATCH 02/30] Makefile add openframe target

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 84d3b5a3..02a750a5 100644
--- a/Makefile
+++ b/Makefile
@@ -194,7 +194,7 @@ __truck:
 	@cd $(CARAVEL_ROOT)/mag && PDKPATH=${PDK_ROOT}/$(PDK) MAGTYPE=mag magic -noc -dnull -rcfile ./.magicrc $(UPRJ_ROOT)/mag/mag2gds_caravan.tcl 2>&1 | tee $(UPRJ_ROOT)/signoff/build/make_truck.out
 ###	@rm $(UPRJ_ROOT)/mag/mag2gds_caravan.tcl
 
-.PHONY: ship
+.PHONY: openframe
 openframe: check-env uncompress uncompress-caravel
 ifeq ($(FOREGROUND),1)
 	@echo "Running make openframe in the foreground..."
@@ -202,7 +202,7 @@ ifeq ($(FOREGROUND),1)
 	@echo "Make openframe completed." 2>&1 | tee -a ./signoff/build/make_openframe.out
 else
 	@echo "Running make openframe in the background..."
-	nohup $(MAKE) -f $(CARAVEL_ROOT)/Makefile __ship >/dev/null 2>&1 &
+	nohup $(MAKE) -f $(CARAVEL_ROOT)/Makefile __openframe >/dev/null 2>&1 &
 	tail -f signoff/build/make_openframe.out
 	@echo "Make openframe completed."  2>&1 | tee -a ./signoff/build/make_openframe.out
 endif

From ecad21b327d5d3298f69125a21d2143de27f4fb5 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Wed, 7 Jun 2023 12:31:14 -0700
Subject: [PATCH 03/30] Makefile add openframe target

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 02a750a5..20472cf0 100644
--- a/Makefile
+++ b/Makefile
@@ -222,7 +222,7 @@ __openframe:
 		property GDS_FILE $(UPRJ_ROOT)/gds/openframe_project_wrapper.gds; \
 		property GDS_START 0; \
 		load $(CARAVEL_ROOT)/maglef/simple_por; \
-		load caravel -dereference; \
+		load caravel_openframe -dereference; \
 		select top cell; \
 		expand; \
 		cif *hier write disable; \

From c8beae7fe7b19308fd0a9290ccc25c49d2779a0b Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Wed, 7 Jun 2023 12:45:03 -0700
Subject: [PATCH 04/30] disable dist for fill gen

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 20472cf0..8076e835 100644
--- a/Makefile
+++ b/Makefile
@@ -1145,8 +1145,8 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
-	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 
 .PHONY: final

From 28c9ef91c44635d6be3d63844ffc012125d60e15 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Wed, 7 Jun 2023 15:32:29 -0700
Subject: [PATCH 05/30] change .magicrc to use from pdk

---
 Makefile | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 8076e835..1efb3bb5 100644
--- a/Makefile
+++ b/Makefile
@@ -231,8 +231,8 @@ __openframe:
 		quit -noprompt;" > $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl
 ### Runs from CARAVEL_ROOT
 	@mkdir -p ./signoff/build
-	#@cd $(CARAVEL_ROOT)/mag && PDKPATH=${PDK_ROOT}/$(PDK) MAGTYPE=mag magic -noc -dnull -rcfile ${PDK_ROOT}/$(PDK)/libs.tech/magic/$(PDK).magicrc $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl 2>&1 | tee $(UPRJ_ROOT)/signoff/build/make_ship.out
-	@cd $(CARAVEL_ROOT)/mag && PDKPATH=${PDK_ROOT}/$(PDK) MAGTYPE=mag magic -noc -dnull -rcfile ./.magicrc $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl 2>&1 | tee $(UPRJ_ROOT)/signoff/build/make_ship.out
+	@cd $(CARAVEL_ROOT)/mag && PDKPATH=${PDK_ROOT}/$(PDK) MAGTYPE=mag magic -noc -dnull -rcfile ${PDK_ROOT}/$(PDK)/libs.tech/magic/$(PDK).magicrc $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl 2>&1 | tee $(UPRJ_ROOT)/signoff/build/make_ship.out
+	#@cd $(CARAVEL_ROOT)/mag && PDKPATH=${PDK_ROOT}/$(PDK) MAGTYPE=mag magic -noc -dnull -rcfile ./.magicrc $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl 2>&1 | tee $(UPRJ_ROOT)/signoff/build/make_ship.out
 ###	@rm $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl
 
 .PHONY: clean
@@ -1145,8 +1145,8 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
+	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 
 .PHONY: final

From eb4edd3db35a946d42b422ae3c696ddf8d5e4c8a Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Wed, 7 Jun 2023 16:58:08 -0700
Subject: [PATCH 06/30] change .magicrc to use from pdk

---
 scripts/compositor.py    | 6 +++---
 scripts/generate_fill.py | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/scripts/compositor.py b/scripts/compositor.py
index 999038f7..df05b215 100755
--- a/scripts/compositor.py
+++ b/scripts/compositor.py
@@ -147,9 +147,9 @@ if __name__ == '__main__':
         keepmode = True
 
     magpath = mag_dir_path
-    rcfile = magpath + '/.magicrc'
-    # pdk_root = os.getenv("PDK_ROOT")
-    # rcfile = pdk_root + '/sky130A/libs.tech/magic/sky130A.magicrc'
+    # rcfile = magpath + '/.magicrc'
+    pdk_root = os.getenv("PDK_ROOT")
+    rcfile = pdk_root + '/sky130A/libs.tech/magic/sky130A.magicrc'
 
     gdspath = gds_dir_path
 
diff --git a/scripts/generate_fill.py b/scripts/generate_fill.py
index 2b0db8ef..964a6a87 100755
--- a/scripts/generate_fill.py
+++ b/scripts/generate_fill.py
@@ -153,9 +153,9 @@ if __name__ == '__main__':
         distmode = True
 
     magpath = user_project_path + '/mag'
-    rcfile = magpath + '/.magicrc'
-    # pdk_root = os.getenv("PDK_ROOT")
-    # rcfile = pdk_root + '/sky130A/libs.tech/magic/sky130A.magicrc'
+    # rcfile = magpath + '/.magicrc'
+    pdk_root = os.getenv("PDK_ROOT")
+    rcfile = pdk_root + '/sky130A/libs.tech/magic/sky130A.magicrc'
 
     if not os.path.isfile(rcfile):
         rcfile = None

From da285b949e521e4e170a15ba9c815c293fe59d42 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Wed, 7 Jun 2023 17:08:10 -0700
Subject: [PATCH 07/30] add user_id back

---
 Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/Makefile b/Makefile
index 1efb3bb5..7b678c9a 100644
--- a/Makefile
+++ b/Makefile
@@ -221,6 +221,8 @@ __openframe:
 		property LEFview true; \
 		property GDS_FILE $(UPRJ_ROOT)/gds/openframe_project_wrapper.gds; \
 		property GDS_START 0; \
+		load $(UPRJ_ROOT)/mag/user_id_programming; \
+		load $(UPRJ_ROOT)/mag/user_id_textblock; \
 		load $(CARAVEL_ROOT)/maglef/simple_por; \
 		load caravel_openframe -dereference; \
 		select top cell; \

From 475368a304621d4645606127f64bed810e7dbfc4 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@users.noreply.github.com>
Date: Thu, 8 Jun 2023 00:21:17 +0000
Subject: [PATCH 08/30] Apply automatic changes to Manifest and README.rst

---
 manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest b/manifest
index 96d619cf..d22992e7 100644
--- a/manifest
+++ b/manifest
@@ -54,5 +54,5 @@ e0c6ead5e35c1ba01d923c482e953c2af9691524  verilog/rtl/mprj_io_buffer.v
 b9d6114a5067a04dd59cdd46fb988591c16743ce  verilog/rtl/spare_logic_block.v
 8f0bec01c914efe790a09ffe62bbfe0781069e35  verilog/rtl/xres_buf.v
 256190717faa72005cf7656d8443c4c0693b3f78  scripts/set_user_id.py
-98168b1fb6f80b196f9a05e725ec6ad99bc57ac6  scripts/generate_fill.py
-9e31b1bbbb03024d02d54f9da8d42b3837abc5e5  scripts/compositor.py
+50837d9dc036802fd2b3d2ad07275e3a0e6ca522  scripts/generate_fill.py
+844f897f586a5cdcf95be3dbfdd04201c9ed14ca  scripts/compositor.py

From d71763f6c3ac2f1ed50eaa26c8ccad57ee79e130 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Wed, 7 Jun 2023 17:25:50 -0700
Subject: [PATCH 09/30] add user_id back

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 7b678c9a..d7b7964e 100644
--- a/Makefile
+++ b/Makefile
@@ -1147,7 +1147,7 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
 	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 

From d265ffa318052cb6b6e1b436c5013765ccd9cd5a Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Wed, 7 Jun 2023 17:30:10 -0700
Subject: [PATCH 10/30] rename top to caravel

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index d7b7964e..1ad411e6 100644
--- a/Makefile
+++ b/Makefile
@@ -229,6 +229,7 @@ __openframe:
 		expand; \
 		cif *hier write disable; \
 		cif *array write disable; \
+		save caravel; \
 		gds write $(UPRJ_ROOT)/gds/caravel.gds; \
 		quit -noprompt;" > $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl
 ### Runs from CARAVEL_ROOT

From a2fb17282c287f222b14b75f02653a52be6c7dd4 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 07:25:22 -0700
Subject: [PATCH 11/30] change bbox for gen fill

---
 Makefile                 | 4 ++--
 scripts/generate_fill.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1ad411e6..8ee1240e 100644
--- a/Makefile
+++ b/Makefile
@@ -1148,8 +1148,8 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
-	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 
 .PHONY: final
diff --git a/scripts/generate_fill.py b/scripts/generate_fill.py
index 964a6a87..098a590a 100755
--- a/scripts/generate_fill.py
+++ b/scripts/generate_fill.py
@@ -192,7 +192,8 @@ if __name__ == '__main__':
     if not distmode:
         print('cif ostyle wafflefill(tiled)', file=ofile)
     print('', file=ofile)
-    print('set fullbox [box values]', file=ofile)
+    # print('set fullbox [box values]', file=ofile)
+    print('set fullbox { 0 0 3588um 5188um }', file=ofile)
     print('set xmax [lindex $fullbox 2]', file=ofile)
     print('set xmin [lindex $fullbox 0]', file=ofile)
     print('set fullwidth [expr {$xmax - $xmin}]', file=ofile)

From 6f7ac1fcfb051d10f3e32775df3760af7f0fce45 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 07:28:54 -0700
Subject: [PATCH 12/30] change bbox for gen fill

---
 scripts/generate_fill.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate_fill.py b/scripts/generate_fill.py
index 098a590a..5a0646f8 100755
--- a/scripts/generate_fill.py
+++ b/scripts/generate_fill.py
@@ -193,7 +193,7 @@ if __name__ == '__main__':
         print('cif ostyle wafflefill(tiled)', file=ofile)
     print('', file=ofile)
     # print('set fullbox [box values]', file=ofile)
-    print('set fullbox { 0 0 3588um 5188um }', file=ofile)
+    print('set fullbox { 0 0 717600 1037600 }', file=ofile)
     print('set xmax [lindex $fullbox 2]', file=ofile)
     print('set xmin [lindex $fullbox 0]', file=ofile)
     print('set fullwidth [expr {$xmax - $xmin}]', file=ofile)

From 83d06e23e9ef75ce14806c3f8d3e613c7f7b5162 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 07:37:32 -0700
Subject: [PATCH 13/30] change bbox for gen fill

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8ee1240e..1ad411e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1148,8 +1148,8 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 
 .PHONY: final

From 2852f5de6fe70663dffa0891e934410e975f04ac Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@users.noreply.github.com>
Date: Thu, 8 Jun 2023 14:58:47 +0000
Subject: [PATCH 14/30] Apply automatic changes to Manifest and README.rst

---
 manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest b/manifest
index d22992e7..e11ff1a5 100644
--- a/manifest
+++ b/manifest
@@ -54,5 +54,5 @@ e0c6ead5e35c1ba01d923c482e953c2af9691524  verilog/rtl/mprj_io_buffer.v
 b9d6114a5067a04dd59cdd46fb988591c16743ce  verilog/rtl/spare_logic_block.v
 8f0bec01c914efe790a09ffe62bbfe0781069e35  verilog/rtl/xres_buf.v
 256190717faa72005cf7656d8443c4c0693b3f78  scripts/set_user_id.py
-50837d9dc036802fd2b3d2ad07275e3a0e6ca522  scripts/generate_fill.py
+548bcf2c67867cd6bb0107352409710d64ee1350  scripts/generate_fill.py
 844f897f586a5cdcf95be3dbfdd04201c9ed14ca  scripts/compositor.py

From ec5a034274f90a81a47b9807ac02dda264bf4514 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 09:48:04 -0700
Subject: [PATCH 15/30] remove -keep for gen fill

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1ad411e6..2d5607bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1148,7 +1148,7 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
 	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 

From 05a7fe0024f7a7190c1d9a4d0d94fdc173c65637 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 10:37:10 -0700
Subject: [PATCH 16/30] add -keep

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2d5607bb..1a48ec3e 100644
--- a/Makefile
+++ b/Makefile
@@ -1148,7 +1148,8 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
+	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
 	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 

From 361e51f3d0fbc53903aece2774a884be094c72ca Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 12:40:54 -0700
Subject: [PATCH 17/30] correct load issue with gen fill

---
 scripts/generate_fill.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/generate_fill.py b/scripts/generate_fill.py
index 5a0646f8..9d9a90ca 100755
--- a/scripts/generate_fill.py
+++ b/scripts/generate_fill.py
@@ -187,6 +187,7 @@ if __name__ == '__main__':
     print('gds readonly true', file=ofile)
     print('gds rescale false', file=ofile)
     print('gds read ../gds/' + project, file=ofile)
+    print('load ' + project, file=ofile)
     print('select top cell', file=ofile)
     print('expand', file=ofile)
     if not distmode:

From 60f4b17dccfa7c9b352e3bb9b5a14d64a1b0fd9e Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@users.noreply.github.com>
Date: Thu, 8 Jun 2023 19:54:30 +0000
Subject: [PATCH 18/30] Apply automatic changes to Manifest and README.rst

---
 manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest b/manifest
index e11ff1a5..be1adde3 100644
--- a/manifest
+++ b/manifest
@@ -54,5 +54,5 @@ e0c6ead5e35c1ba01d923c482e953c2af9691524  verilog/rtl/mprj_io_buffer.v
 b9d6114a5067a04dd59cdd46fb988591c16743ce  verilog/rtl/spare_logic_block.v
 8f0bec01c914efe790a09ffe62bbfe0781069e35  verilog/rtl/xres_buf.v
 256190717faa72005cf7656d8443c4c0693b3f78  scripts/set_user_id.py
-548bcf2c67867cd6bb0107352409710d64ee1350  scripts/generate_fill.py
+c19309aec5f7aad1ae1a90f8453218223a189dea  scripts/generate_fill.py
 844f897f586a5cdcf95be3dbfdd04201c9ed14ca  scripts/compositor.py

From 436066bafc925ba4f4d17bdff000682fcefdd32f Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 23:25:59 -0700
Subject: [PATCH 19/30] remove -keep

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1a48ec3e..ae7181db 100644
--- a/Makefile
+++ b/Makefile
@@ -1148,8 +1148,8 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
+	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
 	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 

From 1e6dc8992b169b309f10c7ee1fa50617cec78d6e Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@users.noreply.github.com>
Date: Thu, 8 Jun 2023 00:21:17 +0000
Subject: [PATCH 20/30] Apply automatic changes to Manifest and README.rst

---
 manifest | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/manifest b/manifest
index 96d619cf..d22992e7 100644
--- a/manifest
+++ b/manifest
@@ -54,5 +54,5 @@ e0c6ead5e35c1ba01d923c482e953c2af9691524  verilog/rtl/mprj_io_buffer.v
 b9d6114a5067a04dd59cdd46fb988591c16743ce  verilog/rtl/spare_logic_block.v
 8f0bec01c914efe790a09ffe62bbfe0781069e35  verilog/rtl/xres_buf.v
 256190717faa72005cf7656d8443c4c0693b3f78  scripts/set_user_id.py
-98168b1fb6f80b196f9a05e725ec6ad99bc57ac6  scripts/generate_fill.py
-9e31b1bbbb03024d02d54f9da8d42b3837abc5e5  scripts/compositor.py
+50837d9dc036802fd2b3d2ad07275e3a0e6ca522  scripts/generate_fill.py
+844f897f586a5cdcf95be3dbfdd04201c9ed14ca  scripts/compositor.py

From f3cd9e09eb8502ef3fe56472c3a9bfc39723fb15 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Wed, 7 Jun 2023 17:30:10 -0700
Subject: [PATCH 21/30] rename top to caravel

---
 Makefile | 1 +
 1 file changed, 1 insertion(+)

diff --git a/Makefile b/Makefile
index d7b7964e..1ad411e6 100644
--- a/Makefile
+++ b/Makefile
@@ -229,6 +229,7 @@ __openframe:
 		expand; \
 		cif *hier write disable; \
 		cif *array write disable; \
+		save caravel; \
 		gds write $(UPRJ_ROOT)/gds/caravel.gds; \
 		quit -noprompt;" > $(UPRJ_ROOT)/mag/mag2gds_caravel.tcl
 ### Runs from CARAVEL_ROOT

From 6d06bd9fa46cfb53c85fb4301fe40bfb71dd408f Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 07:25:22 -0700
Subject: [PATCH 22/30] change bbox for gen fill

---
 Makefile                 | 4 ++--
 scripts/generate_fill.py | 3 ++-
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile b/Makefile
index 1ad411e6..8ee1240e 100644
--- a/Makefile
+++ b/Makefile
@@ -1148,8 +1148,8 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
-	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 
 .PHONY: final
diff --git a/scripts/generate_fill.py b/scripts/generate_fill.py
index 964a6a87..098a590a 100755
--- a/scripts/generate_fill.py
+++ b/scripts/generate_fill.py
@@ -192,7 +192,8 @@ if __name__ == '__main__':
     if not distmode:
         print('cif ostyle wafflefill(tiled)', file=ofile)
     print('', file=ofile)
-    print('set fullbox [box values]', file=ofile)
+    # print('set fullbox [box values]', file=ofile)
+    print('set fullbox { 0 0 3588um 5188um }', file=ofile)
     print('set xmax [lindex $fullbox 2]', file=ofile)
     print('set xmin [lindex $fullbox 0]', file=ofile)
     print('set fullwidth [expr {$xmax - $xmin}]', file=ofile)

From f3250ea8eebfe3e0ceeb56574f5639b100d7f65e Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 07:28:54 -0700
Subject: [PATCH 23/30] change bbox for gen fill

---
 scripts/generate_fill.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/generate_fill.py b/scripts/generate_fill.py
index 098a590a..5a0646f8 100755
--- a/scripts/generate_fill.py
+++ b/scripts/generate_fill.py
@@ -193,7 +193,7 @@ if __name__ == '__main__':
         print('cif ostyle wafflefill(tiled)', file=ofile)
     print('', file=ofile)
     # print('set fullbox [box values]', file=ofile)
-    print('set fullbox { 0 0 3588um 5188um }', file=ofile)
+    print('set fullbox { 0 0 717600 1037600 }', file=ofile)
     print('set xmax [lindex $fullbox 2]', file=ofile)
     print('set xmin [lindex $fullbox 0]', file=ofile)
     print('set fullwidth [expr {$xmax - $xmin}]', file=ofile)

From 485ecd03e691fb075bfc31709a337703a4713dcc Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 07:37:32 -0700
Subject: [PATCH 24/30] change bbox for gen fill

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 8ee1240e..1ad411e6 100644
--- a/Makefile
+++ b/Makefile
@@ -1148,8 +1148,8 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 
 .PHONY: final

From 8b7f4a42988d239901fb8f4b9f23137d4759de99 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 09:48:04 -0700
Subject: [PATCH 25/30] remove -keep for gen fill

---
 Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 1ad411e6..2d5607bb 100644
--- a/Makefile
+++ b/Makefile
@@ -1148,7 +1148,7 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
 	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 

From 63c229190bcd8e00f2eb1209b0bd9cfedd5ff548 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@users.noreply.github.com>
Date: Thu, 8 Jun 2023 14:58:47 +0000
Subject: [PATCH 26/30] Apply automatic changes to Manifest and README.rst

---
 manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest b/manifest
index d22992e7..e11ff1a5 100644
--- a/manifest
+++ b/manifest
@@ -54,5 +54,5 @@ e0c6ead5e35c1ba01d923c482e953c2af9691524  verilog/rtl/mprj_io_buffer.v
 b9d6114a5067a04dd59cdd46fb988591c16743ce  verilog/rtl/spare_logic_block.v
 8f0bec01c914efe790a09ffe62bbfe0781069e35  verilog/rtl/xres_buf.v
 256190717faa72005cf7656d8443c4c0693b3f78  scripts/set_user_id.py
-50837d9dc036802fd2b3d2ad07275e3a0e6ca522  scripts/generate_fill.py
+548bcf2c67867cd6bb0107352409710d64ee1350  scripts/generate_fill.py
 844f897f586a5cdcf95be3dbfdd04201c9ed14ca  scripts/compositor.py

From 6a67c25d122fb2560443bb162c1689427e1fb167 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 10:37:10 -0700
Subject: [PATCH 27/30] add -keep

---
 Makefile | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 2d5607bb..1a48ec3e 100644
--- a/Makefile
+++ b/Makefile
@@ -1148,7 +1148,8 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
+	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
 	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 

From 547e09de776efe632754e8bfedfe57694699969a Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 12:40:54 -0700
Subject: [PATCH 28/30] correct load issue with gen fill

---
 scripts/generate_fill.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/scripts/generate_fill.py b/scripts/generate_fill.py
index 5a0646f8..9d9a90ca 100755
--- a/scripts/generate_fill.py
+++ b/scripts/generate_fill.py
@@ -187,6 +187,7 @@ if __name__ == '__main__':
     print('gds readonly true', file=ofile)
     print('gds rescale false', file=ofile)
     print('gds read ../gds/' + project, file=ofile)
+    print('load ' + project, file=ofile)
     print('select top cell', file=ofile)
     print('expand', file=ofile)
     if not distmode:

From 7a66e0910d36b3e73ee4a32b416275bc9e011e47 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@efabless.com>
Date: Thu, 8 Jun 2023 23:25:59 -0700
Subject: [PATCH 29/30] remove -keep

---
 Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 1a48ec3e..ae7181db 100644
--- a/Makefile
+++ b/Makefile
@@ -1148,8 +1148,8 @@ endif
 __generate_fill:
 	@mkdir -p ./signoff/build
 	@cp -r $(CARAVEL_ROOT)/mag/.magicrc $(shell pwd)/mag
-	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
-	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
+	python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist 2>&1 | tee ./signoff/build/generate_fill.out
+	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -dist -keep 2>&1 | tee ./signoff/build/generate_fill.out
 	#python3 $(CARAVEL_ROOT)/scripts/generate_fill.py $(USER_ID) $(PROJECT) $(shell pwd) -keep 2>&1 | tee ./signoff/build/generate_fill.out
 
 

From 34cdf348d514a31de9d45171e132286fc4ca9b60 Mon Sep 17 00:00:00 2001
From: jeffdi <jeffdi@users.noreply.github.com>
Date: Thu, 8 Jun 2023 19:54:30 +0000
Subject: [PATCH 30/30] Apply automatic changes to Manifest and README.rst

---
 manifest | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/manifest b/manifest
index e11ff1a5..be1adde3 100644
--- a/manifest
+++ b/manifest
@@ -54,5 +54,5 @@ e0c6ead5e35c1ba01d923c482e953c2af9691524  verilog/rtl/mprj_io_buffer.v
 b9d6114a5067a04dd59cdd46fb988591c16743ce  verilog/rtl/spare_logic_block.v
 8f0bec01c914efe790a09ffe62bbfe0781069e35  verilog/rtl/xres_buf.v
 256190717faa72005cf7656d8443c4c0693b3f78  scripts/set_user_id.py
-548bcf2c67867cd6bb0107352409710d64ee1350  scripts/generate_fill.py
+c19309aec5f7aad1ae1a90f8453218223a189dea  scripts/generate_fill.py
 844f897f586a5cdcf95be3dbfdd04201c9ed14ca  scripts/compositor.py