diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index f4e17e8..c913759 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -154,9 +154,6 @@ jobs: name: ${{ matrix.fabric }}_${{ matrix.pdk }} path: fabrics/${{ matrix.fabric }}/macro/${{ matrix.pdk }}/ include-hidden-files: true - - name: Copy the Fabric - run: | - make ${{ matrix.fabric }}-copy - name: Implement the User Designs run: | cd user_designs; PDK=${{ matrix.pdk }} TILE_LIBRARY=${{ env.TILE_LIBRARY }} FABRIC=${{ matrix.fabric }} nix develop --command make all @@ -211,9 +208,6 @@ jobs: path: fabrics/classic_fabric_greyhound/macro/${{ env.pdk }}/ key: cache-fabric-classic_fabric_greyhound-${{ env.pdk }}-${{ env.REPO_SHORT_HASH }} fail-on-cache-miss: true - - name: Copy the Fabric - run: | - make classic_fabric_greyhound-copy - name: Enable the PDK run: | PDK=${{ env.pdk }} nix develop --command make clone-pdk @@ -262,9 +256,6 @@ jobs: path: fabrics/classic_fabric_greyhound/macro/${{ env.pdk }}/ key: cache-fabric-classic_fabric_greyhound-${{ env.pdk }}-${{ env.REPO_SHORT_HASH }} fail-on-cache-miss: true - - name: Copy the Fabric - run: | - make classic_fabric_greyhound-copy - name: Enable the PDK run: | PDK=${{ env.pdk }} nix develop --command make clone-pdk diff --git a/Makefile b/Makefile index 5f86b76..0ca4360 100644 --- a/Makefile +++ b/Makefile @@ -99,13 +99,6 @@ $(FABRICS_KLAYOUT): librelane --pdk ${PDK} fabrics/$(subst -klayout,,$@)/config.yaml --last-run --flow OpenInKLayout .PHONY: $(FABRICS_KLAYOUT) -$(FABRICS_COPY): - # Copy fabric database - mkdir -p user_designs/fabrics/$(subst -copy,,$@)/macro/${PDK}/ - cp -R fabrics/$(subst -copy,,$@)/macro/${PDK}/fabulous/ user_designs/fabrics/$(subst -copy,,$@)/macro/${PDK}/ - cp fabrics/$(subst -copy,,$@)/constraints.pcf user_designs/fabrics/$(subst -copy,,$@)/constraints.pcf -.PHONY: $(FABRICS_COPY) - # Implementation LIBRELANE_OPTS = --pdk ${PDK} --pdk-root ${PDK_ROOT} --manual-pdk diff --git a/user_designs/README.md b/user_designs/README.md index df88d02..8ec8b2a 100644 --- a/user_designs/README.md +++ b/user_designs/README.md @@ -23,7 +23,7 @@ Before you build the user designs, you need to select for which tile library and The default is: ``` -export FABRIC=classic_fabric_10x10 +export FABRIC=classic_fabric_greyhound export TILE_LIBRARY=classic ``` diff --git a/user_designs/fabrics/classic_fabric_greyhound/constraints.pcf b/user_designs/fabrics/classic_fabric_greyhound/constraints.pcf deleted file mode 100644 index b928b24..0000000 --- a/user_designs/fabrics/classic_fabric_greyhound/constraints.pcf +++ /dev/null @@ -1,165 +0,0 @@ -# SoC clock - -set_io sys_clk X0Y17/A - -# All I/Os - -set_io all[0] X0Y1/A -set_io all[1] X0Y1/B -set_io all[2] X0Y2/A -set_io all[3] X0Y2/B -set_io all[4] X0Y3/A -set_io all[5] X0Y3/B -set_io all[6] X0Y4/A -set_io all[7] X0Y4/B -set_io all[8] X0Y5/A -set_io all[9] X0Y5/B -set_io all[10] X0Y6/A -set_io all[11] X0Y6/B -set_io all[12] X0Y7/A -set_io all[13] X0Y7/B -set_io all[14] X0Y8/A -set_io all[15] X0Y8/B -set_io all[16] X0Y9/A -set_io all[17] X0Y9/B -set_io all[18] X0Y10/A -set_io all[19] X0Y10/B -set_io all[20] X0Y11/A -set_io all[21] X0Y11/B -set_io all[22] X0Y12/A -set_io all[23] X0Y12/B -set_io all[24] X0Y13/A -set_io all[25] X0Y13/B -set_io all[26] X0Y14/A -set_io all[27] X0Y14/B -set_io all[28] X0Y15/A -set_io all[29] X0Y15/B -set_io all[30] X0Y16/A -set_io all[31] X0Y16/B - -# For general tests - -set_io clk1 X0Y1/A -set_io clk2 X0Y1/B -set_io ena X0Y2/A -set_io rst X0Y2/B - -set_io e[0] X0Y3/A -set_io e[1] X0Y3/B -set_io e[2] X0Y4/A -set_io e[3] X0Y4/B - -set_io a[0] X0Y5/A -set_io a[1] X0Y5/B -set_io a[2] X0Y6/A -set_io a[3] X0Y6/B -set_io a[4] X0Y7/A -set_io a[5] X0Y7/B - -set_io b[0] X0Y8/A -set_io b[1] X0Y8/B -set_io b[2] X0Y9/A -set_io b[3] X0Y9/B -set_io b[4] X0Y10/A -set_io b[5] X0Y10/B - -set_io c[0] X0Y11/A -set_io c[1] X0Y11/B -set_io c[2] X0Y12/A -set_io c[3] X0Y12/B -set_io c[4] X0Y13/A -set_io c[5] X0Y13/B -set_io c[6] X0Y14/A -set_io c[7] X0Y14/B -set_io c[8] X0Y15/A -set_io c[9] X0Y15/B -set_io c[10] X0Y16/A -set_io c[11] X0Y16/B - -# For the register_file test - -set_io addr_a[0] X0Y3/A -set_io addr_a[1] X0Y3/B -set_io addr_a[2] X0Y4/A -set_io addr_a[3] X0Y4/B -set_io addr_a[4] X0Y5/A - -set_io addr_b[0] X0Y5/B -set_io addr_b[1] X0Y6/A -set_io addr_b[2] X0Y6/B -set_io addr_b[3] X0Y7/A -set_io addr_b[4] X0Y7/B - -set_io addr_c[0] X0Y8/A -set_io addr_c[1] X0Y8/B - -set_io word_a[0] X0Y9/A -set_io word_a[1] X0Y9/B -set_io word_a[2] X0Y10/A -set_io word_a[3] X0Y10/B - -set_io word_b[0] X0Y11/A -set_io word_b[1] X0Y11/B -set_io word_b[2] X0Y12/A -set_io word_b[3] X0Y12/B - -set_io word_c[0] X0Y13/A -set_io word_c[1] X0Y13/B -set_io word_c[2] X0Y14/A -set_io word_c[3] X0Y14/B - -# For the macc_8x8_20 test - -set_io product[0] X0Y11/A -set_io product[1] X0Y11/B -set_io product[2] X0Y12/A -set_io product[3] X0Y12/B -set_io product[4] X0Y13/A -set_io product[5] X0Y13/B -set_io product[6] X0Y14/A -set_io product[7] X0Y14/B -set_io product[8] X0Y15/A -set_io product[9] X0Y15/B -set_io product[10] X0Y16/A -set_io product[11] X0Y16/B - -# For the ihp_sram_1024x32_1rw test - -set_io ram_wen X0Y1/B -set_io ram_men X0Y2/A -set_io ram_ren X0Y2/B - -set_io ram_byte_sel[0] X0Y3/A -set_io ram_byte_sel[1] X0Y3/B -set_io ram_addr[0] X0Y4/A -set_io ram_addr[1] X0Y4/B - -set_io ram_addr[2] X0Y5/A -set_io ram_addr[3] X0Y5/B -set_io ram_addr[4] X0Y6/A -set_io ram_addr[5] X0Y6/B - -set_io ram_addr[6] X0Y7/A -set_io ram_addr[7] X0Y7/B -set_io ram_addr[8] X0Y8/A -set_io ram_addr[9] X0Y8/B - -set_io ram_din_byte[0] X0Y9/A -set_io ram_din_byte[1] X0Y9/B -set_io ram_din_byte[2] X0Y10/A -set_io ram_din_byte[3] X0Y10/B - -set_io ram_din_byte[4] X0Y11/A -set_io ram_din_byte[5] X0Y11/B -set_io ram_din_byte[6] X0Y12/A -set_io ram_din_byte[7] X0Y12/B - -set_io ram_dout_byte[0] X0Y13/A -set_io ram_dout_byte[1] X0Y13/B -set_io ram_dout_byte[2] X0Y14/A -set_io ram_dout_byte[3] X0Y14/B - -set_io ram_dout_byte[4] X0Y15/A -set_io ram_dout_byte[5] X0Y15/B -set_io ram_dout_byte[6] X0Y16/A -set_io ram_dout_byte[7] X0Y16/B diff --git a/user_designs/makefile.include b/user_designs/makefile.include index 9b1cc79..a1b90f6 100644 --- a/user_designs/makefile.include +++ b/user_designs/makefile.include @@ -2,7 +2,7 @@ PDK ?= ihp-sg13g2 FABRIC ?= classic_fabric_greyhound TILE_LIBRARY ?= classic -FABULOUS_ROOT ?= $(abspath ../../../fabrics/$(FABRIC)/macro/$(PDK)/fabulous) +FABULOUS_ROOT ?= $(abspath ../../../../fabrics/$(FABRIC)/macro/$(PDK)/fabulous) PCF_CONSTRAINTS ?= $(abspath $(FABULOUS_ROOT)/../../../constraints.pcf) TOP ?= top_wrapper #CORNER ?= nom_typ_1p20V_25C