generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Refactored performance tests. TEST_CYCLE macro is renamed to TEST_CYCLE_N; SIMPLE_TEST_CYCLE is renamed to TEST_CYCLE; from now 100 iterations are default for performance tests

Browse Source
This commit is contained in:
Andrey Kamaev
2011-12-29 16:46:16 +00:00
parent 80f422a531
commit 65f5343ed5
39 changed files with 1062 additions and 1039 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
modules/core/perf/perf_compare.cpp
View File

@@ -3,6 +3,8 @@
using namespace std;
using namespace cv;
using namespace perf;
using std::tr1::make_tuple;
using std::tr1::get;
CV_ENUM(CmpType, CMP_EQ, CMP_GT, CMP_GE, CMP_LT, CMP_LE, CMP_NE)
@@ -10,16 +12,16 @@ typedef std::tr1::tuple<Size, MatType, CmpType> Size_MatType_CmpType_t;
typedef perf::TestBaseWithParam<Size_MatType_CmpType_t> Size_MatType_CmpType;
PERF_TEST_P( Size_MatType_CmpType, compare,
testing::Combine(
testing::Values( TYPICAL_MAT_SIZES ),
testing::Values( CV_8UC1, CV_8UC4, CV_8SC1, CV_16UC1, CV_16SC1, CV_32SC1, CV_32FC1 ),
testing::ValuesIn( CmpType::all() )
)
)
testing::Combine(
testing::Values(TYPICAL_MAT_SIZES),
testing::Values(CV_8UC1, CV_8UC4, CV_8SC1, CV_16UC1, CV_16SC1, CV_32SC1, CV_32FC1),
testing::ValuesIn(CmpType::all())
)
)
{
Size sz = std::tr1::get<0>(GetParam());
int matType1 = std::tr1::get<1>(GetParam());
CmpType cmpType = std::tr1::get<2>(GetParam());
Size sz = get<0>(GetParam());
int matType1 = get<1>(GetParam());
CmpType cmpType = get<2>(GetParam());
Mat src1(sz, matType1);
Mat src2(sz, matType1);
@@ -27,25 +29,22 @@ PERF_TEST_P( Size_MatType_CmpType, compare,
declare.in(src1, src2, WARMUP_RNG).out(dst);
TEST_CYCLE(100)
{
cv::compare(src1, src2, dst, cmpType);
}
TEST_CYCLE() cv::compare(src1, src2, dst, cmpType);
SANITY_CHECK(dst);
}
PERF_TEST_P( Size_MatType_CmpType, compareScalar,
testing::Combine(
testing::Values( TYPICAL_MAT_SIZES ),
testing::Values( TYPICAL_MAT_TYPES ),
testing::ValuesIn( CmpType::all() )
)
)
testing::Combine(
testing::Values(TYPICAL_MAT_SIZES),
testing::Values(TYPICAL_MAT_TYPES),
testing::ValuesIn(CmpType::all())
)
)
{
Size sz = std::tr1::get<0>(GetParam());
int matType = std::tr1::get<1>(GetParam());
CmpType cmpType = std::tr1::get<2>(GetParam());
Size sz = get<0>(GetParam());
int matType = get<1>(GetParam());
CmpType cmpType = get<2>(GetParam());
Mat src1(sz, matType);
Scalar src2;
@@ -53,10 +52,7 @@ PERF_TEST_P( Size_MatType_CmpType, compareScalar,
declare.in(src1, src2, WARMUP_RNG).out(dst);
TEST_CYCLE(100)
{
cv::compare(src1, src2, dst, cmpType);
}
TEST_CYCLE() cv::compare(src1, src2, dst, cmpType);
SANITY_CHECK(dst);
}