Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compile ac_math with clang #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Compile ac_math with clang #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4a8306e
Compilation fixes for clang
nkkav Mar 12, 2021
7a03e05
pragma unroll -> hls_unroll for clang compatibility
nkkav Mar 12, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 8 additions & 8 deletions include/ac_math/ac_determinant.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -214,14 +214,14 @@ namespace ac_math

temp_type temp;
// PIVOT loop to keep track of pivot (element about which minor is to be computed)
#pragma unroll yes
#pragma hls_unroll yes
PIVOT:
for (unsigned j=0; j<M; j++) {
// ROW and COLUMN loop to create matrices
#pragma unroll yes
#pragma hls_unroll yes
ROW:
for (unsigned p=1; p<M; p++) {
#pragma unroll yes
#pragma hls_unroll yes
COLUMN:
for (unsigned q=1; q<M; q++) {
b(p-1, q-1) = A(p, q-(q<=j));
Expand All @@ -234,7 +234,7 @@ namespace ac_math
c[j] = pr * temp;
}
// Accumulate loop for accumulation after multiplication with pivot
#pragma unroll yes
#pragma hls_unroll yes
ACCUMULATE:
for (unsigned j=0; j<M; j++) {
d = d + A(0,j) * c[j];
Expand Down Expand Up @@ -411,10 +411,10 @@ namespace ac_math
{
ac_matrix < ac_fixed <W1, I1, S1, q1, o1>, M, M > a_temp;

#pragma unroll yes
#pragma hls_unroll yes
ROW_CPY:
for (unsigned i = 0; i < M; i++) {
#pragma unroll yes
#pragma hls_unroll yes
COLUMN_CPY:
for (unsigned j = 0; j < M; j++) {
a_temp (i,j) = a[i][j];
Expand All @@ -427,10 +427,10 @@ namespace ac_math
void ac_determinant (const ac_complex <ac_fixed <W1, I1, S1, q1, o1> > a[M][M], ac_complex <ac_fixed <W2, I2, true, q2, o2> > &result)
{
ac_matrix < ac_complex <ac_fixed <W1, I1, S1, q1, o1> >, M, M > a_temp;
#pragma unroll yes
#pragma hls_unroll yes
ROW_CPY:
for (unsigned i = 0; i < M; i++) {
#pragma unroll yes
#pragma hls_unroll yes
COLUMN_CPY:
for (unsigned j = 0; j < M; j++) {
a_temp (i,j) = a[i][j];
Expand Down
2 changes: 1 addition & 1 deletion include/ac_math/ac_pow_pwl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ namespace ac_math
{
const ac_fixed<17, 3, true> log2e = 1.44269504089;
// Find type of intermediate variable used to store output of x*log2(e)
typedef class comp_pii_exp<W, I, S, Q, O, n_f_b>::pit_t input_inter_type;
typedef typename comp_pii_exp<W, I, S, Q, O, n_f_b>::pit_t input_inter_type;
input_inter_type input_inter;
// e^x = 2^(x*log2(e))
input_inter = input*log2e;
Expand Down
4 changes: 2 additions & 2 deletions include/ac_math/ac_sqrt_pwl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -457,14 +457,14 @@ namespace ac_math
void ac_sqrt_pwl (const ac_complex <ac_fixed <W, I, true, Q, O> > input, ac_complex <ac_fixed <outW, outI, true, outQ, outO> > &output)
{
// Calculate parameterized bitwidths for all intermediate types.
typedef class find_rt_sqrt_pwl<(2*(W - I)), (2*I - 1)>::rt_sqrt_pwl sqrt_mod_type;
typedef typename find_rt_sqrt_pwl<(2*(W - I)), (2*I - 1)>::rt_sqrt_pwl sqrt_mod_type;
const int W1 = sqrt_mod_type::width;
const int I1 = sqrt_mod_type::i_width;
const int n_f_b_1 = W1 - I1;
const int t_I = I + 1;
const int t_n_f_b = (W - I) > n_f_b_1 ? W - I : n_f_b_1;
const int t_W = t_I + t_n_f_b;
typedef class find_rt_sqrt_pwl<t_W, t_I - 1>::rt_sqrt_pwl x_y_type;
typedef typename find_rt_sqrt_pwl<t_W, t_I - 1>::rt_sqrt_pwl x_y_type;
const int W2 = x_y_type::width;
const int I2 = x_y_type::i_width;

Expand Down