OpenCores
URL https://opencores.org/ocsvn/yahamm/yahamm/trunk

Subversion Repositories yahamm

Compare Revisions

  • This comparison shows the changes necessary to convert path 
    /yahamm
    from Rev 2 to Rev 3
    ↔ Reverse comparison
  •

Rev 2 → Rev 3

/trunk/matrix_pkg.vhd
0,0 → 1,197
library ieee;
use ieee.std_logic_1164.all;
 
use std.textio.all;
 
library ieee_proposed;
use ieee_proposed.std_logic_1164_additions.all;
use ieee_proposed.standard_additions.all;
-- pragma synthesis_off
use ieee_proposed.standard_textio_additions.all;
-- pragma synthesis_on
 
package matrix_pkg is
 
-----------------------------------------------------------------------------
-- Here 2D arrays are used to implement matrices. There are various
-- limitations to the use of 2D arrays (e.g. limited easy slicing)
-- that would maybe suggest an implementation with 1Dx1D matrices.
-- But anyway this would make easy slicing either rows or columns
-- but not both. The approach used here is implementing functions
-- to handle various matrix operations. Having a 2D type allows to
-- use one type definition for any matrix.
-----------------------------------------------------------------------------
 
type matrix_t is array (integer range <>, integer range<>) of bit;
 
function get_row (
constant matrix : matrix_t;
constant row : natural)
return bit_vector;
 
function get_col (
constant matrix : matrix_t;
constant col : natural)
return bit_vector;
 
procedure set_col (
variable M : inout matrix_t;
constant icol : natural;
constant col : in bit_vector);
 
-- pragma synthesis_off
procedure pretty_print_matrix (
constant matrix : in matrix_t);
 
procedure pretty_print_vector (
constant vin : in bit_vector);
-- pragma synthesis_on
 
function find_col (
constant M : matrix_t;
constant col : bit_vector)
return natural;
 
procedure swap_cols (
variable M : inout matrix_t;
constant icol1, icol2 : in natural);
 
end package matrix_pkg;
 
package body matrix_pkg is
 
-- purpose: Return matrix M with columns at positions col1 and col2
-- swapped.
procedure swap_cols (
variable M : inout matrix_t;
constant icol1, icol2 : in natural) is
variable col1, col2 : bit_vector(M'range(1));
variable Mout : matrix_t(M'range(1), M'range(2));
begin
col1 := get_col(M, icol1);
col2 := get_col(M, icol2);
set_col(M, icol1, col2);
set_col(M, icol2, col1);
end procedure swap_cols;
-- purpose: Return the matrix row.
function get_row (
constant matrix : matrix_t;
constant row : natural)
return bit_vector is
variable y : bit_vector(matrix'range(2));
begin -- function get_row
 
for col in matrix'range(2) loop
y(col) := matrix(row, col);
end loop; -- irow
 
return y;
end function get_row;
 
-- purpose: Return the matrix col.
function get_col (
constant matrix : matrix_t;
constant col : natural)
return bit_vector is
variable y : bit_vector(matrix'range(1));
begin -- function get_col
 
for row in matrix'range(1) loop
y(row) := matrix(row, col);
end loop; -- irow
 
return y;
end function get_col;
 
-- purpose: Set the matrix column icol to col.
procedure set_col (
variable M : inout matrix_t;
constant icol : natural;
constant col : bit_vector) is
begin -- function get_col
for row in M'range(1) loop
M(row, icol) := col(row);
end loop; -- irow
 
end procedure set_col;
 
-- pragma synthesis_off
-- purpose: Print out matrix for debugging.
procedure pretty_print_matrix (
constant matrix : in matrix_t) is
variable l : line;
 
begin -- procedure pretty_print_matrix
 
for row in matrix'range(1) loop
 
for col in matrix'range(2) loop
write(l, matrix(row, col));
swrite(l, " ");
end loop; -- col
 
writeline(output, l);
end loop; -- row
 
writeline(output, l); -- blank line
 
end procedure pretty_print_matrix;
 
-- purpose: Print out vector for debugging.
procedure pretty_print_vector (
constant vin : in bit_vector) is
variable l : line;
 
begin -- procedure pretty_print_matrix
 
swrite(l, integer'image(vin'left));
swrite(l, " to/downto ");
swrite(l, integer'image(vin'right));
swrite(l, ": ");
for i in vin'range loop
write(l, vin(i));
swrite(l, " ");
end loop; -- i
 
writeline(output, l);
writeline(output, l); -- blank line
 
end procedure pretty_print_vector;
 
-- pragma synthesis_on
-- purpose: Return the position of col in M or -1 if not found.
function find_col (
constant M : matrix_t; -- Any matrix
constant col : bit_vector) -- The column to find
return integer is
variable match : boolean;
begin -- function find_col
for icol in M'range(2) loop
match := true;
for j in col'range loop
if col(j) /= M(j, icol) then
match := false;
end if;
end loop;
 
if match then
return icol;
end if;
end loop;
 
-- not found
return -1;
end function find_col;
end package body matrix_pkg;
/trunk/yahamm_pkg.vhd
3,9 → 3,9
use ieee.math_real.all;
use ieee.numeric_std.all;
 
library ieee_proposed;
use ieee_proposed.standard_additions.all;
use ieee_proposed.std_logic_1164_additions.all;
--library ieee_proposed;
--use ieee_proposed.standard_additions.all;
--use ieee_proposed.std_logic_1164_additions.all;
 
library yahamm;
use yahamm.matrix_pkg.all;

powered by: WebSVN 2.1.0

© copyright 1999-2024 OpenCores.org, equivalent to Oliscience, all rights reserved. OpenCores®, registered trademark.