Skip to content

Commit 18f2b82

Browse files
AlexandreSingerAlexandreSinger
authored
Merge pull request #3221 from verilog-to-routing/yosys_and_slang_update_v0.55
Upgrading to Yosys v0.55 and Updating Slang
2 parents 5358bea + 629458d commit 18f2b82

File tree

21 files changed

+202
-129
lines changed

21 files changed

+202
-129
lines changed

‎libs/EXTERNAL/CMakeLists.txt‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -102,11 +102,6 @@ if (${WITH_PARMYS})
102102
yosys-slang
103103
SOURCE_DIR ${SLANG_SRC_DIR}
104104
BINARY_DIR ${SLANG_BUILD_DIR}
105-
106-
#Disabling UndrivenPass in slang_frontend.cc
107-
PATCH_COMMAND
108-
${CMAKE_COMMAND} -E echo "Patching slang_frontend.cc to disable UndrivenPass" &&
109-
${CMAKE_COMMAND} -DIN=${SLANG_FE} -P ${CMAKE_CURRENT_SOURCE_DIR}/patch_slang.cmake
110105

111106
CONFIGURE_COMMAND ""
112107

‎libs/EXTERNAL/patch_slang.cmake‎

Lines changed: 0 additions & 18 deletions
This file was deleted.

‎libs/EXTERNAL/yosys‎

Submodule yosys updated 119 files

‎libs/EXTERNAL/yosys-slang‎

‎parmys/regression_test/benchmark/task/freecores/synthesis_result.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -483,7 +483,7 @@
483483
"Average Path": 3,
484484
"Estimated LUTs": 4777,
485485
"Total Node": 1957,
486-
"Wires": 5592,
486+
"Wires": 5594,
487487
"Wire Bits": 10106,
488488
"Public Wires": 240,
489489
"Public Wire Bits": 240,

‎parmys/regression_test/benchmark/task/keywords/and/synthesis_result.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,21 @@
9595
"test_name": "and/replicate_and_int_wide/no_arch",
9696
"exit": 1,
9797
"errors": [
98-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
98+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
9999
]
100100
},
101101
"and/replicate_and_ultra_wide/no_arch": {
102102
"test_name": "and/replicate_and_ultra_wide/no_arch",
103103
"exit": 1,
104104
"errors": [
105-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
105+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
106106
]
107107
},
108108
"and/replicate_and_wide/no_arch": {
109109
"test_name": "and/replicate_and_wide/no_arch",
110110
"exit": 1,
111111
"errors": [
112-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
112+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
113113
]
114114
},
115115
"DEFAULT": {

‎parmys/regression_test/benchmark/task/keywords/nand/synthesis_result.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -94,21 +94,21 @@
9494
"test_name": "nand/replicate_nand_int_wide/no_arch",
9595
"exit": 1,
9696
"errors": [
97-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
97+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
9898
]
9999
},
100100
"nand/replicate_nand_ultra_wide/no_arch": {
101101
"test_name": "nand/replicate_nand_ultra_wide/no_arch",
102102
"exit": 1,
103103
"errors": [
104-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
104+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
105105
]
106106
},
107107
"nand/replicate_nand_wide/no_arch": {
108108
"test_name": "nand/replicate_nand_wide/no_arch",
109109
"exit": 1,
110110
"errors": [
111-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
111+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
112112
]
113113
},
114114
"DEFAULT": {

‎parmys/regression_test/benchmark/task/keywords/nor/synthesis_result.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -100,21 +100,21 @@
100100
"test_name": "nor/replicate_nor_int_wide/no_arch",
101101
"exit": 1,
102102
"errors": [
103-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
103+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
104104
]
105105
},
106106
"nor/replicate_nor_ultra_wide/no_arch": {
107107
"test_name": "nor/replicate_nor_ultra_wide/no_arch",
108108
"exit": 1,
109109
"errors": [
110-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
110+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
111111
]
112112
},
113113
"nor/replicate_nor_wide/no_arch": {
114114
"test_name": "nor/replicate_nor_wide/no_arch",
115115
"exit": 1,
116116
"errors": [
117-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
117+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
118118
]
119119
},
120120
"DEFAULT": {

‎parmys/regression_test/benchmark/task/keywords/or/synthesis_result.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -95,21 +95,21 @@
9595
"test_name": "or/replicate_or_int_wide/no_arch",
9696
"exit": 1,
9797
"errors": [
98-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
98+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
9999
]
100100
},
101101
"or/replicate_or_ultra_wide/no_arch": {
102102
"test_name": "or/replicate_or_ultra_wide/no_arch",
103103
"exit": 1,
104104
"errors": [
105-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
105+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
106106
]
107107
},
108108
"or/replicate_or_wide/no_arch": {
109109
"test_name": "or/replicate_or_wide/no_arch",
110110
"exit": 1,
111111
"errors": [
112-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
112+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
113113
]
114114
},
115115
"DEFAULT": {

‎parmys/regression_test/benchmark/task/keywords/xnor/synthesis_result.json‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -54,21 +54,21 @@
5454
"test_name": "xnor/replicate_xnor_int_wide/no_arch",
5555
"exit": 1,
5656
"errors": [
57-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
57+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
5858
]
5959
},
6060
"xnor/replicate_xnor_ultra_wide/no_arch": {
6161
"test_name": "xnor/replicate_xnor_ultra_wide/no_arch",
6262
"exit": 1,
6363
"errors": [
64-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
64+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
6565
]
6666
},
6767
"xnor/replicate_xnor_wide/no_arch": {
6868
"test_name": "xnor/replicate_xnor_wide/no_arch",
6969
"exit": 1,
7070
"errors": [
71-
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2746."
71+
"Assert `new_cell->children.at(0)->type == AST_CELLTYPE' failed in frontends/ast/simplify.cc:2755."
7272
]
7373
},
7474
"xnor/xnor_indexed_port/no_arch": {

0 commit comments

Comments
 (0)