finishing: cleanup def2stream, include seal and filling steps

.github/workflows/artistic.yml

@@ -84,7 +84,7 @@ jobs:
       - name: Meercat setup, export top-level GDS
         uses: ./.github/actions/oseda-cmd
         with:
-          cmd: "ls -lah klayout; cd artistic; mkdir -p meerkat_work; python3 scripts/meerkat_interface.py -i ../../klayout/croc_chip.gds -m croc_tm.gds.gz -g croc_logo.gds -o croc_chip.gds.gz -w meerkat_work -l 134; cd meerkat_work; klayout -zz -rm ../scripts/export_top_metal.py; gzip -d croc_tm.gds.gz"
+          cmd: "ls -lah klayout; cd artistic; mkdir -p meerkat_work; python3 scripts/meerkat_interface.py -i ../../klayout/out/croc_chip.gds.gz -m croc_tm.gds.gz -g croc_logo.gds -o croc_chip.gds.gz -w meerkat_work -l 134; cd meerkat_work; klayout -zz -rm ../scripts/export_top_metal.py; gzip -d croc_tm.gds.gz"
       - name: Upload top-level GDS
         uses: actions/upload-artifact@v4
         with:

.github/workflows/full-flow.yml

@@ -31,7 +31,7 @@ jobs:
       - name: Run Yosys, OpenROAD and KLayout
         uses: ./.github/actions/oseda-cmd
         with:
-          cmd: "make yosys && make openroad && make klayout"
+          cmd: "make yosys && make openroad && make finishing"
       - name: Upload openroad outputs
         uses: actions/upload-artifact@v4
         with:
@@ -44,5 +44,10 @@ jobs:
         uses: actions/upload-artifact@v4
         with:
           name: croc-gds
-          path: klayout/croc_chip.gds
+          path: klayout/out/croc_chip.gds.gz
+      - name: Upload sealed gds
+        uses: actions/upload-artifact@v4
+        with:
+          name: croc-gds-sealed
+          path: klayout/out/croc_chip_sealed.gds.gz
         continue-on-error: true

Makefile

@@ -127,13 +127,21 @@ yosys-flist: Bender.lock Bender.yml rtl/*/Bender.yml
 include yosys/yosys.mk
 include openroad/openroad.mk
 
-klayout/croc_chip.gds: $(OR_OUT)/croc.def klayout/*.sh klayout/*.py
-	./klayout/def2gds.sh
+.PHONY: yosys-flist
 
-## Generate merged .gds from openroads .def output
-klayout: klayout/croc_chip.gds
 
-.PHONY: klayout yosys-flist
+#############
+# Finishing #
+#############
+ihp13/pdk.patched:
+	- cd ihp13/pdk; git apply ../patches/0001-Filling-improvements.patch
+	touch $@
+
+klayout/out/croc_chip_sealed.gds.gz: ihp13/pdk.patched openroad/out/croc.def klayout/scripts/*.py klayout/scripts/*.sh
+	bash klayout/scripts/finishing.sh
+
+finishing: klayout/out/croc_chip_sealed.gds.gz
+.PHONY: finishing
 
 
 #################
@@ -164,7 +172,7 @@ help: Makefile
 ## Delete generated files and directories
 clean: 
 	rm -f $(SV_FLIST)
-	rm -f klayout/croc_chip.gds
+	rm -rf klayout/out/
 	rm -rf verilator/obj_dir/
 	rm -f verilator/croc.f
 	rm -f verilator/croc.vcd

ihp13/.gitignore

@@ -0,0 +1 @@
+*.patched