aboutsummaryrefslogtreecommitdiffstats
path: root/frontends/ast
diff options
context:
space:
mode:
authorclairexen <claire@symbioticeda.com>2020-05-29 16:52:11 +0200
committerGitHub <noreply@github.com>2020-05-29 16:52:11 +0200
commit0a14e1e837ad0aeae6944a9eafe1a14b79c12cb3 (patch)
tree2af754e54f6bd38da670fadd9fac7aaa6a1b48d3 /frontends/ast
parent94c10353897c6b2b3f960bdd6647a5da9c1d9f2c (diff)
parent66d0ed2bcc7195aab5b107b2536e6818fe5b244c (diff)
downloadyosys-0a14e1e837ad0aeae6944a9eafe1a14b79c12cb3.tar.gz
yosys-0a14e1e837ad0aeae6944a9eafe1a14b79c12cb3.tar.bz2
yosys-0a14e1e837ad0aeae6944a9eafe1a14b79c12cb3.zip
Merge pull request #2029 from whitequark/fix-simplify-memory-sv_logic
ast/simplify: don't bitblast async ROMs declared as `logic`
Diffstat (limited to 'frontends/ast')
-rw-r--r--frontends/ast/simplify.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/frontends/ast/simplify.cc b/frontends/ast/simplify.cc
index 3314819fb..3d690c1f5 100644
--- a/frontends/ast/simplify.cc
+++ b/frontends/ast/simplify.cc
@@ -3540,8 +3540,8 @@ void AstNode::mem2reg_as_needed_pass1(dict<AstNode*, pool<std::string>> &mem2reg
}
}
- // also activate if requested, either by using mem2reg attribute or by declaring array as 'wire' instead of 'reg'
- if (type == AST_MEMORY && (get_bool_attribute(ID::mem2reg) || (flags & AstNode::MEM2REG_FL_ALL) || !is_reg))
+ // also activate if requested, either by using mem2reg attribute or by declaring array as 'wire' instead of 'reg' or 'logic'
+ if (type == AST_MEMORY && (get_bool_attribute(ID::mem2reg) || (flags & AstNode::MEM2REG_FL_ALL) || !(is_reg || is_logic)))
mem2reg_candidates[this] |= AstNode::MEM2REG_FL_FORCED;
if (type == AST_MODULE && get_bool_attribute(ID::mem2reg))