Skip to content

Commit dad6580

Browse files
committed
vtr golden result updated
1 parent e644f17 commit dad6580

File tree

49 files changed

+2541
-2477
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2541
-2477
lines changed

.github/workflows/test.yml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,9 +64,21 @@ jobs:
6464
- {test: "vtr_reg_strong", cores: "16", options: "", cmake: "-DVTR_ASSERT_LEVEL=3", extra_pkgs: "libeigen3-dev"}
6565
- {test: "vtr_reg_strong_odin", cores: "16", options: "", cmake: "-DVTR_ASSERT_LEVEL=3 -DWITH_ODIN=ON", extra_pkgs: "libeigen3-dev"}
6666
- {test: "vtr_reg_strong_odin", cores: "16", options: "-skip_qor", cmake: "-DVTR_ASSERT_LEVEL=3 -DVTR_ENABLE_SANITIZE=ON -DWITH_ODIN=ON", extra_pkgs: "libeigen3-dev"}
67+
<<<<<<< HEAD
6768
- {test: "vtr_reg_system_verilog", cores: "16", options: "", cmake: "-DYOSYS_F4PGA_PLUGINS=ON", extra_pkgs: ""}
6869
- {test: "odin_reg_strong", cores: "16", options: "", cmake: "-DWITH_ODIN=ON", extra_pkgs: ""}
6970
- {test: "parmys_reg_strong", cores: "16", options: "", cmake: "-DYOSYS_F4PGA_PLUGINS=ON", extra_pkgs: ""}
71+
=======
72+
<<<<<<< HEAD
73+
#- {test: "vtr_reg_system_verilog", cores: "16", options: "", cmake: "-DYOSYS_F4PGA_PLUGINS=ON", extra_pkgs: ""}
74+
- {test: "odin_reg_strong", cores: "16", options: "", cmake: "-DWITH_ODIN=ON", extra_pkgs: ""}
75+
#- {test: "parmys_reg_strong", cores: "16", options: "", cmake: "-DYOSYS_F4PGA_PLUGINS=ON", extra_pkgs: ""}
76+
=======
77+
#- {test: "vtr_reg_system_verilog", cores: "16", options: "", cmake: "-DYOSYS_F4PGA_PLUGINS=ON", extra_pkgs: ""}
78+
- {test: "odin_reg_strong", cores: "16", options: "", cmake: "-DWITH_ODIN=ON", extra_pkgs: ""}
79+
- {test: "parmys_reg_strong", cores: "16", options: "", cmake: "-DYOSYS_F4PGA_PLUGINS=OFF", extra_pkgs: ""}
80+
>>>>>>> a23006e1e (vtr golden result updated)
81+
>>>>>>> f839aab8a (vtr golden result updated)
7082

7183
env:
7284
DEBIAN_FRONTEND: "noninteractive"

parmys/regression_test/benchmark/suite/koios_weekly_suite/task_list.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,5 +2,5 @@ regression_test/benchmark/task/koios/koios_large
22
regression_test/benchmark/task/koios/koios_large_no_hb
33
regression_test/benchmark/task/koios/koios_proxy
44
regression_test/benchmark/task/koios/koios_proxy_no_hb
5-
regression_test/benchmark/task/koios/koios_sv
6-
regression_test/benchmark/task/koios/koios_sv_no_hb
5+
#regression_test/benchmark/task/koios/koios_sv
6+
#regression_test/benchmark/task/koios/koios_sv_no_hb

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

Lines changed: 19 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -479,20 +479,20 @@
479479
"Multiplier": 1,
480480
"Memory": 8,
481481
"generic logic size": 4,
482-
"Longest Path": 269,
482+
"Longest Path": 274,
483483
"Average Path": 3,
484-
"Estimated LUTs": 4797,
484+
"Estimated LUTs": 4777,
485485
"Total Node": 1957,
486-
"Wires": 5595,
487-
"Wire Bits": 10315,
486+
"Wires": 5591,
487+
"Wire Bits": 10025,
488488
"Public Wires": 240,
489489
"Public Wire Bits": 240,
490-
"Total Cells": 8221,
491-
"MUX": 2180,
490+
"Total Cells": 8185,
491+
"MUX": 2164,
492492
"XOR": 40,
493-
"OR": 2850,
494-
"AND": 1455,
495-
"NOT": 639,
493+
"OR": 2836,
494+
"AND": 1451,
495+
"NOT": 637,
496496
"DFFs": [
497497
"$_DFF_P_ 645"
498498
],
@@ -533,8 +533,8 @@
533533
"Average Path": 3,
534534
"Estimated LUTs": 41888,
535535
"Total Node": 5344,
536-
"Wires": 9772,
537-
"Wire Bits": 102222,
536+
"Wires": 9777,
537+
"Wire Bits": 102242,
538538
"Public Wires": 391,
539539
"Public Wire Bits": 391,
540540
"Total Cells": 31999,
@@ -585,8 +585,8 @@
585585
"Average Path": 3,
586586
"Estimated LUTs": 42386,
587587
"Total Node": 5593,
588-
"Wires": 10802,
589-
"Wire Bits": 103242,
588+
"Wires": 10796,
589+
"Wire Bits": 103210,
590590
"Public Wires": 648,
591591
"Public Wire Bits": 648,
592592
"Total Cells": 32995,
@@ -840,16 +840,16 @@
840840
"Average Path": 4,
841841
"Estimated LUTs": 4564,
842842
"Total Node": 2961,
843-
"Wires": 6943,
844-
"Wire Bits": 11526,
843+
"Wires": 6934,
844+
"Wire Bits": 11506,
845845
"Public Wires": 501,
846846
"Public Wire Bits": 501,
847-
"Total Cells": 8995,
847+
"Total Cells": 8955,
848848
"MUX": 2605,
849849
"XOR": 311,
850-
"OR": 1858,
851-
"AND": 1687,
852-
"NOT": 711,
850+
"OR": 1861,
851+
"AND": 1683,
852+
"NOT": 672,
853853
"DFFs": [
854854
"$_DFF_P_ 1312"
855855
],
@@ -861,9 +861,6 @@
861861
"test_name": "freecores/mips_16/k6_frac_N10_frac_chain_mem32K_40nm",
862862
"architecture": "k6_frac_N10_frac_chain_mem32K_40nm.xml",
863863
"warnings": [
864-
"mips_16.v:0 System task `$display' outside initial block is unsupported.",
865-
"mips_16.v:0 System task `$display' outside initial block is unsupported.",
866-
"mips_16.v:0 System task `$display' outside initial block is unsupported.",
867864
"Replacing memory \\reg_array with list of registers. See ../vtr_flow/benchmarks//freecores/mips_16.v:791",
868865
"Ignoring module EX_stage because it contains processes (run 'proc' command first).",
869866
"Ignoring module data_mem because it contains processes (run 'proc' command first).",

0 commit comments

Comments
 (0)