Skip to content

Commit

Permalink
Merge pull request gnuradio#677 from argilo/qa-utils-fixes
Browse files Browse the repository at this point in the history 
Generate random integers with uniform_int_distribution
  • Loading branch information
@jdemel
jdemel authored Nov 4, 2023
2 parents 60fe2bc + 9bca923 commit 9ffe46e
Showing 1 changed file with 74 additions and 59 deletions.
133 changes: 74 additions & 59 deletions lib/qa_utils.cc
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,44 +51,69 @@ void load_random_data(void* data, volk_type_t type, unsigned int n)
random_floats<float>(data, n, rnd_engine);
}
} else {
float int_max = float(uint64_t(2) << (type.size * 8));
if (type.is_signed)
int_max /= 2.0;
std::uniform_real_distribution<float> uniform_dist(-int_max, int_max);
for (unsigned int i = 0; i < n; i++) {
float scaled_rand = uniform_dist(rnd_engine);
// man i really don't know how to do this in a more clever way, you have to
// cast down at some point
switch (type.size) {
case 8:
if (type.is_signed)
((int64_t*)data)[i] = (int64_t)scaled_rand;
else
((uint64_t*)data)[i] = (uint64_t)scaled_rand;
break;
case 4:
if (type.is_signed)
((int32_t*)data)[i] = (int32_t)scaled_rand;
else
((uint32_t*)data)[i] = (uint32_t)scaled_rand;
break;
case 2:
if (type.is_signed)
((int16_t*)data)[i] = (int16_t)((int16_t)scaled_rand % 8);
else
((uint16_t*)data)[i] = (uint16_t)((int16_t)scaled_rand % 8);
break;
case 1:
if (type.is_signed)
((int8_t*)data)[i] = (int8_t)scaled_rand;
else
((uint8_t*)data)[i] = (uint8_t)scaled_rand;
break;
default:
throw "load_random_data: no support for data size > 8 or < 1"; // no
// shenanigans
// here
switch (type.size) {
case 8:
if (type.is_signed) {
std::uniform_int_distribution<int64_t> uniform_dist(
std::numeric_limits<int64_t>::min(),
std::numeric_limits<int64_t>::max());
for (unsigned int i = 0; i < n; i++)
((int64_t*)data)[i] = uniform_dist(rnd_engine);
} else {
std::uniform_int_distribution<uint64_t> uniform_dist(
std::numeric_limits<uint64_t>::min(),
std::numeric_limits<uint64_t>::max());
for (unsigned int i = 0; i < n; i++)
((uint64_t*)data)[i] = uniform_dist(rnd_engine);
}
break;
case 4:
if (type.is_signed) {
std::uniform_int_distribution<int32_t> uniform_dist(
std::numeric_limits<int32_t>::min(),
std::numeric_limits<int32_t>::max());
for (unsigned int i = 0; i < n; i++)
((int32_t*)data)[i] = uniform_dist(rnd_engine);
} else {
std::uniform_int_distribution<uint32_t> uniform_dist(
std::numeric_limits<uint32_t>::min(),
std::numeric_limits<uint32_t>::max());
for (unsigned int i = 0; i < n; i++)
((uint32_t*)data)[i] = uniform_dist(rnd_engine);
}
break;
case 2:
if (type.is_signed) {
std::uniform_int_distribution<int16_t> uniform_dist(-7, 7);
for (unsigned int i = 0; i < n; i++)
((int16_t*)data)[i] = uniform_dist(rnd_engine);
} else {
std::uniform_int_distribution<uint16_t> uniform_dist(
std::numeric_limits<uint16_t>::min(),
std::numeric_limits<uint16_t>::max());
for (unsigned int i = 0; i < n; i++)
((uint16_t*)data)[i] = uniform_dist(rnd_engine);
}
break;
case 1:
if (type.is_signed) {
std::uniform_int_distribution<int16_t> uniform_dist(
std::numeric_limits<int8_t>::min(),
std::numeric_limits<int8_t>::max());
for (unsigned int i = 0; i < n; i++)
((int8_t*)data)[i] = uniform_dist(rnd_engine);
} else {
std::uniform_int_distribution<uint16_t> uniform_dist(
std::numeric_limits<uint8_t>::min(),
std::numeric_limits<uint8_t>::max());
for (unsigned int i = 0; i < n; i++)
((uint8_t*)data)[i] = uniform_dist(rnd_engine);
}
break;
default:
throw "load_random_data: no support for data size > 8 or < 1"; // no
// shenanigans
// here
}
}
}
Expand Down Expand Up @@ -460,7 +485,7 @@ bool ccompare(t* in1, t* in2, unsigned int vlen, float tol, bool absolute_mode)
}

