Skip to content

Commit e419b91

Browse files
emacdo12jeanlego
authored andcommitted
Odin: regenerate expected results
1 parent e34d3c1 commit e419b91

File tree

9 files changed

+535
-51
lines changed

9 files changed

+535
-51
lines changed

ODIN_II/regression_test/benchmark/suite/light_suite/task_list.conf

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
rtl_reg
22
regression_test/benchmark/task/arch_sweep
3+
regression_test/benchmark/task/fpu/*
34
regression_test/benchmark/task/cmd_line_args/*
45
regression_test/benchmark/task/preprocessor
56
regression_test/benchmark/task/operators
Lines changed: 102 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
{
2+
"hard_logic/bfly/hard_fpu_arch_timing": {
3+
"test_name": "hard_logic/bfly/hard_fpu_arch_timing",
4+
"architecture": "hard_fpu_arch_timing.xml",
5+
"blif": "bfly.blif",
6+
"exit": 134,
7+
"errors": [
8+
"[OUTPUT_BLIF] Could not resolve memory hard block fpu_mul~0 to a valid type."
9+
]
10+
},
11+
"hard_logic/bgm/hard_fpu_arch_timing": {
12+
"test_name": "hard_logic/bgm/hard_fpu_arch_timing",
13+
"architecture": "hard_fpu_arch_timing.xml",
14+
"blif": "bgm.blif",
15+
"exit": 134,
16+
"errors": [
17+
"[OUTPUT_BLIF] Could not resolve memory hard block fpu_mul~0 to a valid type."
18+
]
19+
},
20+
"hard_logic/dscg/hard_fpu_arch_timing": {
21+
"test_name": "hard_logic/dscg/hard_fpu_arch_timing",
22+
"architecture": "hard_fpu_arch_timing.xml",
23+
"blif": "dscg.blif",
24+
"exit": 134,
25+
"errors": [
26+
"[OUTPUT_BLIF] Could not resolve memory hard block fpu_add~0 to a valid type."
27+
]
28+
},
29+
"hard_logic/fir/hard_fpu_arch_timing": {
30+
"test_name": "hard_logic/fir/hard_fpu_arch_timing",
31+
"architecture": "hard_fpu_arch_timing.xml",
32+
"blif": "fir.blif",
33+
"exit": 134,
34+
"errors": [
35+
"[OUTPUT_BLIF] Could not resolve memory hard block fpu_mul~0 to a valid type."
36+
]
37+
},
38+
"hard_logic/mm3/hard_fpu_arch_timing": {
39+
"test_name": "hard_logic/mm3/hard_fpu_arch_timing",
40+
"architecture": "hard_fpu_arch_timing.xml",
41+
"blif": "mm3.blif",
42+
"exit": 134,
43+
"errors": [
44+
"[OUTPUT_BLIF] Could not resolve memory hard block fpu_mul~0 to a valid type."
45+
]
46+
},
47+
"hard_logic/ode/hard_fpu_arch_timing": {
48+
"test_name": "hard_logic/ode/hard_fpu_arch_timing",
49+
"architecture": "hard_fpu_arch_timing.xml",
50+
"blif": "ode.blif",
51+
"exit": 134,
52+
"errors": [
53+
"[OUTPUT_BLIF] Could not resolve memory hard block fpu_mul~0 to a valid type."
54+
]
55+
},
56+
"hard_logic/syn2/hard_fpu_arch_timing": {
57+
"test_name": "hard_logic/syn2/hard_fpu_arch_timing",
58+
"architecture": "hard_fpu_arch_timing.xml",
59+
"blif": "syn2.blif",
60+
"exit": 134,
61+
"errors": [
62+
"[OUTPUT_BLIF] Could not resolve memory hard block fpu_mul~5 to a valid type."
63+
]
64+
},
65+
"hard_logic/syn7/hard_fpu_arch_timing": {
66+
"test_name": "hard_logic/syn7/hard_fpu_arch_timing",
67+
"architecture": "hard_fpu_arch_timing.xml",
68+
"blif": "syn7.blif",
69+
"exit": 134,
70+
"errors": [
71+
"[OUTPUT_BLIF] Could not resolve memory hard block fpu_add~0 to a valid type."
72+
]
73+
},
74+
"DEFAULT": {
75+
"test_name": "n/a",
76+
"architecture": "n/a",
77+
"blif": "n/a",
78+
"exit": 0,
79+
"leaks": 0,
80+
"errors": [],
81+
"warnings": [],
82+
"expectation": [],
83+
"max_rss(MiB)": -1,
84+
"exec_time(ms)": -1,
85+
"simulation_time(ms)": -1,
86+
"test_coverage(%)": -1,
87+
"Latch Drivers": 0,
88+
"Pi": 0,
89+
"Po": 0,
90+
"logic element": 0,
91+
"latch": 0,
92+
"Adder": -1,
93+
"Multiplier": -1,
94+
"Memory": -1,
95+
"Hard Ip": -1,
96+
"generic logic size": -1,
97+
"Longest Path": 0,
98+
"Average Path": 0,
99+
"Estimated LUTs": 0,
100+
"Total Node": 0
101+
}
102+
}
Lines changed: 167 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,167 @@
1+
{
2+
"hard_logic/bfly/hard_fpu_arch_timing": {
3+
"test_name": "hard_logic/bfly/hard_fpu_arch_timing",
4+
"architecture": "hard_fpu_arch_timing.xml",
5+
"verilog": "bfly.v",
6+
"max_rss(MiB)": 68.7,
7+
"exec_time(ms)": 90.4,
8+
"synthesis_time(ms)": 28.7,
9+
"Latch Drivers": 1,
10+
"Pi": 192,
11+
"Po": 64,
12+
"latch": 384,
13+
"Hard Ip": 8,
14+
"generic logic size": 4,
15+
"Longest Path": 9,
16+
"Average Path": 5,
17+
"Total Node": 393
18+
},
19+
"hard_logic/bgm/hard_fpu_arch_timing": {
20+
"test_name": "hard_logic/bgm/hard_fpu_arch_timing",
21+
"architecture": "hard_fpu_arch_timing.xml",
22+
"verilog": "bgm.v",
23+
"max_rss(MiB)": 81.3,
24+
"exec_time(ms)": 152.5,
25+
"synthesis_time(ms)": 90.8,
26+
"Latch Drivers": 1,
27+
"Pi": 256,
28+
"Po": 32,
29+
"latch": 384,
30+
"Hard Ip": 20,
31+
"generic logic size": 4,
32+
"Longest Path": 11,
33+
"Average Path": 5,
34+
"Total Node": 405
35+
},
36+
"hard_logic/dscg/hard_fpu_arch_timing": {
37+
"test_name": "hard_logic/dscg/hard_fpu_arch_timing",
38+
"architecture": "hard_fpu_arch_timing.xml",
39+
"verilog": "dscg.v",
40+
"max_rss(MiB)": 67.2,
41+
"exec_time(ms)": 158.4,
42+
"synthesis_time(ms)": 48,
43+
"Latch Drivers": 1,
44+
"Pi": 128,
45+
"Po": 64,
46+
"latch": 384,
47+
"Hard Ip": 8,
48+
"generic logic size": 4,
49+
"Longest Path": 10,
50+
"Average Path": 5,
51+
"Total Node": 393
52+
},
53+
"hard_logic/fir/hard_fpu_arch_timing": {
54+
"test_name": "hard_logic/fir/hard_fpu_arch_timing",
55+
"architecture": "hard_fpu_arch_timing.xml",
56+
"verilog": "fir.v",
57+
"max_rss(MiB)": 72.1,
58+
"exec_time(ms)": 170.5,
59+
"synthesis_time(ms)": 59.8,
60+
"Latch Drivers": 1,
61+
"Pi": 160,
62+
"Po": 32,
63+
"latch": 608,
64+
"Hard Ip": 7,
65+
"generic logic size": 4,
66+
"Longest Path": 23,
67+
"Average Path": 5,
68+
"Total Node": 616
69+
},
70+
"hard_logic/mm3/hard_fpu_arch_timing": {
71+
"test_name": "hard_logic/mm3/hard_fpu_arch_timing",
72+
"architecture": "hard_fpu_arch_timing.xml",
73+
"verilog": "mm3.v",
74+
"max_rss(MiB)": 63.2,
75+
"exec_time(ms)": 78.3,
76+
"synthesis_time(ms)": 16.4,
77+
"Latch Drivers": 1,
78+
"Pi": 192,
79+
"Po": 32,
80+
"latch": 192,
81+
"Hard Ip": 5,
82+
"generic logic size": 4,
83+
"Longest Path": 10,
84+
"Average Path": 5,
85+
"Total Node": 198
86+
},
87+
"hard_logic/ode/hard_fpu_arch_timing": {
88+
"test_name": "hard_logic/ode/hard_fpu_arch_timing",
89+
"architecture": "hard_fpu_arch_timing.xml",
90+
"verilog": "ode.v",
91+
"max_rss(MiB)": 78.1,
92+
"exec_time(ms)": 178.4,
93+
"synthesis_time(ms)": 68.2,
94+
"Latch Drivers": 1,
95+
"Pi": 129,
96+
"Po": 72,
97+
"logic element": 66,
98+
"latch": 800,
99+
"Hard Ip": 5,
100+
"generic logic size": 4,
101+
"Longest Path": 18,
102+
"Average Path": 3,
103+
"Estimated LUTs": 66,
104+
"Total Node": 872
105+
},
106+
"hard_logic/syn2/hard_fpu_arch_timing": {
107+
"test_name": "hard_logic/syn2/hard_fpu_arch_timing",
108+
"architecture": "hard_fpu_arch_timing.xml",
109+
"verilog": "syn2.v",
110+
"max_rss(MiB)": 66.2,
111+
"exec_time(ms)": 157.4,
112+
"synthesis_time(ms)": 47.1,
113+
"Latch Drivers": 1,
114+
"Pi": 160,
115+
"Po": 128,
116+
"latch": 192,
117+
"Hard Ip": 9,
118+
"generic logic size": 4,
119+
"Longest Path": 11,
120+
"Average Path": 4,
121+
"Total Node": 202
122+
},
123+
"hard_logic/syn7/hard_fpu_arch_timing": {
124+
"test_name": "hard_logic/syn7/hard_fpu_arch_timing",
125+
"architecture": "hard_fpu_arch_timing.xml",
126+
"verilog": "syn7.v",
127+
"max_rss(MiB)": 83.8,
128+
"exec_time(ms)": 158.8,
129+
"synthesis_time(ms)": 98.4,
130+
"Latch Drivers": 1,
131+
"Pi": 160,
132+
"Po": 128,
133+
"latch": 160,
134+
"Hard Ip": 50,
135+
"generic logic size": 4,
136+
"Longest Path": 15,
137+
"Average Path": 13,
138+
"Total Node": 211
139+
},
140+
"DEFAULT": {
141+
"test_name": "n/a",
142+
"architecture": "n/a",
143+
"verilog": "n/a",
144+
"exit": 0,
145+
"leaks": 0,
146+
"errors": [],
147+
"warnings": [],
148+
"expectation": [],
149+
"max_rss(MiB)": -1,
150+
"exec_time(ms)": -1,
151+
"synthesis_time(ms)": -1,
152+
"Latch Drivers": 0,
153+
"Pi": 0,
154+
"Po": 0,
155+
"logic element": 0,
156+
"latch": 0,
157+
"Adder": -1,
158+
"Multiplier": -1,
159+
"Memory": -1,
160+
"Hard Ip": -1,
161+
"generic logic size": -1,
162+
"Longest Path": 0,
163+
"Average Path": 0,
164+
"Estimated LUTs": 0,
165+
"Total Node": 0
166+
}
167+
}

ODIN_II/regression_test/benchmark/task/fpu/soft_logic/task.conf

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

ODIN_II/regression_test/benchmark/task/keywords/defparam/simulation_result.json

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,6 +115,53 @@
115115
"Estimated LUTs": 12,
116116
"Total Node": 12
117117
},
118+
"defparam/defparam_depth_2/no_arch": {
119+
"test_name": "defparam/defparam_depth_2/no_arch",
120+
"blif": "defparam_depth_2.blif",
121+
"exit": 134,
122+
"errors": [
123+
"[OUTPUT_BLIF] Vector files differ."
124+
],
125+
"warnings": [
126+
"[OUTPUT_BLIF] Vector 0 mismatch:",
127+
"[OUTPUT_BLIF] Vector 1 mismatch:",
128+
"[OUTPUT_BLIF] Vector 2 mismatch:",
129+
"[OUTPUT_BLIF] Vector 3 mismatch:",
130+
"[OUTPUT_BLIF] Vector 4 mismatch:",
131+
"[OUTPUT_BLIF] Vector 5 mismatch:",
132+
"[OUTPUT_BLIF] Vector 6 mismatch:",
133+
"[OUTPUT_BLIF] Vector 7 mismatch:",
134+
"[OUTPUT_BLIF] Vector 8 mismatch:",
135+
"[OUTPUT_BLIF] Vector 9 mismatch:",
136+
"[OUTPUT_BLIF] Vector 10 mismatch:",
137+
"[OUTPUT_BLIF] Vector 11 mismatch:",
138+
"[OUTPUT_BLIF] Vector 12 mismatch:",
139+
"[OUTPUT_BLIF] Vector 13 mismatch:",
140+
"[OUTPUT_BLIF] Vector 14 mismatch:",
141+
"[OUTPUT_BLIF] Vector 15 mismatch:",
142+
"[OUTPUT_BLIF] Vector 16 mismatch:",
143+
"[OUTPUT_BLIF] Vector 17 mismatch:",
144+
"[OUTPUT_BLIF] Vector 18 mismatch:",
145+
"[OUTPUT_BLIF] Vector 19 mismatch:",
146+
"[OUTPUT_BLIF] Vector 20 mismatch:",
147+
"[OUTPUT_BLIF] Vector 21 mismatch:",
148+
"[OUTPUT_BLIF] Vector 22 mismatch:",
149+
"[OUTPUT_BLIF] Vector 23 mismatch:",
150+
"[OUTPUT_BLIF] Vector 24 mismatch:",
151+
"[OUTPUT_BLIF] Vector 25 mismatch:",
152+
"[OUTPUT_BLIF] Vector 26 mismatch:",
153+
"[OUTPUT_BLIF] Vector 27 mismatch:",
154+
"[OUTPUT_BLIF] Vector 28 mismatch:",
155+
"[OUTPUT_BLIF] Vector 29 mismatch:",
156+
"[OUTPUT_BLIF] Vector 30 mismatch:",
157+
"[OUTPUT_BLIF] Vector 32 mismatch:",
158+
"[OUTPUT_BLIF] Vector 33 mismatch:",
159+
"[OUTPUT_BLIF] Vector 34 mismatch:",
160+
"[OUTPUT_BLIF] Vector 35 mismatch:",
161+
"[OUTPUT_BLIF] Vector 36 mismatch:",
162+
"[OUTPUT_BLIF] Vector 37 mismatch:"
163+
]
164+
},
118165
"DEFAULT": {
119166
"test_name": "n/a",
120167
"architecture": "n/a",

ODIN_II/regression_test/benchmark/task/keywords/defparam/synthesis_result.json

Lines changed: 24 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -86,10 +86,30 @@
8686
"defparam/defparam_depth_2/no_arch": {
8787
"test_name": "defparam/defparam_depth_2/no_arch",
8888
"verilog": "defparam_depth_2.v",
89-
"exit": 134,
90-
"errors": [
91-
"defparam_depth_2.v:16:1 [NETLIST] This module port simple_op.m2^in~2 is unused in module assg1"
92-
]
89+
"warnings": [
90+
"defparam_depth_2.v:16:3 [NETLIST] This module port in2[2] is unused in module assg1",
91+
"defparam_depth_2.v:16:3 [NETLIST] This module port in2[3] is unused in module assg1",
92+
"defparam_depth_2.v:16:3 [NETLIST] This module port in2[4] is unused in module assg1",
93+
"defparam_depth_2.v:16:3 [NETLIST] This module port in2[5] is unused in module assg1",
94+
"defparam_depth_2.v:16:3 [NETLIST] This module port in2[6] is unused in module assg1",
95+
"defparam_depth_2.v:16:3 [NETLIST] This module port in2[7] is unused in module assg1",
96+
"defparam_depth_2.v:8:4 [NETLIST] This output is undriven (simple_op^out2~2) and will be removed",
97+
"defparam_depth_2.v:8:4 [NETLIST] This output is undriven (simple_op^out2~3) and will be removed",
98+
"defparam_depth_2.v:8:4 [NETLIST] This output is undriven (simple_op^out2~4) and will be removed",
99+
"defparam_depth_2.v:8:4 [NETLIST] This output is undriven (simple_op^out2~5) and will be removed",
100+
"defparam_depth_2.v:8:4 [NETLIST] This output is undriven (simple_op^out2~6) and will be removed",
101+
"defparam_depth_2.v:8:4 [NETLIST] This output is undriven (simple_op^out2~7) and will be removed",
102+
"defparam_depth_2.v:8:4 [NETLIST] Net simple_op.m2^out~2 driving node simple_op^out2~2 is itself undriven.",
103+
"defparam_depth_2.v:8:4 [NETLIST] Net simple_op.m2^out~3 driving node simple_op^out2~3 is itself undriven.",
104+
"defparam_depth_2.v:8:4 [NETLIST] Net simple_op.m2^out~4 driving node simple_op^out2~4 is itself undriven.",
105+
"defparam_depth_2.v:8:4 [NETLIST] Net simple_op.m2^out~5 driving node simple_op^out2~5 is itself undriven.",
106+
"defparam_depth_2.v:8:4 [NETLIST] Net simple_op.m2^out~6 driving node simple_op^out2~6 is itself undriven.",
107+
"defparam_depth_2.v:8:4 [NETLIST] Net simple_op.m2^out~7 driving node simple_op^out2~7 is itself undriven."
108+
],
109+
"Pi": 4,
110+
"Po": 10,
111+
"Longest Path": 2,
112+
"Average Path": 1
93113
},
94114
"defparam/defparam_simple_failure/no_arch": {
95115
"test_name": "defparam/defparam_simple_failure/no_arch",

0 commit comments

Comments
 (0)