diff options
| author | Eddie Hung <eddie@fpgeh.com> | 2019-04-10 08:23:00 -0700 |
|---|---|---|
| committer | Eddie Hung <eddie@fpgeh.com> | 2019-04-10 08:23:00 -0700 |
| commit | c89cd48f58bfe469b0a5b06af5d879ea3be73bd1 (patch) | |
| tree | 63ff194a74f13929ce13f0fd0099bd2070277bf5 | |
| parent | ad602438b8313c3dd243c5fabf6f20036487d1ba (diff) | |
| parent | 0deaccbaae436bc94ad5b2913fa39a9368c09ace (diff) | |
| download | yosys-c89cd48f58bfe469b0a5b06af5d879ea3be73bd1.tar.gz yosys-c89cd48f58bfe469b0a5b06af5d879ea3be73bd1.tar.bz2 yosys-c89cd48f58bfe469b0a5b06af5d879ea3be73bd1.zip | |
Merge remote-tracking branch 'origin/master' into eddie/fix_retime
| -rw-r--r-- | passes/memory/memory_bram.cc | 3 | ||||
| -rw-r--r-- | passes/pmgen/README.md | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/passes/memory/memory_bram.cc b/passes/memory/memory_bram.cc index 804aa21f9..ddc56d9b5 100644 --- a/passes/memory/memory_bram.cc +++ b/passes/memory/memory_bram.cc @@ -744,7 +744,8 @@ grow_read_ports:; if (clken) { clock_domains[pi.clocks] = clkdom; clock_polarities[pi.clkpol] = clkdom.second; - read_transp[pi.transp] = transp; + if (!pi.make_transp) + read_transp[pi.transp] = transp; pi.sig_clock = clkdom.first; pi.sig_en = rd_en[cell_port_i]; pi.effective_clkpol = clkdom.second; diff --git a/passes/pmgen/README.md b/passes/pmgen/README.md index 223b43059..7a46558b1 100644 --- a/passes/pmgen/README.md +++ b/passes/pmgen/README.md @@ -83,8 +83,8 @@ They are declared like state variables, just using the `udata` statement: udata <int> min_data_width max_data_width udata <IdString> data_port_name -They are atomatically initialzed to the default constructed value of their type -when ther pattern matcher object is constructed. +They are automatically initialized to the default constructed value of their type +when the pattern matcher object is constructed. Embedded C++ code ----------------- @@ -158,7 +158,7 @@ Finally, `filter <expression>` narrows down the remaining list of cells. For performance reasons `filter` statements should only be used for things that can't be done using `select` and `index`. -The `optional` statement marks optional matches. I.e. the matcher will also +The `optional` statement marks optional matches. That is, the matcher will also explore the case where `mul` is set to `nullptr`. Without the `optional` statement a match may only be assigned nullptr when one of the `if` expressions evaluates to `false`. |