sky130: shortened synth/pnr excluded lists by using globbing

sky130/librelane/sky130_fd_sc_hd/pnr_excluded.cells

diff --git a/sky130/librelane/sky130_fd_sc_hd/pnr_excluded.cells b/sky130/librelane/sky130_fd_sc_hd/pnr_excluded.cells
index 62c56d7..c83eb51 100644
--- a/sky130/librelane/sky130_fd_sc_hd/pnr_excluded.cells
+++ b/sky130/librelane/sky130_fd_sc_hd/pnr_excluded.cells
@@ -1,36 +1,4 @@
-sky130_fd_sc_hd__lpflow_bleeder_1
-sky130_fd_sc_hd__lpflow_clkbufkapwr_1
-sky130_fd_sc_hd__lpflow_clkbufkapwr_16
-sky130_fd_sc_hd__lpflow_clkbufkapwr_2
-sky130_fd_sc_hd__lpflow_clkbufkapwr_4
-sky130_fd_sc_hd__lpflow_clkbufkapwr_8
-sky130_fd_sc_hd__lpflow_clkinvkapwr_1
-sky130_fd_sc_hd__lpflow_clkinvkapwr_16
-sky130_fd_sc_hd__lpflow_clkinvkapwr_2
-sky130_fd_sc_hd__lpflow_clkinvkapwr_4
-sky130_fd_sc_hd__lpflow_clkinvkapwr_8
-sky130_fd_sc_hd__lpflow_decapkapwr_12
-sky130_fd_sc_hd__lpflow_decapkapwr_3
-sky130_fd_sc_hd__lpflow_decapkapwr_4
-sky130_fd_sc_hd__lpflow_decapkapwr_6
-sky130_fd_sc_hd__lpflow_decapkapwr_8
-sky130_fd_sc_hd__lpflow_inputiso0n_1
-sky130_fd_sc_hd__lpflow_inputiso0p_1
-sky130_fd_sc_hd__lpflow_inputiso1n_1
-sky130_fd_sc_hd__lpflow_inputiso1p_1
-sky130_fd_sc_hd__lpflow_inputisolatch_1
-sky130_fd_sc_hd__lpflow_isobufsrc_1
-sky130_fd_sc_hd__lpflow_isobufsrc_16
-sky130_fd_sc_hd__lpflow_isobufsrc_2
-sky130_fd_sc_hd__lpflow_isobufsrc_4
-sky130_fd_sc_hd__lpflow_isobufsrc_8
-sky130_fd_sc_hd__lpflow_isobufsrckapwr_16
-sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1
-sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2
-sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4
-sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4
-sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1
-sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2
-sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4
-sky130_fd_sc_hd__probec_p_8
-sky130_fd_sc_hd__probe_p_8
+# low power flow (power domain isolation)
+sky130_fd_sc_hd__lpflow_*
+# probe
+sky130_fd_sc_hd__probe*

sky130/librelane/sky130_fd_sc_hd/synth_excluded.cells

