Skip to content

Commit

Permalink
fixed small bug in generic axis width converter, fixed bugs in testbe…
Browse files Browse the repository at this point in the history
…nch. axis width converter is working correctly now
  • Loading branch information
reed-foster committed Nov 27, 2023
1 parent c4aad76 commit 16aa889
Show file tree
Hide file tree
Showing 4 changed files with 294 additions and 85 deletions.
248 changes: 223 additions & 25 deletions axis_width_converter_test_behav.wcfg
Original file line number Diff line number Diff line change
Expand Up @@ -11,15 +11,15 @@
</db_ref>
</db_ref_list>
<zoom_setting>
<ZoomStartTime time="0.000000 us"></ZoomStartTime>
<ZoomEndTime time="1,420.000001 us"></ZoomEndTime>
<Cursor1Time time="100.000000 us"></Cursor1Time>
<ZoomStartTime time="8,669.000 ns"></ZoomStartTime>
<ZoomEndTime time="10,212.001 ns"></ZoomEndTime>
<Cursor1Time time="8,827.000 ns"></Cursor1Time>
</zoom_setting>
<column_width_setting>
<NameColumnWidth column_width="208"></NameColumnWidth>
<ValueColumnWidth column_width="88"></ValueColumnWidth>
<NameColumnWidth column_width="219"></NameColumnWidth>
<ValueColumnWidth column_width="106"></ValueColumnWidth>
</column_width_setting>
<WVObjectSize size="7" />
<WVObjectSize size="14" />
<wvobject type="group" fp_name="group682">
<obj_property name="label">test</obj_property>
<obj_property name="DisplayName">label</obj_property>
Expand All @@ -32,23 +32,11 @@
<obj_property name="ElementShortName">clk</obj_property>
<obj_property name="ObjectShortName">clk</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/downsizer_readout_mode">
<obj_property name="ElementShortName">downsizer_readout_mode[1:0]</obj_property>
<obj_property name="ObjectShortName">downsizer_readout_mode[1:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/upsizer_readout_mode">
<obj_property name="ElementShortName">upsizer_readout_mode[1:0]</obj_property>
<obj_property name="ObjectShortName">upsizer_readout_mode[1:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/rec_count">
<obj_property name="ElementShortName">rec_count[31:0]</obj_property>
<obj_property name="ObjectShortName">rec_count[31:0]</obj_property>
<obj_property name="Radix">SIGNEDDECRADIX</obj_property>
</wvobject>
</wvobject>
<wvobject type="group" fp_name="group689">
<obj_property name="label">downsizer_in</obj_property>
<obj_property name="DisplayName">label</obj_property>
<obj_property name="isExpanded"></obj_property>
<wvobject type="array" fp_name="/axis_width_converter_test/downsizer_in/data">
<obj_property name="ElementShortName">data[255:0]</obj_property>
<obj_property name="ObjectShortName">data[255:0]</obj_property>
Expand All @@ -74,8 +62,8 @@
<obj_property name="label">downsizer_out</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject type="array" fp_name="/axis_width_converter_test/downsizer_out/data">
<obj_property name="ElementShortName">data[127:0]</obj_property>
<obj_property name="ObjectShortName">data[127:0]</obj_property>
<obj_property name="ElementShortName">data[63:0]</obj_property>
<obj_property name="ObjectShortName">data[63:0]</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/downsizer_out/ready">
<obj_property name="ElementShortName">ready</obj_property>
Expand Down Expand Up @@ -106,8 +94,8 @@
<obj_property name="ObjectShortName">reset</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/downsize_dut_i/data_reg">
<obj_property name="ElementShortName">data_reg[1:0][127:0]</obj_property>
<obj_property name="ObjectShortName">data_reg[1:0][127:0]</obj_property>
<obj_property name="ElementShortName">data_reg[3:0][63:0]</obj_property>
<obj_property name="ObjectShortName">data_reg[3:0][63:0]</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/downsize_dut_i/valid_reg">
<obj_property name="ElementShortName">valid_reg</obj_property>
Expand All @@ -118,8 +106,8 @@
<obj_property name="ObjectShortName">last_reg</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/downsize_dut_i/counter">
<obj_property name="ElementShortName">counter[0:0]</obj_property>
<obj_property name="ObjectShortName">counter[0:0]</obj_property>
<obj_property name="ElementShortName">counter[1:0]</obj_property>
<obj_property name="ObjectShortName">counter[1:0]</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/downsize_dut_i/read_final">
<obj_property name="ElementShortName">read_final</obj_property>
Expand All @@ -133,6 +121,7 @@
<wvobject type="group" fp_name="group689">
<obj_property name="label">upsizer_in</obj_property>
<obj_property name="DisplayName">label</obj_property>
<obj_property name="isExpanded"></obj_property>
<wvobject type="array" fp_name="/axis_width_converter_test/upsizer_in/data">
<obj_property name="ElementShortName">data[15:0]</obj_property>
<obj_property name="ObjectShortName">data[15:0]</obj_property>
Expand All @@ -157,6 +146,7 @@
<wvobject type="group" fp_name="group696">
<obj_property name="label">upsizer_out</obj_property>
<obj_property name="DisplayName">label</obj_property>
<obj_property name="isExpanded"></obj_property>
<wvobject type="array" fp_name="/axis_width_converter_test/upsizer_out/data">
<obj_property name="ElementShortName">data[127:0]</obj_property>
<obj_property name="ObjectShortName">data[127:0]</obj_property>
Expand Down Expand Up @@ -199,4 +189,212 @@
<obj_property name="ObjectShortName">counter[2:0]</obj_property>
</wvobject>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/sent_word">
<obj_property name="ElementShortName">sent_word[63:0]</obj_property>
<obj_property name="ObjectShortName">sent_word[63:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/received_word">
<obj_property name="ElementShortName">received_word[63:0]</obj_property>
<obj_property name="ObjectShortName">received_word[63:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/data">
<obj_property name="ElementShortName">data[1:0][2:0][255:0]</obj_property>
<obj_property name="ObjectShortName">data[1:0][2:0][255:0]</obj_property>
<wvobject type="array" fp_name="/axis_width_converter_test/data[1]">
<obj_property name="ElementShortName">[1][2:0][255:0]</obj_property>
<obj_property name="ObjectShortName">[1][2:0][255:0]</obj_property>
<obj_property name="isExpanded"></obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/data[0]">
<obj_property name="ElementShortName">[0][2:0][255:0]</obj_property>
<obj_property name="ObjectShortName">[0][2:0][255:0]</obj_property>
<obj_property name="isExpanded"></obj_property>
</wvobject>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/DWIDTH">
<obj_property name="ElementShortName">DWIDTH[31:0]</obj_property>
<obj_property name="ObjectShortName">DWIDTH[31:0]</obj_property>
<obj_property name="Radix">UNSIGNEDDECRADIX</obj_property>
</wvobject>
<wvobject type="group" fp_name="group1038">
<obj_property name="label">comb_in</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_in/data">
<obj_property name="ElementShortName">data[191:0]</obj_property>
<obj_property name="ObjectShortName">data[191:0]</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_in/ready">
<obj_property name="ElementShortName">ready</obj_property>
<obj_property name="ObjectShortName">ready</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_in/valid">
<obj_property name="ElementShortName">valid</obj_property>
<obj_property name="ObjectShortName">valid</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_in/last">
<obj_property name="ElementShortName">last</obj_property>
<obj_property name="ObjectShortName">last</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_in/ok">
<obj_property name="ElementShortName">ok</obj_property>
<obj_property name="ObjectShortName">ok</obj_property>
</wvobject>
</wvobject>
<wvobject type="group" fp_name="group1045">
<obj_property name="label">comb_out</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_out/data">
<obj_property name="ElementShortName">data[255:0]</obj_property>
<obj_property name="ObjectShortName">data[255:0]</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_out/ready">
<obj_property name="ElementShortName">ready</obj_property>
<obj_property name="ObjectShortName">ready</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_out/valid">
<obj_property name="ElementShortName">valid</obj_property>
<obj_property name="ObjectShortName">valid</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_out/last">
<obj_property name="ElementShortName">last</obj_property>
<obj_property name="ObjectShortName">last</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_out/ok">
<obj_property name="ElementShortName">ok</obj_property>
<obj_property name="ObjectShortName">ok</obj_property>
</wvobject>
</wvobject>
<wvobject type="group" fp_name="group1052">
<obj_property name="label">comb_dut</obj_property>
<obj_property name="DisplayName">label</obj_property>
<obj_property name="isExpanded"></obj_property>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/clk">
<obj_property name="ElementShortName">clk</obj_property>
<obj_property name="ObjectShortName">clk</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/reset">
<obj_property name="ElementShortName">reset</obj_property>
<obj_property name="ObjectShortName">reset</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/DWIDTH_IN">
<obj_property name="ElementShortName">DWIDTH_IN[31:0]</obj_property>
<obj_property name="ObjectShortName">DWIDTH_IN[31:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/UP">
<obj_property name="ElementShortName">UP[31:0]</obj_property>
<obj_property name="ObjectShortName">UP[31:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/DOWN">
<obj_property name="ElementShortName">DOWN[31:0]</obj_property>
<obj_property name="ObjectShortName">DOWN[31:0]</obj_property>
</wvobject>
<wvobject type="group" fp_name="group1058">
<obj_property name="label">comb_dut_up</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/up_i/clk">
<obj_property name="ElementShortName">clk</obj_property>
<obj_property name="ObjectShortName">clk</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/up_i/reset">
<obj_property name="ElementShortName">reset</obj_property>
<obj_property name="ObjectShortName">reset</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/up_i/data_reg">
<obj_property name="ElementShortName">data_reg[3:0][191:0]</obj_property>
<obj_property name="ObjectShortName">data_reg[3:0][191:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/up_i/counter">
<obj_property name="ElementShortName">counter[1:0]</obj_property>
<obj_property name="ObjectShortName">counter[1:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/up_i/DWIDTH">
<obj_property name="ElementShortName">DWIDTH[31:0]</obj_property>
<obj_property name="ObjectShortName">DWIDTH[31:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/up_i/UP">
<obj_property name="ElementShortName">UP[31:0]</obj_property>
<obj_property name="ObjectShortName">UP[31:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/up_i/DWIDTH_OUT">
<obj_property name="ElementShortName">DWIDTH_OUT[31:0]</obj_property>
<obj_property name="ObjectShortName">DWIDTH_OUT[31:0]</obj_property>
</wvobject>
</wvobject>
<wvobject type="group" fp_name="group1073">
<obj_property name="label">comb_dut_down</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/down_i/clk">
<obj_property name="ElementShortName">clk</obj_property>
<obj_property name="ObjectShortName">clk</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/down_i/reset">
<obj_property name="ElementShortName">reset</obj_property>
<obj_property name="ObjectShortName">reset</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/down_i/data_reg">
<obj_property name="ElementShortName">data_reg[2:0][63:0]</obj_property>
<obj_property name="ObjectShortName">data_reg[2:0][63:0]</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/down_i/valid_reg">
<obj_property name="ElementShortName">valid_reg</obj_property>
<obj_property name="ObjectShortName">valid_reg</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/down_i/last_reg">
<obj_property name="ElementShortName">last_reg</obj_property>
<obj_property name="ObjectShortName">last_reg</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/down_i/counter">
<obj_property name="ElementShortName">counter[1:0]</obj_property>
<obj_property name="ObjectShortName">counter[1:0]</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/down_i/read_final">
<obj_property name="ElementShortName">read_final</obj_property>
<obj_property name="ObjectShortName">read_final</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/down_i/rollover">
<obj_property name="ElementShortName">rollover</obj_property>
<obj_property name="ObjectShortName">rollover</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/down_i/DWIDTH">
<obj_property name="ElementShortName">DWIDTH[31:0]</obj_property>
<obj_property name="ObjectShortName">DWIDTH[31:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/down_i/DOWN">
<obj_property name="ElementShortName">DOWN[31:0]</obj_property>
<obj_property name="ObjectShortName">DOWN[31:0]</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/down_i/DWIDTH_OUT">
<obj_property name="ElementShortName">DWIDTH_OUT[31:0]</obj_property>
<obj_property name="ObjectShortName">DWIDTH_OUT[31:0]</obj_property>
</wvobject>
</wvobject>
<wvobject type="group" fp_name="group1085">
<obj_property name="label">comb_dut_up_out</obj_property>
<obj_property name="DisplayName">label</obj_property>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/data/data">
<obj_property name="ElementShortName">data[767:0]</obj_property>
<obj_property name="ObjectShortName">data[767:0]</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/data/ready">
<obj_property name="ElementShortName">ready</obj_property>
<obj_property name="ObjectShortName">ready</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/data/valid">
<obj_property name="ElementShortName">valid</obj_property>
<obj_property name="ObjectShortName">valid</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/data/last">
<obj_property name="ElementShortName">last</obj_property>
<obj_property name="ObjectShortName">last</obj_property>
</wvobject>
<wvobject type="logic" fp_name="/axis_width_converter_test/comb_dut_i/data/ok">
<obj_property name="ElementShortName">ok</obj_property>
<obj_property name="ObjectShortName">ok</obj_property>
</wvobject>
<wvobject type="array" fp_name="/axis_width_converter_test/comb_dut_i/data/DWIDTH">
<obj_property name="ElementShortName">DWIDTH[31:0]</obj_property>
<obj_property name="ObjectShortName">DWIDTH[31:0]</obj_property>
</wvobject>
</wvobject>
</wvobject>
</wave_config>
Loading

0 comments on commit 16aa889

Please sign in to comment.