From ee4a011b69351d5e19c0624767789b7d64fc4c3a Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Sat, 24 Oct 2020 16:05:37 -0700 Subject: [PATCH 1/3] Fixing primitive library version names. Signed-off-by: Tim 'mithro' Ansell --- .gitmodules | 37 ++++++---------------- libraries/sky130_fd_pr/{0.0.9 => v0.0.9} | 0 libraries/sky130_fd_pr/{0.10.0 => v0.10.0} | 0 libraries/sky130_fd_pr/{0.10.1 => v0.10.1} | 0 libraries/sky130_fd_pr/{0.11.0 => v0.11.0} | 0 libraries/sky130_fd_pr/{0.12.0 => v0.12.0} | 0 libraries/sky130_fd_pr/{0.12.1 => v0.12.1} | 0 libraries/sky130_fd_pr/{0.13.0 => v0.13.0} | 0 libraries/sky130_fd_pr/{0.20.0 => v0.20.0} | 0 libraries/sky130_fd_pr/{0.20.1 => v0.20.1} | 0 10 files changed, 10 insertions(+), 27 deletions(-) rename libraries/sky130_fd_pr/{0.0.9 => v0.0.9} (100%) rename libraries/sky130_fd_pr/{0.10.0 => v0.10.0} (100%) rename libraries/sky130_fd_pr/{0.10.1 => v0.10.1} (100%) rename libraries/sky130_fd_pr/{0.11.0 => v0.11.0} (100%) rename libraries/sky130_fd_pr/{0.12.0 => v0.12.0} (100%) rename libraries/sky130_fd_pr/{0.12.1 => v0.12.1} (100%) rename libraries/sky130_fd_pr/{0.13.0 => v0.13.0} (100%) rename libraries/sky130_fd_pr/{0.20.0 => v0.20.0} (100%) rename libraries/sky130_fd_pr/{0.20.1 => v0.20.1} (100%) diff --git a/.gitmodules b/.gitmodules index 64330e4..3a0a8fa 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,51 +4,61 @@ url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git branch = master shallow = true + fetchRecurseSubmodules = false [submodule "libraries/sky130_fd_pr/v0.20.1"] path = libraries/sky130_fd_pr/v0.20.1 url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git branch = branch-0.20.1 shallow = true + fetchRecurseSubmodules = false [submodule "libraries/sky130_fd_pr/v0.20.0"] path = libraries/sky130_fd_pr/v0.20.0 url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git branch = branch-0.20.0 shallow = true + fetchRecurseSubmodules = false [submodule "libraries/sky130_fd_pr/v0.13.0"] path = libraries/sky130_fd_pr/v0.13.0 url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git branch = branch-0.13.0 shallow = true + fetchRecurseSubmodules = false [submodule "libraries/sky130_fd_pr/v0.12.1"] path = libraries/sky130_fd_pr/v0.12.1 url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git branch = branch-0.12.1 shallow = true + fetchRecurseSubmodules = false [submodule "libraries/sky130_fd_pr/v0.12.0"] path = libraries/sky130_fd_pr/v0.12.0 url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git branch = branch-0.12.0 shallow = true + fetchRecurseSubmodules = false [submodule "libraries/sky130_fd_pr/v0.11.0"] path = libraries/sky130_fd_pr/v0.11.0 url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git branch = branch-0.11.0 shallow = true + fetchRecurseSubmodules = false [submodule "libraries/sky130_fd_pr/v0.10.1"] path = libraries/sky130_fd_pr/v0.10.1 url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git branch = branch-0.10.1 shallow = true + fetchRecurseSubmodules = false [submodule "libraries/sky130_fd_pr/v0.10.0"] path = libraries/sky130_fd_pr/v0.10.0 url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git branch = branch-0.10.0 shallow = true + fetchRecurseSubmodules = false [submodule "libraries/sky130_fd_pr/v0.0.9"] path = libraries/sky130_fd_pr/v0.0.9 url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git branch = branch-0.0.9 shallow = true + fetchRecurseSubmodules = false # sky130_fd_sc_hd [submodule "libraries/sky130_fd_sc_hd/latest"] @@ -146,30 +156,3 @@ branch = branch-0.1.0 shallow = true fetchRecurseSubmodules = false -[submodule "libraries/sky130_fd_pr/0.0.9"] - path = libraries/sky130_fd_pr/0.0.9 - url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git -[submodule "libraries/sky130_fd_pr/0.10.0"] - path = libraries/sky130_fd_pr/0.10.0 - url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git -[submodule "libraries/sky130_fd_pr/0.10.1"] - path = libraries/sky130_fd_pr/0.10.1 - url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git -[submodule "libraries/sky130_fd_pr/0.11.0"] - path = libraries/sky130_fd_pr/0.11.0 - url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git -[submodule "libraries/sky130_fd_pr/0.12.0"] - path = libraries/sky130_fd_pr/0.12.0 - url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git -[submodule "libraries/sky130_fd_pr/0.12.1"] - path = libraries/sky130_fd_pr/0.12.1 - url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git -[submodule "libraries/sky130_fd_pr/0.13.0"] - path = libraries/sky130_fd_pr/0.13.0 - url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git -[submodule "libraries/sky130_fd_pr/0.20.0"] - path = libraries/sky130_fd_pr/0.20.0 - url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git -[submodule "libraries/sky130_fd_pr/0.20.1"] - path = libraries/sky130_fd_pr/0.20.1 - url = https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr.git diff --git a/libraries/sky130_fd_pr/0.0.9 b/libraries/sky130_fd_pr/v0.0.9 similarity index 100% rename from libraries/sky130_fd_pr/0.0.9 rename to libraries/sky130_fd_pr/v0.0.9 diff --git a/libraries/sky130_fd_pr/0.10.0 b/libraries/sky130_fd_pr/v0.10.0 similarity index 100% rename from libraries/sky130_fd_pr/0.10.0 rename to libraries/sky130_fd_pr/v0.10.0 diff --git a/libraries/sky130_fd_pr/0.10.1 b/libraries/sky130_fd_pr/v0.10.1 similarity index 100% rename from libraries/sky130_fd_pr/0.10.1 rename to libraries/sky130_fd_pr/v0.10.1 diff --git a/libraries/sky130_fd_pr/0.11.0 b/libraries/sky130_fd_pr/v0.11.0 similarity index 100% rename from libraries/sky130_fd_pr/0.11.0 rename to libraries/sky130_fd_pr/v0.11.0 diff --git a/libraries/sky130_fd_pr/0.12.0 b/libraries/sky130_fd_pr/v0.12.0 similarity index 100% rename from libraries/sky130_fd_pr/0.12.0 rename to libraries/sky130_fd_pr/v0.12.0 diff --git a/libraries/sky130_fd_pr/0.12.1 b/libraries/sky130_fd_pr/v0.12.1 similarity index 100% rename from libraries/sky130_fd_pr/0.12.1 rename to libraries/sky130_fd_pr/v0.12.1 diff --git a/libraries/sky130_fd_pr/0.13.0 b/libraries/sky130_fd_pr/v0.13.0 similarity index 100% rename from libraries/sky130_fd_pr/0.13.0 rename to libraries/sky130_fd_pr/v0.13.0 diff --git a/libraries/sky130_fd_pr/0.20.0 b/libraries/sky130_fd_pr/v0.20.0 similarity index 100% rename from libraries/sky130_fd_pr/0.20.0 rename to libraries/sky130_fd_pr/v0.20.0 diff --git a/libraries/sky130_fd_pr/0.20.1 b/libraries/sky130_fd_pr/v0.20.1 similarity index 100% rename from libraries/sky130_fd_pr/0.20.1 rename to libraries/sky130_fd_pr/v0.20.1 From 79834a57ec96877bc0f3c40706435e1a907f4bd0 Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Sat, 24 Oct 2020 17:51:06 -0700 Subject: [PATCH 2/3] Make the primitive submodules point to right commits. Previously all submodules were pointing at the latest version. Signed-off-by: Tim 'mithro' Ansell --- libraries/sky130_fd_pr/v0.0.9 | 2 +- libraries/sky130_fd_pr/v0.10.0 | 2 +- libraries/sky130_fd_pr/v0.10.1 | 2 +- libraries/sky130_fd_pr/v0.11.0 | 2 +- libraries/sky130_fd_pr/v0.12.0 | 2 +- libraries/sky130_fd_pr/v0.12.1 | 2 +- libraries/sky130_fd_pr/v0.13.0 | 2 +- libraries/sky130_fd_pr/v0.20.0 | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/libraries/sky130_fd_pr/v0.0.9 b/libraries/sky130_fd_pr/v0.0.9 index d717cd4..33b7687 160000 --- a/libraries/sky130_fd_pr/v0.0.9 +++ b/libraries/sky130_fd_pr/v0.0.9 @@ -1 +1 @@ -Subproject commit d717cd4d8d93cce6a8d7534f6a40432f0045039f +Subproject commit 33b768728f29f1858f8b15b0c966d09790c70ff7 diff --git a/libraries/sky130_fd_pr/v0.10.0 b/libraries/sky130_fd_pr/v0.10.0 index d717cd4..77429bf 160000 --- a/libraries/sky130_fd_pr/v0.10.0 +++ b/libraries/sky130_fd_pr/v0.10.0 @@ -1 +1 @@ -Subproject commit d717cd4d8d93cce6a8d7534f6a40432f0045039f +Subproject commit 77429bf815f96e5ba3cdb48b7fb6c1ff58074b18 diff --git a/libraries/sky130_fd_pr/v0.10.1 b/libraries/sky130_fd_pr/v0.10.1 index d717cd4..aff6c99 160000 --- a/libraries/sky130_fd_pr/v0.10.1 +++ b/libraries/sky130_fd_pr/v0.10.1 @@ -1 +1 @@ -Subproject commit d717cd4d8d93cce6a8d7534f6a40432f0045039f +Subproject commit aff6c996fceec53f5699dae231f9e88fc5b9b60d diff --git a/libraries/sky130_fd_pr/v0.11.0 b/libraries/sky130_fd_pr/v0.11.0 index d717cd4..a7a4ba1 160000 --- a/libraries/sky130_fd_pr/v0.11.0 +++ b/libraries/sky130_fd_pr/v0.11.0 @@ -1 +1 @@ -Subproject commit d717cd4d8d93cce6a8d7534f6a40432f0045039f +Subproject commit a7a4ba142aa45119bbc7b8ab2eb7d0270464bf9a diff --git a/libraries/sky130_fd_pr/v0.12.0 b/libraries/sky130_fd_pr/v0.12.0 index d717cd4..56eb01d 160000 --- a/libraries/sky130_fd_pr/v0.12.0 +++ b/libraries/sky130_fd_pr/v0.12.0 @@ -1 +1 @@ -Subproject commit d717cd4d8d93cce6a8d7534f6a40432f0045039f +Subproject commit 56eb01d2ebd113ad34e38ceccf5748424d3bb7a2 diff --git a/libraries/sky130_fd_pr/v0.12.1 b/libraries/sky130_fd_pr/v0.12.1 index d717cd4..48bb19e 160000 --- a/libraries/sky130_fd_pr/v0.12.1 +++ b/libraries/sky130_fd_pr/v0.12.1 @@ -1 +1 @@ -Subproject commit d717cd4d8d93cce6a8d7534f6a40432f0045039f +Subproject commit 48bb19e08e2b738f6e3177d94562e1218b59534c diff --git a/libraries/sky130_fd_pr/v0.13.0 b/libraries/sky130_fd_pr/v0.13.0 index d717cd4..2997061 160000 --- a/libraries/sky130_fd_pr/v0.13.0 +++ b/libraries/sky130_fd_pr/v0.13.0 @@ -1 +1 @@ -Subproject commit d717cd4d8d93cce6a8d7534f6a40432f0045039f +Subproject commit 2997061e461c71e6e5c85153e3403ca74c62f69c diff --git a/libraries/sky130_fd_pr/v0.20.0 b/libraries/sky130_fd_pr/v0.20.0 index d717cd4..6d4ff0d 160000 --- a/libraries/sky130_fd_pr/v0.20.0 +++ b/libraries/sky130_fd_pr/v0.20.0 @@ -1 +1 @@ -Subproject commit d717cd4d8d93cce6a8d7534f6a40432f0045039f +Subproject commit 6d4ff0d91a19ddceeb5a009976756ecb8979c619 From 826b6291c4a74c80de3d2b85786fb4de898e30b7 Mon Sep 17 00:00:00 2001 From: Tim 'mithro' Ansell Date: Sun, 25 Oct 2020 16:59:56 -0700 Subject: [PATCH 3/3] Updating submodules on 2020-10-25 23:59:18 UTC Fixes the name of the nwell and rdl generic resistors in the SkyWater primitive library (`sky130_fd_pr`). Fixes https://github.com/google/skywater-pdk/issues/168. - Updating [`sky130_fd_pr` latest](https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr/+/v0.20.1..v0.20.0-10-g3195d6d) to v0.20.0-10-g3195d6d - Updating [`sky130_fd_pr` v0.0.9](https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr/+/v0.0.9..v0.0.9-1-g88be317) to v0.0.9-1-g88be317 - Updating [`sky130_fd_pr` v0.10.0](https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr/+/v0.10.0..v0.10.0-2-g4ef3a9f) to v0.10.0-2-g4ef3a9f - Updating [`sky130_fd_pr` v0.10.1](https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr/+/v0.10.1..v0.10.1-3-g78516f4) to v0.10.1-3-g78516f4 - Updating [`sky130_fd_pr` v0.11.0](https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr/+/v0.11.0..v0.11.0-4-gb192529) to v0.11.0-4-gb192529 - Updating [`sky130_fd_pr` v0.12.0](https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr/+/v0.12.0..v0.12.0-5-gc639b95) to v0.12.0-5-gc639b95 - Updating [`sky130_fd_pr` v0.12.1](https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr/+/v0.12.1..v0.12.1-6-g78ec0b6) to v0.12.1-6-g78ec0b6 - Updating [`sky130_fd_pr` v0.13.0](https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr/+/v0.13.0..v0.13.0-7-gef7ae9d) to v0.13.0-7-gef7ae9d - Updating [`sky130_fd_pr` v0.20.0](https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr/+/v0.20.0..v0.20.0-8-g668e396) to v0.20.0-8-g668e396 - Updating [`sky130_fd_pr` v0.20.1](https://foss-eda-tools.googlesource.com/skywater-pdk/libs/sky130_fd_pr/+/v0.20.1..v0.20.1-9-g3195d6d) to v0.20.1-9-g3195d6d * libraries/sky130_fd_pr/latest d717cd4...3195d6d (1): > Fix the name of nwell and rdl generic resistors. * libraries/sky130_fd_pr/v0.0.9 33b7687...88be317 (1): > Fix the name of nwell and rdl generic resistors. * libraries/sky130_fd_pr/v0.10.0 77429bf...4ef3a9f (1): > Fix the name of nwell and rdl generic resistors. * libraries/sky130_fd_pr/v0.10.1 aff6c99...78516f4 (1): > Fix the name of nwell and rdl generic resistors. * libraries/sky130_fd_pr/v0.11.0 a7a4ba1...b192529 (1): > Fix the name of nwell and rdl generic resistors. * libraries/sky130_fd_pr/v0.12.0 56eb01d...c639b95 (1): > Fix the name of nwell and rdl generic resistors. * libraries/sky130_fd_pr/v0.12.1 48bb19e...78ec0b6 (1): > Fix the name of nwell and rdl generic resistors. * libraries/sky130_fd_pr/v0.13.0 2997061...ef7ae9d (1): > Fix the name of nwell and rdl generic resistors. * libraries/sky130_fd_pr/v0.20.0 6d4ff0d...668e396 (1): > Fix the name of nwell and rdl generic resistors. * libraries/sky130_fd_pr/v0.20.1 d717cd4...3195d6d (1): > Fix the name of nwell and rdl generic resistors. Signed-off-by: Tim 'mithro' Ansell --- libraries/sky130_fd_pr/latest | 2 +- libraries/sky130_fd_pr/v0.0.9 | 2 +- libraries/sky130_fd_pr/v0.10.0 | 2 +- libraries/sky130_fd_pr/v0.10.1 | 2 +- libraries/sky130_fd_pr/v0.11.0 | 2 +- libraries/sky130_fd_pr/v0.12.0 | 2 +- libraries/sky130_fd_pr/v0.12.1 | 2 +- libraries/sky130_fd_pr/v0.13.0 | 2 +- libraries/sky130_fd_pr/v0.20.0 | 2 +- libraries/sky130_fd_pr/v0.20.1 | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/libraries/sky130_fd_pr/latest b/libraries/sky130_fd_pr/latest index d717cd4..3195d6d 160000 --- a/libraries/sky130_fd_pr/latest +++ b/libraries/sky130_fd_pr/latest @@ -1 +1 @@ -Subproject commit d717cd4d8d93cce6a8d7534f6a40432f0045039f +Subproject commit 3195d6d93e700c5c8f22c632f79ac400923a9ea3 diff --git a/libraries/sky130_fd_pr/v0.0.9 b/libraries/sky130_fd_pr/v0.0.9 index 33b7687..88be317 160000 --- a/libraries/sky130_fd_pr/v0.0.9 +++ b/libraries/sky130_fd_pr/v0.0.9 @@ -1 +1 @@ -Subproject commit 33b768728f29f1858f8b15b0c966d09790c70ff7 +Subproject commit 88be3178d09cc218393ce97761877b47d80ff219 diff --git a/libraries/sky130_fd_pr/v0.10.0 b/libraries/sky130_fd_pr/v0.10.0 index 77429bf..4ef3a9f 160000 --- a/libraries/sky130_fd_pr/v0.10.0 +++ b/libraries/sky130_fd_pr/v0.10.0 @@ -1 +1 @@ -Subproject commit 77429bf815f96e5ba3cdb48b7fb6c1ff58074b18 +Subproject commit 4ef3a9fc611fca77b8ebb7e164df8e5725429515 diff --git a/libraries/sky130_fd_pr/v0.10.1 b/libraries/sky130_fd_pr/v0.10.1 index aff6c99..78516f4 160000 --- a/libraries/sky130_fd_pr/v0.10.1 +++ b/libraries/sky130_fd_pr/v0.10.1 @@ -1 +1 @@ -Subproject commit aff6c996fceec53f5699dae231f9e88fc5b9b60d +Subproject commit 78516f4d03c2443206fd9b64426c0d530b5ef79a diff --git a/libraries/sky130_fd_pr/v0.11.0 b/libraries/sky130_fd_pr/v0.11.0 index a7a4ba1..b192529 160000 --- a/libraries/sky130_fd_pr/v0.11.0 +++ b/libraries/sky130_fd_pr/v0.11.0 @@ -1 +1 @@ -Subproject commit a7a4ba142aa45119bbc7b8ab2eb7d0270464bf9a +Subproject commit b1925294535bcfaa6970c1cbc6d0d34f6ba2d338 diff --git a/libraries/sky130_fd_pr/v0.12.0 b/libraries/sky130_fd_pr/v0.12.0 index 56eb01d..c639b95 160000 --- a/libraries/sky130_fd_pr/v0.12.0 +++ b/libraries/sky130_fd_pr/v0.12.0 @@ -1 +1 @@ -Subproject commit 56eb01d2ebd113ad34e38ceccf5748424d3bb7a2 +Subproject commit c639b95c4ea4ac49663aa0f224dc69ca77bc5495 diff --git a/libraries/sky130_fd_pr/v0.12.1 b/libraries/sky130_fd_pr/v0.12.1 index 48bb19e..78ec0b6 160000 --- a/libraries/sky130_fd_pr/v0.12.1 +++ b/libraries/sky130_fd_pr/v0.12.1 @@ -1 +1 @@ -Subproject commit 48bb19e08e2b738f6e3177d94562e1218b59534c +Subproject commit 78ec0b605843cd42bb6c05e4de0460d238e98655 diff --git a/libraries/sky130_fd_pr/v0.13.0 b/libraries/sky130_fd_pr/v0.13.0 index 2997061..ef7ae9d 160000 --- a/libraries/sky130_fd_pr/v0.13.0 +++ b/libraries/sky130_fd_pr/v0.13.0 @@ -1 +1 @@ -Subproject commit 2997061e461c71e6e5c85153e3403ca74c62f69c +Subproject commit ef7ae9dc468e623f6b6f67712b57790e31772a24 diff --git a/libraries/sky130_fd_pr/v0.20.0 b/libraries/sky130_fd_pr/v0.20.0 index 6d4ff0d..668e396 160000 --- a/libraries/sky130_fd_pr/v0.20.0 +++ b/libraries/sky130_fd_pr/v0.20.0 @@ -1 +1 @@ -Subproject commit 6d4ff0d91a19ddceeb5a009976756ecb8979c619 +Subproject commit 668e3960c1626748465a3969c1371e8dbd3bd520 diff --git a/libraries/sky130_fd_pr/v0.20.1 b/libraries/sky130_fd_pr/v0.20.1 index d717cd4..3195d6d 160000 --- a/libraries/sky130_fd_pr/v0.20.1 +++ b/libraries/sky130_fd_pr/v0.20.1 @@ -1 +1 @@ -Subproject commit d717cd4d8d93cce6a8d7534f6a40432f0045039f +Subproject commit 3195d6d93e700c5c8f22c632f79ac400923a9ea3