diff --git a/sky130/librelane/sky130_fd_sc_hd/synth_excluded.cells b/sky130/librelane/sky130_fd_sc_hd/synth_excluded.cells
index ab8875e..3aed851 100644
--- a/sky130/librelane/sky130_fd_sc_hd/synth_excluded.cells
+++ b/sky130/librelane/sky130_fd_sc_hd/synth_excluded.cells
@@ -1,105 +1,23 @@
-sky130_fd_sc_hd__clkbuf_1
-sky130_fd_sc_hd__clkbuf_16
-sky130_fd_sc_hd__clkbuf_2
-sky130_fd_sc_hd__clkbuf_4
-sky130_fd_sc_hd__clkbuf_8
-sky130_fd_sc_hd__clkdlybuf4s15_1
-sky130_fd_sc_hd__clkdlybuf4s15_2
-sky130_fd_sc_hd__clkdlybuf4s18_1
-sky130_fd_sc_hd__clkdlybuf4s18_2
-sky130_fd_sc_hd__clkdlybuf4s25_1
-sky130_fd_sc_hd__clkdlybuf4s25_2
-sky130_fd_sc_hd__clkdlybuf4s50_1
-sky130_fd_sc_hd__clkdlybuf4s50_2
-sky130_fd_sc_hd__clkinv_1
-sky130_fd_sc_hd__clkinv_16
-sky130_fd_sc_hd__clkinv_2
-sky130_fd_sc_hd__clkinv_4
-sky130_fd_sc_hd__clkinv_8
-sky130_fd_sc_hd__clkinvlp_2
-sky130_fd_sc_hd__clkinvlp_4
-sky130_fd_sc_hd__decap_12
-sky130_fd_sc_hd__decap_3
-sky130_fd_sc_hd__decap_4
-sky130_fd_sc_hd__decap_6
-sky130_fd_sc_hd__decap_8
-sky130_fd_sc_hd__diode_2
-sky130_fd_sc_hd__dlygate4sd1_1
-sky130_fd_sc_hd__dlygate4sd2_1
-sky130_fd_sc_hd__dlygate4sd3_1
-sky130_fd_sc_hd__dlymetal6s2s_1
-sky130_fd_sc_hd__dlymetal6s4s_1
-sky130_fd_sc_hd__dlymetal6s6s_1
-sky130_fd_sc_hd__fill_1
-sky130_fd_sc_hd__fill_2
-sky130_fd_sc_hd__fill_4
-sky130_fd_sc_hd__fill_8
-sky130_fd_sc_hd__lpflow_bleeder_1
-sky130_fd_sc_hd__lpflow_clkbufkapwr_1
-sky130_fd_sc_hd__lpflow_clkbufkapwr_16
-sky130_fd_sc_hd__lpflow_clkbufkapwr_2
-sky130_fd_sc_hd__lpflow_clkbufkapwr_4
-sky130_fd_sc_hd__lpflow_clkbufkapwr_8
-sky130_fd_sc_hd__lpflow_clkinvkapwr_1
-sky130_fd_sc_hd__lpflow_clkinvkapwr_16
-sky130_fd_sc_hd__lpflow_clkinvkapwr_2
-sky130_fd_sc_hd__lpflow_clkinvkapwr_4
-sky130_fd_sc_hd__lpflow_clkinvkapwr_8
-sky130_fd_sc_hd__lpflow_decapkapwr_12
-sky130_fd_sc_hd__lpflow_decapkapwr_3
-sky130_fd_sc_hd__lpflow_decapkapwr_4
-sky130_fd_sc_hd__lpflow_decapkapwr_6
-sky130_fd_sc_hd__lpflow_decapkapwr_8
-sky130_fd_sc_hd__lpflow_inputiso0n_1
-sky130_fd_sc_hd__lpflow_inputiso0p_1
-sky130_fd_sc_hd__lpflow_inputiso1n_1
-sky130_fd_sc_hd__lpflow_inputiso1p_1
-sky130_fd_sc_hd__lpflow_inputisolatch_1
-sky130_fd_sc_hd__lpflow_isobufsrc_1
-sky130_fd_sc_hd__lpflow_isobufsrc_16
-sky130_fd_sc_hd__lpflow_isobufsrc_2
-sky130_fd_sc_hd__lpflow_isobufsrc_4
-sky130_fd_sc_hd__lpflow_isobufsrc_8
-sky130_fd_sc_hd__lpflow_isobufsrckapwr_16
-sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_1
-sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_2
-sky130_fd_sc_hd__lpflow_lsbuf_lh_hl_isowell_tap_4
-sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_4
-sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_1
-sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_2
-sky130_fd_sc_hd__lpflow_lsbuf_lh_isowell_tap_4
+# clock buffers/invertes (used in CTS)
+sky130_fd_sc_hd__clkbuf*
+sky130_fd_sc_hd__clkinv*
+sky130_fd_sc_hd__clkinvlp*
+# clock delay buffers (used in PNR timing)
+sky130_fd_sc_hd__clkdlybuf*
+# signal delay buffers (used in PNR timing)
+sky130_fd_sc_hd__dlygate*
+sky130_fd_sc_hd__dlymetal*
+# tap/decap/fill (PNR)
+sky130_fd_sc_hd__tap*
+sky130_fd_sc_hd__decap*
+sky130_fd_sc_hd__fill*
+# diode
+sky130_fd_sc_hd__diode*
+# low power flow (power domain isolation)
+sky130_fd_sc_hd__lpflow_*
+# ECO generic spare cell
 sky130_fd_sc_hd__macro_sparecell
