diff --git a/tests/gold/basic_function_call.json b/tests/gold/basic_function_call.json index d3a20dd91..a92303680 100644 --- a/tests/gold/basic_function_call.json +++ b/tests/gold/basic_function_call.json @@ -48,4 +48,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/gold/if_statement_basic.json b/tests/gold/if_statement_basic.json index b7af94673..f6123f410 100644 --- a/tests/gold/if_statement_basic.json +++ b/tests/gold/if_statement_basic.json @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/gold/if_statement_nested.json b/tests/gold/if_statement_nested.json index 1b1e74de6..d8639d87a 100644 --- a/tests/gold/if_statement_nested.json +++ b/tests/gold/if_statement_nested.json @@ -43,4 +43,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/gold/return_magma_named_tuple.json b/tests/gold/return_magma_named_tuple.json index b1419f121..05bfb3c87 100644 --- a/tests/gold/return_magma_named_tuple.json +++ b/tests/gold/return_magma_named_tuple.json @@ -15,4 +15,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/gold/return_magma_tuple.json b/tests/gold/return_magma_tuple.json index d1b655b9c..595a787c6 100644 --- a/tests/gold/return_magma_tuple.json +++ b/tests/gold/return_magma_tuple.json @@ -15,4 +15,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/gold/return_py_tuple.json b/tests/gold/return_py_tuple.json index 62ebf20d6..99895667d 100644 --- a/tests/gold/return_py_tuple.json +++ b/tests/gold/return_py_tuple.json @@ -16,4 +16,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/gold/simple_circuit_1.json b/tests/gold/simple_circuit_1.json index 463c6bb0a..340dafb23 100644 --- a/tests/gold/simple_circuit_1.json +++ b/tests/gold/simple_circuit_1.json @@ -74,4 +74,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/gold/ternary.json b/tests/gold/ternary.json index c338a78ee..209da6ef7 100644 --- a/tests/gold/ternary.json +++ b/tests/gold/ternary.json @@ -31,4 +31,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/gold/ternary_nested.json b/tests/gold/ternary_nested.json index 551ab91e2..28dbfa9c9 100644 --- a/tests/gold/ternary_nested.json +++ b/tests/gold/ternary_nested.json @@ -37,4 +37,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/gold/ternary_nested2.json b/tests/gold/ternary_nested2.json index 363798e5b..6f6705e4f 100644 --- a/tests/gold/ternary_nested2.json +++ b/tests/gold/ternary_nested2.json @@ -37,4 +37,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/gold/test_map_circuit.json b/tests/gold/test_map_circuit.json index 1e13d6dbe..89a5f48b1 100644 --- a/tests/gold/test_map_circuit.json +++ b/tests/gold/test_map_circuit.json @@ -95,4 +95,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_circuit/gold/test_add8cin.json b/tests/test_circuit/gold/test_add8cin.json index 3c5c941ff..e6f90da81 100644 --- a/tests/test_circuit/gold/test_add8cin.json +++ b/tests/test_circuit/gold/test_add8cin.json @@ -60,4 +60,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_circuit/gold/test_anon_value_Array(2,Bit).json b/tests/test_circuit/gold/test_anon_value_Array(2,Bit).json index aa5d82efb..430357bdd 100644 --- a/tests/test_circuit/gold/test_anon_value_Array(2,Bit).json +++ b/tests/test_circuit/gold/test_anon_value_Array(2,Bit).json @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_circuit/gold/test_anon_value_Bit.json b/tests/test_circuit/gold/test_anon_value_Bit.json index dab48b1ae..d08f37d5b 100644 --- a/tests/test_circuit/gold/test_anon_value_Bit.json +++ b/tests/test_circuit/gold/test_anon_value_Bit.json @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_circuit/gold/test_anon_value_Bits(2).json b/tests/test_circuit/gold/test_anon_value_Bits(2).json index aa5d82efb..430357bdd 100644 --- a/tests/test_circuit/gold/test_anon_value_Bits(2).json +++ b/tests/test_circuit/gold/test_anon_value_Bits(2).json @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_circuit/gold/test_anon_value_Tuple(x=Bit,y=Bit).json b/tests/test_circuit/gold/test_anon_value_Tuple(x=Bit,y=Bit).json index 5f07b93d5..a98bdada8 100644 --- a/tests/test_circuit/gold/test_anon_value_Tuple(x=Bit,y=Bit).json +++ b/tests/test_circuit/gold/test_anon_value_Tuple(x=Bit,y=Bit).json @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_circuit/gold/test_simple_def.json b/tests/test_circuit/gold/test_simple_def.json index eede176d4..ee50cf9e4 100644 --- a/tests/test_circuit/gold/test_simple_def.json +++ b/tests/test_circuit/gold/test_simple_def.json @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_circuit/gold/test_simple_def_class.json b/tests/test_circuit/gold/test_simple_def_class.json index 93e12a98b..66116731f 100644 --- a/tests/test_circuit/gold/test_simple_def_class.json +++ b/tests/test_circuit/gold/test_simple_def_class.json @@ -29,4 +29,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_coreir/gold/linker_test0.json b/tests/test_coreir/gold/linker_test0.json index 113c32b2b..6adaf5cf1 100644 --- a/tests/test_coreir/gold/linker_test0.json +++ b/tests/test_coreir/gold/linker_test0.json @@ -23,4 +23,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_coreir/gold/test_array_nesting.json b/tests/test_coreir/gold/test_array_nesting.json index 0b589d74e..70609f58a 100644 --- a/tests/test_coreir/gold/test_array_nesting.json +++ b/tests/test_coreir/gold/test_array_nesting.json @@ -22,4 +22,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_coreir/gold/test_multi_direction_tuple.json b/tests/test_coreir/gold/test_multi_direction_tuple.json index f1ec8990f..2246403de 100644 --- a/tests/test_coreir/gold/test_multi_direction_tuple.json +++ b/tests/test_coreir/gold/test_multi_direction_tuple.json @@ -13,4 +13,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_coreir/gold/test_multi_direction_tuple_instance.json b/tests/test_coreir/gold/test_multi_direction_tuple_instance.json index f20bf9a42..7fdd054e0 100644 --- a/tests/test_coreir/gold/test_multi_direction_tuple_instance.json +++ b/tests/test_coreir/gold/test_multi_direction_tuple_instance.json @@ -27,4 +27,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_coreir/gold/test_nesting.json b/tests/test_coreir/gold/test_nesting.json index 80de254c4..b6a21bb38 100644 --- a/tests/test_coreir/gold/test_nesting.json +++ b/tests/test_coreir/gold/test_nesting.json @@ -37,4 +37,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_coreir/mapParallel_test.json b/tests/test_coreir/mapParallel_test.json index bad9ab00f..94a1bdd48 100644 --- a/tests/test_coreir/mapParallel_test.json +++ b/tests/test_coreir/mapParallel_test.json @@ -51,4 +51,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_coreir/mapParallel_test_gold.json b/tests/test_coreir/mapParallel_test_gold.json index bad9ab00f..94a1bdd48 100644 --- a/tests/test_coreir/mapParallel_test_gold.json +++ b/tests/test_coreir/mapParallel_test_gold.json @@ -51,4 +51,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_type/gold/test_enum.v b/tests/test_type/gold/test_enum.v index b681b756f..b064c484d 100644 --- a/tests/test_type/gold/test_enum.v +++ b/tests/test_type/gold/test_enum.v @@ -1,7 +1,7 @@ module coreir_const #(parameter value=1, parameter width=1) ( output [width-1:0] out ); - assign out = value; + assign out = width'value; endmodule // coreir_const @@ -18,10 +18,10 @@ module enum_test ( .out(const_0_2__out) ); - assign O_1[1:0] = const_0_2__out[1:0]; - assign O_0[1:0] = I[1:0]; + assign O_1[1:0] = const_0_2__out[1:0]; + endmodule // enum_test diff --git a/tests/test_type/gold/test_enum_max_value.v b/tests/test_type/gold/test_enum_max_value.v index 9d984949b..234ddee7d 100644 --- a/tests/test_type/gold/test_enum_max_value.v +++ b/tests/test_type/gold/test_enum_max_value.v @@ -1,7 +1,7 @@ module coreir_const #(parameter value=1, parameter width=1) ( output [width-1:0] out ); - assign out = value; + assign out = width'value; endmodule // coreir_const @@ -18,10 +18,10 @@ module enum_test_max_value ( .out(const_4_3__out) ); - assign O_1[2:0] = const_4_3__out[2:0]; - assign O_0[2:0] = I[2:0]; + assign O_1[2:0] = const_4_3__out[2:0]; + endmodule // enum_test_max_value diff --git a/tests/test_type/gold/test_new_types.json b/tests/test_type/gold/test_new_types.json index 6401bbf79..bc8e35208 100644 --- a/tests/test_type/gold/test_new_types.json +++ b/tests/test_type/gold/test_new_types.json @@ -14,4 +14,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_type/gold/test_new_types.v b/tests/test_type/gold/test_new_types.v index 170ad697e..318bde5ec 100644 --- a/tests/test_type/gold/test_new_types.v +++ b/tests/test_type/gold/test_new_types.v @@ -54,14 +54,6 @@ module TestCircuit ( assign O_0_y[2:0] = I_0_y[2:0]; - assign O_10_x[2:0] = I_10_x[2:0]; - - assign O_10_y[2:0] = I_10_y[2:0]; - - assign O_11_x[2:0] = I_11_x[2:0]; - - assign O_11_y[2:0] = I_11_y[2:0]; - assign O_1_x[2:0] = I_1_x[2:0]; assign O_1_y[2:0] = I_1_y[2:0]; @@ -98,6 +90,14 @@ module TestCircuit ( assign O_9_y[2:0] = I_9_y[2:0]; + assign O_10_x[2:0] = I_10_x[2:0]; + + assign O_10_y[2:0] = I_10_y[2:0]; + + assign O_11_x[2:0] = I_11_x[2:0]; + + assign O_11_y[2:0] = I_11_y[2:0]; + endmodule // TestCircuit diff --git a/tests/test_type/test_const_wire_golden.json b/tests/test_type/test_const_wire_golden.json index 737284d49..87833a54e 100644 --- a/tests/test_type/test_const_wire_golden.json +++ b/tests/test_type/test_const_wire_golden.json @@ -28,4 +28,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_type/test_coreir_wrap_golden_AsyncReset.json b/tests/test_type/test_coreir_wrap_golden_AsyncReset.json index 72143afc7..9725656fc 100644 --- a/tests/test_type/test_coreir_wrap_golden_AsyncReset.json +++ b/tests/test_type/test_coreir_wrap_golden_AsyncReset.json @@ -33,4 +33,4 @@ } } } -} \ No newline at end of file +} diff --git a/tests/test_type/test_coreir_wrap_golden_Clock.json b/tests/test_type/test_coreir_wrap_golden_Clock.json index 71234f4eb..d90d799d6 100644 --- a/tests/test_type/test_coreir_wrap_golden_Clock.json +++ b/tests/test_type/test_coreir_wrap_golden_Clock.json @@ -33,4 +33,4 @@ } } } -} \ No newline at end of file +}