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

rtest_ac_normalize.cpp: Fix calculation of effective range for fixed and complex #8

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

rtest_ac_normalize.cpp: Fix calculation of effective range for fixed and complex #8

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
669b9d3
rtest_ac_normalize.cpp: Avoid UB in accessing the variable
nkkav Apr 16, 2021
0712eef
rtest_ac_normalize.cpp: Fix calculation of accepted range for fixed
nkkav Apr 16, 2021
02bb98e
rtest_ac_normalize.cpp: Fix calculating effective range for complex
nkkav Apr 16, 2021
f8294a1
rtest_ac_normalize.cpp: Remove unused variable
nkkav Apr 20, 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
11 changes: 7 additions & 4 deletions tests/rtest_ac_normalize.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ int test_driver_fixed(
}

bool incorrect = false;
int nocalls, expret_fixed, expret_complex;
int expret_fixed, expret_complex;

// test fixed-point real and complex.

Expand All @@ -121,20 +121,23 @@ int test_driver_fixed(
cmplx_input_fixed.r() = i;
cmplx_input_fixed.i() = j;
test_ac_normalize(input_fixed, output_fixed, cmplx_input_fixed, cmplx_output_fixed, expret_fixed, expret_complex);
nocalls++;

// This flag is set to false if the real output is incorrect
bool incorrect_fixed = (output_fixed.to_double() * pow(2, (double)expret_fixed) != input_fixed);
// Make sure that the range of the normalized output is as expected.
incorrect_fixed = incorrect_fixed || ((output_fixed > -0.5) && (output_fixed < 0.5)) || ((output_fixed >= 1) && (output_fixed < -1));
// Expected range is: [-1.0, -0.5] U [0.5, 1.0]
bool in_range = ((output_fixed >= -1) && (output_fixed <= -0.5)) || ((output_fixed >= 0.5) && (output_fixed <= 1));
incorrect_fixed = incorrect_fixed || !in_range;
// Inputs and outputs being zero is a special case, and the range-checking above will produce a false negative in such a case. This is taken care of below.
if (output_fixed == 0 && input_fixed == 0) {incorrect_fixed = false;}

// This flag is set to false if the complex output is incorrect
bool incorrect_complex = ((cmplx_output_fixed.r().to_double()*pow(2, (double)expret_complex) != cmplx_input_fixed.r().to_double()) || (cmplx_output_fixed.i().to_double()*pow(2, (double)expret_complex) != cmplx_input_fixed.i().to_double()));
// Make sure that the range of the normalized output is as expected.
incorrect_complex = incorrect_complex || ((cmplx_output_fixed.r() > -0.5) && (cmplx_output_fixed.r() < 0.5) && (cmplx_output_fixed.i() > -0.5) && (cmplx_output_fixed.i() < 0.5));
incorrect_complex = incorrect_complex || (cmplx_output_fixed.r() >= 1) || (cmplx_output_fixed.r() < -1) || (cmplx_output_fixed.i() >= 1) && (cmplx_output_fixed.i() < -1);
// Expected range is: [-1.0, +1.0]
in_range = ((cmplx_output_fixed.r() >= -1) && (cmplx_output_fixed.r() <= 1)) || ((cmplx_output_fixed.i() >= -1) && (cmplx_output_fixed.i() <= 1));
incorrect_complex = incorrect_complex || !in_range;
// Inputs and outputs being zero is a special case, and the range-checking above will produce a false negative in such a case. This is taken care of below.
if (cmplx_output_fixed.r() == 0 && cmplx_output_fixed.i() == 0 && cmplx_input_fixed.r() == 0 && cmplx_input_fixed.i() == 0) {incorrect_complex = false;}

Expand Down