-sky130_fd_sc_hd__probec_p_8
-sky130_fd_sc_hd__probe_p_8
-sky130_fd_sc_hd__sdfbbn_1
-sky130_fd_sc_hd__sdfbbn_2
-sky130_fd_sc_hd__sdfbbp_1
-sky130_fd_sc_hd__sdfrbp_1
-sky130_fd_sc_hd__sdfrbp_2
-sky130_fd_sc_hd__sdfrtn_1
-sky130_fd_sc_hd__sdfrtp_1
-sky130_fd_sc_hd__sdfrtp_2
-sky130_fd_sc_hd__sdfrtp_4
-sky130_fd_sc_hd__sdfsbp_1
-sky130_fd_sc_hd__sdfsbp_2
-sky130_fd_sc_hd__sdfstp_1
-sky130_fd_sc_hd__sdfstp_2
-sky130_fd_sc_hd__sdfstp_4
-sky130_fd_sc_hd__sdfxbp_1
-sky130_fd_sc_hd__sdfxbp_2
-sky130_fd_sc_hd__sdfxtp_1
-sky130_fd_sc_hd__sdfxtp_2
-sky130_fd_sc_hd__sdfxtp_4
-sky130_fd_sc_hd__sdlclkp_1
-sky130_fd_sc_hd__sdlclkp_2
-sky130_fd_sc_hd__sdlclkp_4
-sky130_fd_sc_hd__sedfxbp_1
-sky130_fd_sc_hd__sedfxbp_2
-sky130_fd_sc_hd__sedfxtp_1
-sky130_fd_sc_hd__sedfxtp_2
-sky130_fd_sc_hd__sedfxtp_4
-sky130_fd_sc_hd__tap_1
-sky130_fd_sc_hd__tap_2
-sky130_fd_sc_hd__tapvgnd_1
-sky130_fd_sc_hd__tapvgnd2_1
-sky130_fd_sc_hd__tapvpwrvgnd_1
+# probe
+sky130_fd_sc_hd__probe*
+# scan chain cells (used for DFT)
+sky130_fd_sc_hd__s*

sky130/librelane/sky130_fd_sc_hdll/pnr_excluded.cells

diff --git a/sky130/librelane/sky130_fd_sc_hdll/pnr_excluded.cells b/sky130/librelane/sky130_fd_sc_hdll/pnr_excluded.cells
index ae31bb7..3528fb7 100644
--- a/sky130/librelane/sky130_fd_sc_hdll/pnr_excluded.cells
+++ b/sky130/librelane/sky130_fd_sc_hdll/pnr_excluded.cells
@@ -1,6 +1,5 @@
-sky130_fd_sc_hdll__inputiso0n_1
-sky130_fd_sc_hdll__inputiso0p_1
-sky130_fd_sc_hdll__inputiso1n_1
-sky130_fd_sc_hdll__inputiso1p_1
-sky130_fd_sc_hdll__probec_p_8
-sky130_fd_sc_hdll__probe_p_8
+# low power flow (power domain isolation)
+sky130_fd_sc_hdll__inputiso*
+sky130_fd_sc_hdll__isobufsrc*
+# probe
+sky130_fd_sc_hdll__probe*

sky130/librelane/sky130_fd_sc_hdll/synth_excluded.cells

