Skip to content

O
opencv
Commit 8c8ebd9c authored by Andrey Kamaev's avatar Andrey Kamaev
Browse files
Options

Fix sanity checks for arithmetic tests on CV_32S data

parent 6151a6ea
Hide whitespace changes
Inline Side-by-side
Showing with 48 additions and 18 deletions
modules/core/perf/perf_arithm.cpp
View file @ 8c8ebd9c
...@@ -97,11 +97,16 @@ PERF_TEST_P(Size_MatType, absdiff, TYPICAL_MATS_CORE_ARITHM) ...@@ -97,11 +97,16 @@ PERF_TEST_P(Size_MatType, absdiff, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c); declare.in(a, b, WARMUP_RNG).out(c);
if (CV_MAT_DEPTH(type) == CV_32S)
{
//see ticket 1529: absdiff can be without saturation on 32S
a /= 2;
b /= 2;
}
TEST_CYCLE() absdiff(a, b, c); TEST_CYCLE() absdiff(a, b, c);
//see ticket 1529: absdiff can be without saturation on 32S SANITY_CHECK(c, 1e-8);
if (CV_MAT_DEPTH(type) != CV_32S)
SANITY_CHECK(c, 1e-8);
} }
PERF_TEST_P(Size_MatType, absdiffScalar, TYPICAL_MATS_CORE_ARITHM) PERF_TEST_P(Size_MatType, absdiffScalar, TYPICAL_MATS_CORE_ARITHM)
...@@ -114,11 +119,16 @@ PERF_TEST_P(Size_MatType, absdiffScalar, TYPICAL_MATS_CORE_ARITHM) ...@@ -114,11 +119,16 @@ PERF_TEST_P(Size_MatType, absdiffScalar, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c); declare.in(a, b, WARMUP_RNG).out(c);
if (CV_MAT_DEPTH(type) == CV_32S)
{
//see ticket 1529: absdiff can be without saturation on 32S
a /= 2;
b /= 2;
}
TEST_CYCLE() absdiff(a, b, c); TEST_CYCLE() absdiff(a, b, c);
//see ticket 1529: absdiff can be without saturation on 32S SANITY_CHECK(c, 1e-8);
if (CV_MAT_DEPTH(type) != CV_32S)
SANITY_CHECK(c, 1e-8);
} }
PERF_TEST_P(Size_MatType, add, TYPICAL_MATS_CORE_ARITHM) PERF_TEST_P(Size_MatType, add, TYPICAL_MATS_CORE_ARITHM)
...@@ -131,11 +141,16 @@ PERF_TEST_P(Size_MatType, add, TYPICAL_MATS_CORE_ARITHM) ...@@ -131,11 +141,16 @@ PERF_TEST_P(Size_MatType, add, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c); declare.in(a, b, WARMUP_RNG).out(c);
if (CV_MAT_DEPTH(type) == CV_32S)
{
//see ticket 1529: add can be without saturation on 32S
a /= 2;
b /= 2;
}
TEST_CYCLE() add(a, b, c); TEST_CYCLE() add(a, b, c);
//see ticket 1529: add can be without saturation on 32S SANITY_CHECK(c, 1e-8);
if (CV_MAT_DEPTH(type) != CV_32S)
SANITY_CHECK(c, 1e-8);
} }
PERF_TEST_P(Size_MatType, addScalar, TYPICAL_MATS_CORE_ARITHM) PERF_TEST_P(Size_MatType, addScalar, TYPICAL_MATS_CORE_ARITHM)
...@@ -148,11 +163,16 @@ PERF_TEST_P(Size_MatType, addScalar, TYPICAL_MATS_CORE_ARITHM) ...@@ -148,11 +163,16 @@ PERF_TEST_P(Size_MatType, addScalar, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c); declare.in(a, b, WARMUP_RNG).out(c);
if (CV_MAT_DEPTH(type) == CV_32S)
{
//see ticket 1529: add can be without saturation on 32S
a /= 2;
b /= 2;
}
TEST_CYCLE() add(a, b, c); TEST_CYCLE() add(a, b, c);
//see ticket 1529: add can be without saturation on 32S SANITY_CHECK(c, 1e-8);
if (CV_MAT_DEPTH(type) != CV_32S)
SANITY_CHECK(c, 1e-8);
} }
PERF_TEST_P(Size_MatType, subtract, TYPICAL_MATS_CORE_ARITHM) PERF_TEST_P(Size_MatType, subtract, TYPICAL_MATS_CORE_ARITHM)
...@@ -165,11 +185,16 @@ PERF_TEST_P(Size_MatType, subtract, TYPICAL_MATS_CORE_ARITHM) ...@@ -165,11 +185,16 @@ PERF_TEST_P(Size_MatType, subtract, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c); declare.in(a, b, WARMUP_RNG).out(c);
if (CV_MAT_DEPTH(type) == CV_32S)
{
//see ticket 1529: subtract can be without saturation on 32S
a /= 2;
b /= 2;
}
TEST_CYCLE() subtract(a, b, c); TEST_CYCLE() subtract(a, b, c);
//see ticket 1529: subtract can be without saturation on 32S SANITY_CHECK(c, 1e-8);
if (CV_MAT_DEPTH(type) != CV_32S)
SANITY_CHECK(c, 1e-8);
} }
PERF_TEST_P(Size_MatType, subtractScalar, TYPICAL_MATS_CORE_ARITHM) PERF_TEST_P(Size_MatType, subtractScalar, TYPICAL_MATS_CORE_ARITHM)
...@@ -182,9 +207,14 @@ PERF_TEST_P(Size_MatType, subtractScalar, TYPICAL_MATS_CORE_ARITHM) ...@@ -182,9 +207,14 @@ PERF_TEST_P(Size_MatType, subtractScalar, TYPICAL_MATS_CORE_ARITHM)
declare.in(a, b, WARMUP_RNG).out(c); declare.in(a, b, WARMUP_RNG).out(c);
if (CV_MAT_DEPTH(type) == CV_32S)
{
//see ticket 1529: subtract can be without saturation on 32S
a /= 2;
b /= 2;
}
TEST_CYCLE() subtract(a, b, c); TEST_CYCLE() subtract(a, b, c);
//see ticket 1529: subtract can be without saturation on 32S SANITY_CHECK(c, 1e-8);
if (CV_MAT_DEPTH(type) != CV_32S)
SANITY_CHECK(c, 1e-8);
} }
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment