Merged with dev, fixed config file conflict.

This commit is contained in:
Hunter Nichols 2018-11-05 14:58:52 -08:00
commit ff169fcb2b
3 changed files with 6 additions and 32 deletions

View File

@ -20,7 +20,7 @@ other OpenRAM features. Please see the README.md file on how to run
the unit tests. Unit tests should work in all technologies. We will run the unit tests. Unit tests should work in all technologies. We will run
the tests on your contributions before they will be accepted. the tests on your contributions before they will be accepted.
# Internally Development # Internal Development
For internal development, follow all of the following steps EXCEPT For internal development, follow all of the following steps EXCEPT
do not fork your own copy. Instead, create a branch in our private repository do not fork your own copy. Instead, create a branch in our private repository
@ -32,21 +32,21 @@ All unit tests should pass first.
1. One time, create a GitHub account at http://github.com 1. One time, create a GitHub account at http://github.com
2. Create a fork of the OpenRAM project on the github web page: 2. Create a fork of the OpenRAM project on the github web page:
https://github.com/mguthaus/OpenRAM https://github.com/vlsida/openram
It is on the upper right and says "Fork": This will make your own It is on the upper right and says "Fork": This will make your own
OpenRAM repository on GitHub in your account. OpenRAM repository on GitHub in your account.
3. Clone your repository (or use an existing cloned copy if you've 3. Clone your repository (or use an existing cloned copy if you've
already done this once): already done this once):
``` ```
git clone https://github.com/<youruser>/OpenRAM.git git clone https://github.com/<youruser>/oepnram.git
cd OpenRAM cd openram
``` ```
4. Set up a new upstream that points to MY OpenRAM repository that you 4. Set up a new upstream that points to MY OpenRAM repository that you
forked (only first time): forked (only first time):
``` ```
git remote add upstream https://github.com/mguthaus/OpenRAM.git git remote add upstream https://github.com/vlsida/openram.git
``` ```
You now have two remotes for this project: You now have two remotes for this project:
* origin which points to your GitHub fork of the project. You can read * origin which points to your GitHub fork of the project. You can read

View File

@ -9,16 +9,3 @@ temperatures = [25]
output_path = "temp" output_path = "temp"
output_name = "sram_{0}_{1}_{2}".format(word_size,num_words,tech_name) output_name = "sram_{0}_{1}_{2}".format(word_size,num_words,tech_name)
#Setting for multiport
# netlist_only = True
# num_rw_ports = 1
# num_r_ports = 1
# num_w_ports = 0
#Pbitcell modules for multiport
#bitcell = "pbitcell"
#replica_bitcell="replica_pbitcell"
#Custom 1rw+1r multiport cell. Set the above port numbers to rw = 1, r = 1, w = 0
# bitcell = "bitcell_1rw_1r"
# replica_bitcell = "replica_bitcell_1rw_1r"

View File

@ -3,22 +3,9 @@ num_words = 16
tech_name = "scn4m_subm" tech_name = "scn4m_subm"
process_corners = ["TT"] process_corners = ["TT"]
supply_voltages = [ 5.0 ] supply_voltages = [ 3.3 ]
temperatures = [ 25 ] temperatures = [ 25 ]
output_path = "temp" output_path = "temp"
output_name = "sram_{0}_{1}_{2}".format(word_size,num_words,tech_name) output_name = "sram_{0}_{1}_{2}".format(word_size,num_words,tech_name)
#Setting for multiport
# netlist_only = True
# num_rw_ports = 1
# num_r_ports = 1
# num_w_ports = 0
#Pbitcell modules for multiport
#bitcell = "pbitcell"
#replica_bitcell="replica_pbitcell"
#Custom 1rw+1r multiport cell. Set the above port numbers to rw = 1, r = 1, w = 0
# bitcell = "bitcell_1rw_1r"
# replica_bitcell = "replica_bitcell_1rw_1r"