From a7246f5e7fb8c74292e9a82686c68ea89f49693b Mon Sep 17 00:00:00 2001 From: Matt Guthaus Date: Mon, 24 Sep 2018 13:44:31 -0700 Subject: [PATCH] Rename omits 0 size ports --- compiler/globals.py | 17 +++++++++++------ ...subm.py => sram_128b_1024_1rw_scn4m_subm.py} | 0 ..._subm.py => sram_32b_1024_1rw_scn4m_subm.py} | 0 ..._subm.py => sram_32b_2048_1rw_scn4m_subm.py} | 0 ...m_subm.py => sram_32b_256_1rw_scn4m_subm.py} | 0 ...m_subm.py => sram_32b_512_1rw_scn4m_subm.py} | 0 ..._subm.py => sram_64b_1024_1rw_scn4m_subm.py} | 0 ...m_subm.py => sram_8b_1024_1rw_scn4m_subm.py} | 0 ...4m_subm.py => sram_8b_256_1rw_scn4m_subm.py} | 0 ...4m_subm.py => sram_8b_512_1rw_scn4m_subm.py} | 0 10 files changed, 11 insertions(+), 6 deletions(-) rename lib/scn4m_subm/configs/{sram_1rw_128b_1024w_scn4m_subm.py => sram_128b_1024_1rw_scn4m_subm.py} (100%) rename lib/scn4m_subm/configs/{sram_1rw_32b_1024w_scn4m_subm.py => sram_32b_1024_1rw_scn4m_subm.py} (100%) rename lib/scn4m_subm/configs/{sram_1rw_32b_2048w_scn4m_subm.py => sram_32b_2048_1rw_scn4m_subm.py} (100%) rename lib/scn4m_subm/configs/{sram_1rw_32b_256w_scn4m_subm.py => sram_32b_256_1rw_scn4m_subm.py} (100%) rename lib/scn4m_subm/configs/{sram_1rw_32b_512w_scn4m_subm.py => sram_32b_512_1rw_scn4m_subm.py} (100%) rename lib/scn4m_subm/configs/{sram_1rw_64b_1024w_scn4m_subm.py => sram_64b_1024_1rw_scn4m_subm.py} (100%) rename lib/scn4m_subm/configs/{sram_1rw_8b_1024w_scn4m_subm.py => sram_8b_1024_1rw_scn4m_subm.py} (100%) rename lib/scn4m_subm/configs/{sram_1rw_8b_256w_scn4m_subm.py => sram_8b_256_1rw_scn4m_subm.py} (100%) rename lib/scn4m_subm/configs/{sram_1rw_8b_512w_scn4m_subm.py => sram_8b_512_1rw_scn4m_subm.py} (100%) diff --git a/compiler/globals.py b/compiler/globals.py index abbd0f4c..af89eaa4 100644 --- a/compiler/globals.py +++ b/compiler/globals.py @@ -225,12 +225,17 @@ def read_config(config_file, is_unit_test=True): # If config didn't set output name, make a reasonable default. if (OPTS.output_name == ""): - OPTS.output_name = "sram_{0}b_{1}w_{2}rw_{3}w_{4}r_{5}".format(OPTS.word_size, - OPTS.num_words, - OPTS.num_rw_ports, - OPTS.num_w_ports, - OPTS.num_r_ports, - OPTS.tech_name) + ports = "" + if OPTS.num_rw_ports>0: + ports += "{}rw_".format(OPTS.num_rw_ports) + if OPTS.num_w_ports>0: + ports += "{}w_".format(OPTS.num_w_ports) + if OPTS.num_r_ports>0: + ports += "{}r_".format(OPTS.num_r_ports) + OPTS.output_name = "sram_{0}b_{1}_{2}{3}".format(OPTS.word_size, + OPTS.num_words, + ports, + OPTS.tech_name) diff --git a/lib/scn4m_subm/configs/sram_1rw_128b_1024w_scn4m_subm.py b/lib/scn4m_subm/configs/sram_128b_1024_1rw_scn4m_subm.py similarity index 100% rename from lib/scn4m_subm/configs/sram_1rw_128b_1024w_scn4m_subm.py rename to lib/scn4m_subm/configs/sram_128b_1024_1rw_scn4m_subm.py diff --git a/lib/scn4m_subm/configs/sram_1rw_32b_1024w_scn4m_subm.py b/lib/scn4m_subm/configs/sram_32b_1024_1rw_scn4m_subm.py similarity index 100% rename from lib/scn4m_subm/configs/sram_1rw_32b_1024w_scn4m_subm.py rename to lib/scn4m_subm/configs/sram_32b_1024_1rw_scn4m_subm.py diff --git a/lib/scn4m_subm/configs/sram_1rw_32b_2048w_scn4m_subm.py b/lib/scn4m_subm/configs/sram_32b_2048_1rw_scn4m_subm.py similarity index 100% rename from lib/scn4m_subm/configs/sram_1rw_32b_2048w_scn4m_subm.py rename to lib/scn4m_subm/configs/sram_32b_2048_1rw_scn4m_subm.py diff --git a/lib/scn4m_subm/configs/sram_1rw_32b_256w_scn4m_subm.py b/lib/scn4m_subm/configs/sram_32b_256_1rw_scn4m_subm.py similarity index 100% rename from lib/scn4m_subm/configs/sram_1rw_32b_256w_scn4m_subm.py rename to lib/scn4m_subm/configs/sram_32b_256_1rw_scn4m_subm.py diff --git a/lib/scn4m_subm/configs/sram_1rw_32b_512w_scn4m_subm.py b/lib/scn4m_subm/configs/sram_32b_512_1rw_scn4m_subm.py similarity index 100% rename from lib/scn4m_subm/configs/sram_1rw_32b_512w_scn4m_subm.py rename to lib/scn4m_subm/configs/sram_32b_512_1rw_scn4m_subm.py diff --git a/lib/scn4m_subm/configs/sram_1rw_64b_1024w_scn4m_subm.py b/lib/scn4m_subm/configs/sram_64b_1024_1rw_scn4m_subm.py similarity index 100% rename from lib/scn4m_subm/configs/sram_1rw_64b_1024w_scn4m_subm.py rename to lib/scn4m_subm/configs/sram_64b_1024_1rw_scn4m_subm.py diff --git a/lib/scn4m_subm/configs/sram_1rw_8b_1024w_scn4m_subm.py b/lib/scn4m_subm/configs/sram_8b_1024_1rw_scn4m_subm.py similarity index 100% rename from lib/scn4m_subm/configs/sram_1rw_8b_1024w_scn4m_subm.py rename to lib/scn4m_subm/configs/sram_8b_1024_1rw_scn4m_subm.py diff --git a/lib/scn4m_subm/configs/sram_1rw_8b_256w_scn4m_subm.py b/lib/scn4m_subm/configs/sram_8b_256_1rw_scn4m_subm.py similarity index 100% rename from lib/scn4m_subm/configs/sram_1rw_8b_256w_scn4m_subm.py rename to lib/scn4m_subm/configs/sram_8b_256_1rw_scn4m_subm.py diff --git a/lib/scn4m_subm/configs/sram_1rw_8b_512w_scn4m_subm.py b/lib/scn4m_subm/configs/sram_8b_512_1rw_scn4m_subm.py similarity index 100% rename from lib/scn4m_subm/configs/sram_1rw_8b_512w_scn4m_subm.py rename to lib/scn4m_subm/configs/sram_8b_512_1rw_scn4m_subm.py