small cleanup: gather common functions and remove unused module

marph91 · Mar 21, 2021 · 18c9361 · 18c9361
1 parent 03f57ca
commit 18c9361
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 128 deletions.
diff --git a/src/util/adder_tree.vhd b/src/util/adder_tree.vhd
@@ -3,6 +3,9 @@ library ieee;
  use ieee.numeric_std.all;
  use ieee.math_real.all;
 
+library util;
+ use util.array_pkg.all;
+
 entity adder_tree is
  generic (
  C_INPUT_COUNT : integer := 4;
@@ -50,8 +53,7 @@ architecture rtl of adder_tree is
 
  for i in 0 to C_INPUT_COUNT - 1 loop
 
- -- TODO: use get_slice
- v_input_datum := input_vector((i + 1) * C_INPUT_BITWIDTH - 1 downto i * C_INPUT_BITWIDTH);
+ v_input_datum := get_slice(input_vector, i, C_INPUT_BITWIDTH);
 
  if (C_UNSIGNED = 1) then
  -- Pad a zero (sign) bit in case of unsigned input.

diff --git a/src/util/array_pkg.vhd b/src/util/array_pkg.vhd
@@ -22,6 +22,10 @@ package array_pkg is
 
  function array_to_slv (array_in : t_kernel_array) return std_logic_vector;
 
+ function get_slice (vector: std_logic_vector; int_byte_index : natural; int_slice_size : natural) return std_logic_vector;
+
+ function get_fastest_increment (vector: std_logic_vector; int_index : natural; int_slice_size : natural) return std_logic_vector;
+
 end package array_pkg;
 
 package body array_pkg is
@@ -51,4 +55,18 @@ package body array_pkg is
  return slv_out;
  end function;
 
+ function get_slice (vector: std_logic_vector; int_byte_index : natural; int_slice_size : natural) return std_logic_vector is
+ begin
+ return vector((int_byte_index + 1) * int_slice_size - 1 downto int_byte_index * int_slice_size);
+ end function;
+
+ function get_fastest_increment (vector: std_logic_vector; int_index : natural; int_slice_size : natural) return std_logic_vector is
+ variable vector_out : std_logic_vector(vector'length / int_slice_size - 1 downto 0);
+ begin
+ for i in 0 to vector'length / int_slice_size - 1 loop
+ vector_out(i) := vector(int_index + i * int_slice_size);
+ end loop;
+ return vector_out;
+ end function;
+
 end package body array_pkg;
diff --git a/src/util/output_buffer.vhd b/src/util/output_buffer.vhd
diff --git a/src/util/serializer.vhd b/src/util/serializer.vhd
@@ -1,6 +1,9 @@
 library ieee;
  use ieee.std_logic_1164.all;
 
+library util;
+ use util.array_pkg.all;
+
 entity serializer is
  generic (
  C_DATA_COUNT : integer := 4;
@@ -23,11 +26,6 @@ architecture rtl of serializer is
 
  signal int_output_valid_cycles : integer range 0 to C_DATA_COUNT;
 
- function get_slice (vector: std_logic_vector; int_byte_index : natural; int_slice_size : natural) return std_logic_vector is
- begin
- return vector((int_byte_index + 1) * int_slice_size - 1 downto int_byte_index * int_slice_size);
- end function;
-
 begin
 
  proc_serializer : process (isl_clk) is

diff --git a/src/window_convolution_activation.vhd b/src/window_convolution_activation.vhd
@@ -6,6 +6,7 @@ library ieee;
 library cnn_lib;
 
 library util;
+ use util.array_pkg.all;
  use util.math_pkg.all;
 
 library window_ctrl_lib;
@@ -58,20 +59,6 @@ architecture behavioral of window_convolution_activation is
  signal a_weights : t_slv_array_1d(0 to C_OUTPUT_CHANNEL - 1)(C_KERNEL_SIZE * C_KERNEL_SIZE * C_INPUT_CHANNEL - 1 downto 0);
  signal a_threshold : t_slv_array_1d(0 to C_OUTPUT_CHANNEL - 1)(C_POST_CONVOLUTION_BITWIDTH - 1 downto 0);
 
- function get_slice (vector: std_logic_vector; int_byte_index : natural; int_slice_size : natural) return std_logic_vector is
- begin
- return vector((int_byte_index + 1) * int_slice_size - 1 downto int_byte_index * int_slice_size);
- end function;
-
- function get_fastest_increment (vector: std_logic_vector; int_index : natural; int_slice_size : natural) return std_logic_vector is
- variable vector_out : std_logic_vector(vector'length / int_slice_size - 1 downto 0);
- begin
- for i in 0 to vector'length / int_slice_size - 1 loop
- vector_out(i) := vector(int_index + i * int_slice_size);
- end loop;
- return vector_out;
- end function;
-
 begin
 
  i_window_ctrl : entity window_ctrl_lib.window_ctrl