From 12a853124887c5d6bf362406dd50f629a3d7aa29 Mon Sep 17 00:00:00 2001
From: Hunter Nichols <hznichol@ucsc.edu>
Date: Wed, 21 Oct 2020 03:02:39 -0700
Subject: [PATCH] Allowed for OPTS writeback of words_per_row if automatically
 generated during generation.

---
 compiler/options.py   | 10 +++-------
 compiler/sram/sram.py |  6 ++++++
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/compiler/options.py b/compiler/options.py
index 0f94be2b..37d2dc5e 100644
--- a/compiler/options.py
+++ b/compiler/options.py
@@ -9,7 +9,6 @@ import optparse
 import getpass
 import os
 
-
 class options(optparse.Values):
     """
     Class for holding all of the OpenRAM options. All
@@ -100,7 +99,7 @@ class options(optparse.Values):
     # Run with extracted parasitics
     use_pex = False
     # Output config with all options
-    output_extended_config = False
+    output_extended_config = True
 
 
     ###################
@@ -122,9 +121,6 @@ class options(optparse.Values):
     # For sky130, we need magic for filtering.
     magic_exe = None
 
-    # Number of threads to use
-    num_threads = 2
-
     # Should we print out the banner at startup
     print_banner = True
 
@@ -149,7 +145,7 @@ class options(optparse.Values):
     bitcell_array = "bitcell_array"
     bitcell = "bitcell"
     buf_dec = "pbuf"
-    column_mux_array = "column_mux_array"
+    column_mux_array = "single_level_column_mux_array"
     control_logic = "control_logic"
     decoder = "hierarchical_decoder"
     delay_chain = "delay_chain"
@@ -158,7 +154,7 @@ class options(optparse.Values):
     inv_dec = "pinv"
     nand2_dec = "pnand2"
     nand3_dec = "pnand3"
-    nand4_dec = "pnand4"
+    nand4_dec = "pnand4" # Not available right now
     precharge_array = "precharge_array"
     ptx = "ptx"
     replica_bitline = "replica_bitline"
diff --git a/compiler/sram/sram.py b/compiler/sram/sram.py
index 63d971f3..5da8d8aa 100644
--- a/compiler/sram/sram.py
+++ b/compiler/sram/sram.py
@@ -20,6 +20,12 @@ class sram():
     def __init__(self, sram_config, name):
 
         sram_config.set_local_config(self)
+                
+        # FIXME: adjust this to not directly change OPTS.
+        # Word-around to have values relevant to OPTS be displayed if not directly set.
+        OPTS.words_per_row = self.words_per_row
+        debug.info(1, "Changed OPTS wpr={}".format(self.words_per_row))
+        debug.info(1, "OPTS wpr={}".format(OPTS.words_per_row))
         
         # reset the static duplicate name checker for unit tests
         # in case we create more than one SRAM