template <class t>
bool icompare(t* in1, t* in2, unsigned int vlen, unsigned int tol, bool absolute_mode)
bool icompare(t* in1, t* in2, unsigned int vlen, unsigned int tol)
{
bool fail = false;
int print_max_errs = 10;
Expand Down Expand Up @@ -548,7 +573,7 @@ bool run_volk_tests(volk_func_desc_t desc,
vlen = vlen + vlen_twiddle;

const float tol_f = tol;
const unsigned int tol_i = static_cast<const unsigned int>(tol);
const unsigned int tol_i = static_cast<unsigned int>(tol);

// first let's get a list of available architectures for the test
std::vector<std::string> arch_list = get_arch_list(desc);
Expand Down Expand Up @@ -774,14 +799,12 @@ bool run_volk_tests(volk_func_desc_t desc,
fail = icompare((int64_t*)test_data[generic_offset][j],
(int64_t*)test_data[i][j],
vlen * (both_sigs[j].is_complex ? 2 : 1),
tol_i,
absolute_mode);
tol_i);
} else {
fail = icompare((uint64_t*)test_data[generic_offset][j],
(uint64_t*)test_data[i][j],
vlen * (both_sigs[j].is_complex ? 2 : 1),
tol_i,
absolute_mode);
tol_i);
}
break;
case 4:
Expand All @@ -790,28 +813,24 @@ bool run_volk_tests(volk_func_desc_t desc,
fail = icompare((int16_t*)test_data[generic_offset][j],
(int16_t*)test_data[i][j],
vlen * (both_sigs[j].is_complex ? 2 : 1),
tol_i,
absolute_mode);
tol_i);
} else {
fail = icompare((uint16_t*)test_data[generic_offset][j],
(uint16_t*)test_data[i][j],
vlen * (both_sigs[j].is_complex ? 2 : 1),
tol_i,
absolute_mode);
tol_i);
}
} else {
if (both_sigs[j].is_signed) {
fail = icompare((int32_t*)test_data[generic_offset][j],
(int32_t*)test_data[i][j],
vlen * (both_sigs[j].is_complex ? 2 : 1),
tol_i,
absolute_mode);
tol_i);
} else {
fail = icompare((uint32_t*)test_data[generic_offset][j],
(uint32_t*)test_data[i][j],
vlen * (both_sigs[j].is_complex ? 2 : 1),
tol_i,
absolute_mode);
tol_i);
}
}
break;
Expand All @@ -820,29 +839,25 @@ bool run_volk_tests(volk_func_desc_t desc,
fail = icompare((int16_t*)test_data[generic_offset][j],
(int16_t*)test_data[i][j],
vlen * (both_sigs[j].is_complex ? 2 : 1),
tol_i,
absolute_mode);
tol_i);
} else {
fail = icompare((uint16_t*)test_data[generic_offset][j],
(uint16_t*)test_data[i][j],
vlen * (both_sigs[j].is_complex ? 2 : 1),
tol_i,
absolute_mode);
tol_i);
}
break;
case 1:
if (both_sigs[j].is_signed) {
fail = icompare((int8_t*)test_data[generic_offset][j],
(int8_t*)test_data[i][j],
vlen * (both_sigs[j].is_complex ? 2 : 1),
tol_i,
absolute_mode);
tol_i);
} else {
fail = icompare((uint8_t*)test_data[generic_offset][j],
(uint8_t*)test_data[i][j],
vlen * (both_sigs[j].is_complex ? 2 : 1),
tol_i,
absolute_mode);
tol_i);
}
break;
default:
Expand Down

0 comments on commit 9ffe46e

Please sign in to comment.