Skip to content

Commit 97ac61a

Browse files
authored
Adjust Synlig Makefile to submodule changes (#2593)
This PR adjusts Synlig Makefile to recent submodule changes
2 parents 5c62cba + 5ed8cc2 commit 97ac61a

File tree

3 files changed

+22
-8
lines changed

3 files changed

+22
-8
lines changed

src/Makefile

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -261,6 +261,7 @@ $(eval $(call add_include_file,kernel/celltypes.h))
261261
$(eval $(call add_include_file,kernel/consteval.h))
262262
$(eval $(call add_include_file,kernel/constids.inc))
263263
$(eval $(call add_include_file,kernel/cost.h))
264+
$(eval $(call add_include_file,kernel/drivertools.h))
264265
$(eval $(call add_include_file,kernel/ff.h))
265266
$(eval $(call add_include_file,kernel/ffinit.h))
266267
$(eval $(call add_include_file,kernel/ffmerge.h))
@@ -277,6 +278,7 @@ $(eval $(call add_include_file,kernel/register.h))
277278
$(eval $(call add_include_file,kernel/rtlil.h))
278279
$(eval $(call add_include_file,kernel/satgen.h))
279280
$(eval $(call add_include_file,kernel/scopeinfo.h))
281+
$(eval $(call add_include_file,kernel/sexpr.h))
280282
$(eval $(call add_include_file,kernel/sigtools.h))
281283
$(eval $(call add_include_file,kernel/timinginfo.h))
282284
$(eval $(call add_include_file,kernel/utils.h))
@@ -299,6 +301,7 @@ OBJS += kernel/register.o kernel/rtlil.o kernel/log.o kernel/calc.o kernel/yosys
299301
OBJS += kernel/binding.o
300302
OBJS += kernel/cellaigs.o kernel/celledges.o kernel/cost.o kernel/satgen.o kernel/scopeinfo.o kernel/qcsat.o kernel/mem.o kernel/ffmerge.o kernel/ff.o kernel/yw.o kernel/json.o kernel/fmt.o
301303
OBJS += kernel/fstdata.o
304+
OBJS += kernel/sexpr.o kernel/drivertools.o kernel/functional.o
302305

303306
OBJS += libs/bigint/BigIntegerAlgorithms.o libs/bigint/BigInteger.o libs/bigint/BigIntegerUtils.o
304307
OBJS += libs/bigint/BigUnsigned.o libs/bigint/BigUnsignedInABase.o

tests/formal/testlist.json

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -91,7 +91,6 @@
9191
"CastLogic/top.sv",
9292
"CastSize/top.sv",
9393
"CastStruct/top.sv",
94-
"CastStructArray/top.sv",
9594
"CastToSumOfConstants/top.sv",
9695
"CastToSumWithParameterIn2InstancesOfSubmodule/top.sv",
9796
"CastToSumWithParameterInSubmodule/top.sv",
@@ -148,6 +147,8 @@
148147
"IndexedPartSelectPos/dut.sv",
149148
"InterfaceAsPort/top.sv",
150149
"InterfaceAsPortAssignValueInSubmodule/top.sv",
150+
"InterfaceParameter/top.sv",
151+
"InterfaceParameterSetValue/top.sv",
151152
"InterfaceVariable/top.sv",
152153
"InterfaceWithPort/top.sv",
153154
"LocalParamInNestedForLoops/top.sv",
@@ -209,9 +210,6 @@
209210
"ParameterInitializedInTopOf5LevelHierarchy/top.sv",
210211
"ParameterInitializedInTopOf5LevelHierarchyWithUnusedParamInTheMiddle/top.sv",
211212
"ParameterInitializedInTopOf5LevelHierarchyWithUnusedParamOfDifferentTypeInTheMiddle/top.sv",
212-
"ParameterOfParametrizedType/top.sv",
213-
"ParameterOfParametrizedTypeInSubmodule/top.sv",
214-
"ParameterOfSizeOfPort/top.sv",
215213
"ParameterPassedTo3TimesNestedSubmodule/top.sv",
216214
"ParameterPassedToSubmoduleInGenscopeOfSubmodule/top.sv",
217215
"ParameterPassedToSubmoduleOfSubmodule/top.sv",
@@ -331,6 +329,7 @@
331329
"arch/ice40/dpram.v",
332330
"arch/ice40/rom.v",
333331
"arch/ice40/spram.v",
332+
"arch/nanoxplore/meminit.v",
334333
"arch/nexus/blockram_dc.v",
335334
"arch/quicklogic/qlf_k6n10f/meminit.v",
336335
"arch/xilinx/asym_ram_sdp_read_wider.v",
@@ -906,6 +905,7 @@
906905
"fmt/initial_display.v",
907906
"fmt/roundtrip.v",
908907
"fmt/roundtrip_tb.v",
908+
"functional/picorv32_tb.v",
909909
"hana/hana_vlib.v",
910910
"hana/test_simulation_vlib.v",
911911
"lut/map_and.v",
@@ -981,7 +981,6 @@
981981
"various/rand_const.sv",
982982
"various/shregmap.v",
983983
"various/struct_access.sv",
984-
"verific/enum_values.sv",
985984
"verilog/asgn_expr.sv",
986985
"verilog/dynamic_range_lhs.v",
987986
"verilog/func_upto.sv",
@@ -1524,6 +1523,7 @@
15241523
"arch/gowin/init.v",
15251524
"arch/ice40/macc.v",
15261525
"arch/xilinx/priority_memory.v",
1526+
"functional/picorv32.v",
15271527
"hana/test_parse2synthtrans.v",
15281528
"hana/test_simulation_always.v",
15291529
"hana/test_simulation_buffer.v",
@@ -1817,14 +1817,25 @@
18171817
"various/reg_wire_error.sv"
18181818
]
18191819
},
1820+
"surelog wrongly assigns values in enum": {
1821+
"yosys": [
1822+
"verific/enum_values.sv"
1823+
]
1824+
},
1825+
"yosys wrongly calculates wiretype size": {
1826+
"simple": [
1827+
"CastStructArray/top.sv",
1828+
"ParameterOfParametrizedTypeInSubmodule/top.sv",
1829+
"ParameterOfParametrizedType/top.sv",
1830+
"ParameterOfSizeOfPort/top.sv"
1831+
]
1832+
},
18201833
"FV: Failed to prove equivalence": {
18211834
"simple": [
18221835
"CastClog2ToMinimalSizeOfParamValueFromCommandLine/top.sv",
18231836
"Fork/top.sv",
18241837
"ImportedPackageEnumItemInInterface/top.sv",
18251838
"IndexedPartSelectOfArrayElement/top.sv",
1826-
"InterfaceParameter/top.sv",
1827-
"InterfaceParameterSetValue/top.sv",
18281839
"LogicPackedArray/top.sv",
18291840
"MultirangesStartNotFromZero/top.sv",
18301841
"OneNetModport/top.sv",

third_party/yosys

Submodule yosys updated 183 files

0 commit comments

Comments
 (0)