diff --git a/sky130/librelane/sky130_fd_sc_hdll/synth_excluded.cells b/sky130/librelane/sky130_fd_sc_hdll/synth_excluded.cells
index 293d199..3282b68 100644
--- a/sky130/librelane/sky130_fd_sc_hdll/synth_excluded.cells
+++ b/sky130/librelane/sky130_fd_sc_hdll/synth_excluded.cells
@@ -1,71 +1,20 @@
-sky130_fd_sc_hdll__clkbuf_1
-sky130_fd_sc_hdll__clkbuf_12
-sky130_fd_sc_hdll__clkbuf_16
-sky130_fd_sc_hdll__clkbuf_2
-sky130_fd_sc_hdll__clkbuf_4
-sky130_fd_sc_hdll__clkbuf_6
-sky130_fd_sc_hdll__clkbuf_8
-sky130_fd_sc_hdll__clkinv_1
-sky130_fd_sc_hdll__clkinv_12
-sky130_fd_sc_hdll__clkinv_16
-sky130_fd_sc_hdll__clkinv_2
-sky130_fd_sc_hdll__clkinv_4
-sky130_fd_sc_hdll__clkinv_8
-sky130_fd_sc_hdll__clkinvlp_2
-sky130_fd_sc_hdll__clkinvlp_4
-sky130_fd_sc_hdll__clkmux2_1
-sky130_fd_sc_hdll__clkmux2_2
-sky130_fd_sc_hdll__clkmux2_4
-sky130_fd_sc_hdll__decap_12
-sky130_fd_sc_hdll__decap_3
-sky130_fd_sc_hdll__decap_4
-sky130_fd_sc_hdll__decap_6
-sky130_fd_sc_hdll__decap_8
-sky130_fd_sc_hdll__diode_2
-sky130_fd_sc_hdll__diode_4
-sky130_fd_sc_hdll__diode_6
-sky130_fd_sc_hdll__diode_8
-sky130_fd_sc_hdll__dlygate4sd1_1
-sky130_fd_sc_hdll__dlygate4sd2_1
-sky130_fd_sc_hdll__dlygate4sd3_1
-sky130_fd_sc_hdll__fill_1
-sky130_fd_sc_hdll__fill_2
-sky130_fd_sc_hdll__fill_4
-sky130_fd_sc_hdll__fill_8
-sky130_fd_sc_hdll__inputiso0n_1
-sky130_fd_sc_hdll__inputiso0p_1
-sky130_fd_sc_hdll__inputiso1n_1
-sky130_fd_sc_hdll__inputiso1p_1
-sky130_fd_sc_hdll__isobufsrc_1
-sky130_fd_sc_hdll__isobufsrc_16
-sky130_fd_sc_hdll__isobufsrc_2
-sky130_fd_sc_hdll__isobufsrc_4
-sky130_fd_sc_hdll__isobufsrc_8
-sky130_fd_sc_hdll__probec_p_8
-sky130_fd_sc_hdll__probe_p_8
-sky130_fd_sc_hdll__sdfbbp_1
-sky130_fd_sc_hdll__sdfrbp_1
-sky130_fd_sc_hdll__sdfrbp_2
-sky130_fd_sc_hdll__sdfrtn_1
-sky130_fd_sc_hdll__sdfrtp_1
-sky130_fd_sc_hdll__sdfrtp_2
-sky130_fd_sc_hdll__sdfrtp_4
-sky130_fd_sc_hdll__sdfsbp_1
-sky130_fd_sc_hdll__sdfsbp_2
-sky130_fd_sc_hdll__sdfstp_1
-sky130_fd_sc_hdll__sdfstp_2
-sky130_fd_sc_hdll__sdfstp_4
-sky130_fd_sc_hdll__sdfxbp_1
-sky130_fd_sc_hdll__sdfxbp_2
-sky130_fd_sc_hdll__sdfxtp_1
-sky130_fd_sc_hdll__sdfxtp_2
-sky130_fd_sc_hdll__sdfxtp_4
-sky130_fd_sc_hdll__sdlclkp_1
-sky130_fd_sc_hdll__sdlclkp_2
-sky130_fd_sc_hdll__sdlclkp_4
-sky130_fd_sc_hdll__sedfxbp_1
-sky130_fd_sc_hdll__sedfxbp_2
-sky130_fd_sc_hdll__tap_1
-sky130_fd_sc_hdll__tapvgnd_1
-sky130_fd_sc_hdll__tapvgnd2_1
-sky130_fd_sc_hdll__tapvpwrvgnd_1
+# clock buffers/invertes/multiplexers (used in CTS)
+sky130_fd_sc_hdll__clkbuf*
+sky130_fd_sc_hdll__clkinv*
+sky130_fd_sc_hdll__clkinvlp*
+sky130_fd_sc_hdll__clkmux2*
+# signal delay buffers (used in PNR timing)
+sky130_fd_sc_hdll__dlygate*
+# tap/decap/fill (PNR)
+sky130_fd_sc_hdll__tap*
+sky130_fd_sc_hdll__decap*
+sky130_fd_sc_hdll__fill*
+# diode
+sky130_fd_sc_hdll__diode*
+# power domain isolation
+sky130_fd_sc_hdll__inputiso*
+sky130_fd_sc_hdll__isobufsrc*
+# probe
+sky130_fd_sc_hdll__probe*
+# scan chain cells (used for DFT)
+sky130_fd_sc_hdll__s*

sky130/librelane/sky130_fd_sc_hs/synth_excluded.cells

diff --git a/sky130/librelane/sky130_fd_sc_hs/synth_excluded.cells b/sky130/librelane/sky130_fd_sc_hs/synth_excluded.cells
index b6f72cc..453c369 100644
--- a/sky130/librelane/sky130_fd_sc_hs/synth_excluded.cells
+++ b/sky130/librelane/sky130_fd_sc_hs/synth_excluded.cells
@@ -1,65 +1,17 @@
-sky130_fd_sc_hs__clkbuf_1
-sky130_fd_sc_hs__clkbuf_16
-sky130_fd_sc_hs__clkbuf_2
-sky130_fd_sc_hs__clkbuf_4
-sky130_fd_sc_hs__clkbuf_8
-sky130_fd_sc_hs__clkdlyinv3sd1_1
-sky130_fd_sc_hs__clkdlyinv3sd2_1
-sky130_fd_sc_hs__clkdlyinv3sd3_1
-sky130_fd_sc_hs__clkdlyinv5sd1_1
-sky130_fd_sc_hs__clkdlyinv5sd2_1
-sky130_fd_sc_hs__clkdlyinv5sd3_1
-sky130_fd_sc_hs__clkinv_1
-sky130_fd_sc_hs__clkinv_16
-sky130_fd_sc_hs__clkinv_2
-sky130_fd_sc_hs__clkinv_4
-sky130_fd_sc_hs__clkinv_8
-sky130_fd_sc_hs__decap_4
-sky130_fd_sc_hs__decap_8
-sky130_fd_sc_hs__diode_2
-sky130_fd_sc_hs__dlygate4sd1_1
-sky130_fd_sc_hs__dlygate4sd2_1
-sky130_fd_sc_hs__dlygate4sd3_1
-sky130_fd_sc_hs__dlymetal6s2s_1
-sky130_fd_sc_hs__dlymetal6s4s_1
-sky130_fd_sc_hs__dlymetal6s6s_1
-sky130_fd_sc_hs__fill_1
-sky130_fd_sc_hs__fill_2
-sky130_fd_sc_hs__fill_4
-sky130_fd_sc_hs__fill_8
-sky130_fd_sc_hs__fill_diode_2
-sky130_fd_sc_hs__fill_diode_4
-sky130_fd_sc_hs__fill_diode_8
-sky130_fd_sc_hs__sdfbbn_1
-sky130_fd_sc_hs__sdfbbn_2
-sky130_fd_sc_hs__sdfbbp_1
-sky130_fd_sc_hs__sdfrbp_1
-sky130_fd_sc_hs__sdfrbp_2
-sky130_fd_sc_hs__sdfrtn_1
-sky130_fd_sc_hs__sdfrtp_1
-sky130_fd_sc_hs__sdfrtp_2
-sky130_fd_sc_hs__sdfrtp_4
-sky130_fd_sc_hs__sdfsbp_1
-sky130_fd_sc_hs__sdfsbp_2
-sky130_fd_sc_hs__sdfstp_1
-sky130_fd_sc_hs__sdfstp_2
-sky130_fd_sc_hs__sdfstp_4
-sky130_fd_sc_hs__sdfxbp_1
-sky130_fd_sc_hs__sdfxbp_2
-sky130_fd_sc_hs__sdfxtp_1
-sky130_fd_sc_hs__sdfxtp_2
-sky130_fd_sc_hs__sdfxtp_4
-sky130_fd_sc_hs__sdlclkp_1
-sky130_fd_sc_hs__sdlclkp_2
-sky130_fd_sc_hs__sdlclkp_4
-sky130_fd_sc_hs__sedfxbp_1
-sky130_fd_sc_hs__sedfxbp_2
-sky130_fd_sc_hs__sedfxtp_1
-sky130_fd_sc_hs__sedfxtp_2
-sky130_fd_sc_hs__sedfxtp_4
-sky130_fd_sc_hs__tap_1
-sky130_fd_sc_hs__tap_2
-sky130_fd_sc_hs__tapmet1_2
-sky130_fd_sc_hs__tapvgnd_1
-sky130_fd_sc_hs__tapvgnd2_1
-sky130_fd_sc_hs__tapvpwrvgnd_1
+# clock buffers/invertes (used in CTS)
+sky130_fd_sc_hs__clkbuf*
+sky130_fd_sc_hs__clkinv*
+# clock delay buffers/inverters (used in PNR timing)
+sky130_fd_sc_hs__clkdlyinv*
+# signal delay buffers (used in PNR timing)
+sky130_fd_sc_hs__dlygate*
+sky130_fd_sc_hs__dlymetal*
+# tap/decap/fill (PNR)
+sky130_fd_sc_hs__tap*
+sky130_fd_sc_hs__decap*
+sky130_fd_sc_hs__fill*
+sky130_fd_sc_hs__fill_diode*
+# diode
+sky130_fd_sc_hs__diode*
+# scan chain cells (used for DFT)
+sky130_fd_sc_hs__s*

sky130/librelane/sky130_fd_sc_hvl/synth_excluded.cells

diff --git a/sky130/librelane/sky130_fd_sc_hvl/synth_excluded.cells b/sky130/librelane/sky130_fd_sc_hvl/synth_excluded.cells
index 8526788..a1b1b50 100644
--- a/sky130/librelane/sky130_fd_sc_hvl/synth_excluded.cells
+++ b/sky130/librelane/sky130_fd_sc_hvl/synth_excluded.cells
@@ -1,6 +1,11 @@
+# tap/decap/fill (PNR) (there are no tap cells)
 sky130_fd_sc_hvl__decap*
 sky130_fd_sc_hvl__fill*
+# level-shift buffers
 sky130_fd_sc_hvl__lsbuf*
+# probe
 sky130_fd_sc_hvl__probe*
+# schmitt trigger buffer
 sky130_fd_sc_hvl__schmittbuf*
-sky130_fd_sc_hvl__s*
\ No newline at end of file
+# scan chain cells (used for DFT)
+sky130_fd_sc_hvl__s*

sky130/librelane/sky130_fd_sc_ls/synth_excluded.cells

diff --git a/sky130/librelane/sky130_fd_sc_ls/synth_excluded.cells b/sky130/librelane/sky130_fd_sc_ls/synth_excluded.cells
index 786990d..79c2b29 100644
--- a/sky130/librelane/sky130_fd_sc_ls/synth_excluded.cells
+++ b/sky130/librelane/sky130_fd_sc_ls/synth_excluded.cells
@@ -1,73 +1,19 @@
-sky130_fd_sc_ls__clkbuf_1
-sky130_fd_sc_ls__clkbuf_16
-sky130_fd_sc_ls__clkbuf_2
-sky130_fd_sc_ls__clkbuf_4
-sky130_fd_sc_ls__clkbuf_8
-sky130_fd_sc_ls__clkdlyinv3sd1_1
-sky130_fd_sc_ls__clkdlyinv3sd2_1
-sky130_fd_sc_ls__clkdlyinv3sd3_1
-sky130_fd_sc_ls__clkdlyinv5sd1_1
-sky130_fd_sc_ls__clkdlyinv5sd2_1
-sky130_fd_sc_ls__clkdlyinv5sd3_1
-sky130_fd_sc_ls__clkinv_1
-sky130_fd_sc_ls__clkinv_16
-sky130_fd_sc_ls__clkinv_2
-sky130_fd_sc_ls__clkinv_4
-sky130_fd_sc_ls__clkinv_8
-sky130_fd_sc_ls__decap_4
-sky130_fd_sc_ls__decap_8
-sky130_fd_sc_ls__decaphe_18
-sky130_fd_sc_ls__decaphe_2
-sky130_fd_sc_ls__decaphe_3
-sky130_fd_sc_ls__decaphe_4
-sky130_fd_sc_ls__decaphe_6
-sky130_fd_sc_ls__decaphe_8
-sky130_fd_sc_ls__decaphetap_2
-sky130_fd_sc_ls__diode_2
-sky130_fd_sc_ls__dlygate4sd1_1
-sky130_fd_sc_ls__dlygate4sd2_1
-sky130_fd_sc_ls__dlygate4sd3_1
-sky130_fd_sc_ls__dlymetal6s2s_1
-sky130_fd_sc_ls__dlymetal6s4s_1
-sky130_fd_sc_ls__dlymetal6s6s_1
-sky130_fd_sc_ls__fill_1
-sky130_fd_sc_ls__fill_2
-sky130_fd_sc_ls__fill_4
-sky130_fd_sc_ls__fill_8
-sky130_fd_sc_ls__fill_diode_2
-sky130_fd_sc_ls__fill_diode_4
-sky130_fd_sc_ls__fill_diode_8
-sky130_fd_sc_ls__sdfbbn_1
-sky130_fd_sc_ls__sdfbbn_2
-sky130_fd_sc_ls__sdfbbp_1
-sky130_fd_sc_ls__sdfrbp_1
-sky130_fd_sc_ls__sdfrbp_2
-sky130_fd_sc_ls__sdfrtn_1
-sky130_fd_sc_ls__sdfrtp_1
-sky130_fd_sc_ls__sdfrtp_2
-sky130_fd_sc_ls__sdfrtp_4
-sky130_fd_sc_ls__sdfsbp_1
-sky130_fd_sc_ls__sdfsbp_2
-sky130_fd_sc_ls__sdfstp_1
-sky130_fd_sc_ls__sdfstp_2
-sky130_fd_sc_ls__sdfstp_4
-sky130_fd_sc_ls__sdfxbp_1
-sky130_fd_sc_ls__sdfxbp_2
-sky130_fd_sc_ls__sdfxtp_1
-sky130_fd_sc_ls__sdfxtp_2
-sky130_fd_sc_ls__sdfxtp_4
-sky130_fd_sc_ls__sdlclkp_1
-sky130_fd_sc_ls__sdlclkp_2
-sky130_fd_sc_ls__sdlclkp_4
-sky130_fd_sc_ls__sedfxbp_1
-sky130_fd_sc_ls__sedfxbp_2
-sky130_fd_sc_ls__sedfxtp_1
-sky130_fd_sc_ls__sedfxtp_2
-sky130_fd_sc_ls__sedfxtp_4
-sky130_fd_sc_ls__tap_1
-sky130_fd_sc_ls__tap_2
-sky130_fd_sc_ls__tapmet1_2
-sky130_fd_sc_ls__tapvgnd_1
-sky130_fd_sc_ls__tapvgnd2_1
-sky130_fd_sc_ls__tapvgndnovpb_1
-sky130_fd_sc_ls__tapvpwrvgnd_1
+# clock buffers/invertes (used in CTS)
+sky130_fd_sc_ls__clkbuf*
+sky130_fd_sc_ls__clkinv*
+# clock delay buffers/inverters (used in PNR timing)
+sky130_fd_sc_ls__clkdlyinv*
+# signal delay buffers (used in PNR timing)
+sky130_fd_sc_ls__dlygate*
+sky130_fd_sc_ls__dlymetal*
+# tap/decap/fill (PNR)
+sky130_fd_sc_ls__tap*
+sky130_fd_sc_ls__decap*
+sky130_fd_sc_ls__decaphe*
+sky130_fd_sc_ls__decaphetap*
+sky130_fd_sc_ls__fill*
+sky130_fd_sc_ls__fill_diode*
+# diode
+sky130_fd_sc_ls__diode*
+# scan chain cells (used for DFT)
+sky130_fd_sc_ls__s*

sky130/librelane/sky130_fd_sc_ms/synth_excluded.cells

diff --git a/sky130/librelane/sky130_fd_sc_ms/synth_excluded.cells b/sky130/librelane/sky130_fd_sc_ms/synth_excluded.cells
index f1847ba..818d233 100644
--- a/sky130/librelane/sky130_fd_sc_ms/synth_excluded.cells
+++ b/sky130/librelane/sky130_fd_sc_ms/synth_excluded.cells
@@ -1,65 +1,17 @@
-sky130_fd_sc_ms__clkbuf_1
-sky130_fd_sc_ms__clkbuf_16
-sky130_fd_sc_ms__clkbuf_2
-sky130_fd_sc_ms__clkbuf_4
-sky130_fd_sc_ms__clkbuf_8
-sky130_fd_sc_ms__clkdlyinv3sd1_1
-sky130_fd_sc_ms__clkdlyinv3sd2_1
-sky130_fd_sc_ms__clkdlyinv3sd3_1
-sky130_fd_sc_ms__clkdlyinv5sd1_1
-sky130_fd_sc_ms__clkdlyinv5sd2_1
-sky130_fd_sc_ms__clkdlyinv5sd3_1
-sky130_fd_sc_ms__clkinv_1
-sky130_fd_sc_ms__clkinv_16
-sky130_fd_sc_ms__clkinv_2
-sky130_fd_sc_ms__clkinv_4
-sky130_fd_sc_ms__clkinv_8
-sky130_fd_sc_ms__decap_4
-sky130_fd_sc_ms__decap_8
-sky130_fd_sc_ms__diode_2
-sky130_fd_sc_ms__dlygate4sd1_1
-sky130_fd_sc_ms__dlygate4sd2_1
-sky130_fd_sc_ms__dlygate4sd3_1
-sky130_fd_sc_ms__dlymetal6s2s_1
-sky130_fd_sc_ms__dlymetal6s4s_1
-sky130_fd_sc_ms__dlymetal6s6s_1
-sky130_fd_sc_ms__fill_1
-sky130_fd_sc_ms__fill_2
-sky130_fd_sc_ms__fill_4
-sky130_fd_sc_ms__fill_8
-sky130_fd_sc_ms__fill_diode_2
-sky130_fd_sc_ms__fill_diode_4
-sky130_fd_sc_ms__fill_diode_8
-sky130_fd_sc_ms__sdfbbn_1
-sky130_fd_sc_ms__sdfbbn_2
-sky130_fd_sc_ms__sdfbbp_1
-sky130_fd_sc_ms__sdfrbp_1
-sky130_fd_sc_ms__sdfrbp_2
-sky130_fd_sc_ms__sdfrtn_1
-sky130_fd_sc_ms__sdfrtp_1
-sky130_fd_sc_ms__sdfrtp_2
-sky130_fd_sc_ms__sdfrtp_4
-sky130_fd_sc_ms__sdfsbp_1
-sky130_fd_sc_ms__sdfsbp_2
-sky130_fd_sc_ms__sdfstp_1
-sky130_fd_sc_ms__sdfstp_2
-sky130_fd_sc_ms__sdfstp_4
-sky130_fd_sc_ms__sdfxbp_1
-sky130_fd_sc_ms__sdfxbp_2
-sky130_fd_sc_ms__sdfxtp_1
-sky130_fd_sc_ms__sdfxtp_2
-sky130_fd_sc_ms__sdfxtp_4
-sky130_fd_sc_ms__sdlclkp_1
-sky130_fd_sc_ms__sdlclkp_2
-sky130_fd_sc_ms__sdlclkp_4
-sky130_fd_sc_ms__sedfxbp_1
-sky130_fd_sc_ms__sedfxbp_2
-sky130_fd_sc_ms__sedfxtp_1
-sky130_fd_sc_ms__sedfxtp_2
-sky130_fd_sc_ms__sedfxtp_4
-sky130_fd_sc_ms__tap_1
-sky130_fd_sc_ms__tap_2
-sky130_fd_sc_ms__tapmet1_2
-sky130_fd_sc_ms__tapvgnd_1
-sky130_fd_sc_ms__tapvgnd2_1
-sky130_fd_sc_ms__tapvpwrvgnd_1
+# clock buffers/invertes (used in CTS)
+sky130_fd_sc_ms__clkbuf*
+sky130_fd_sc_ms__clkinv*
+# clock delay buffers/inverters (used in PNR timing)
+sky130_fd_sc_ms__clkdlyinv*
+# signal delay buffers (used in PNR timing)
+sky130_fd_sc_ms__dlygate*
+sky130_fd_sc_ms__dlymetal*
+# tap/decap/fill (PNR)
+sky130_fd_sc_ms__tap*
+sky130_fd_sc_ms__decap*
+sky130_fd_sc_ms__fill*
+sky130_fd_sc_ms__fill_diode*
+# diode
+sky130_fd_sc_ms__diode*
+# scan chain cells (used for DFT)
+sky130_fd_sc_ms__s*