Skip to content

O
opencv
Commit 1f3f4599 authored by Vladislav Vinogradov's avatar Vladislav Vinogradov
Browse files
Options

fixed gpu performance tests

parent 464b8a57
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 52 additions and 126 deletions
modules/gpu/perf/perf_arithm.cpp
View file @ 1f3f4599
......@@ -17,9 +17,7 @@ PERF_TEST_P(DevInfo_Size_MatType, transpose, testing::Combine(testing::ValuesIn(
GpuMat src(src_host);
GpuMat dst(size.width, size.height, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
transpose(src, dst);
}
......@@ -48,9 +46,7 @@ PERF_TEST_P(DevInfo_Size_MatType_FlipCode, flip, testing::Combine(testing::Value
GpuMat src(src_host);
GpuMat dst(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
flip(src, dst, flipCode);
}
......@@ -78,9 +74,7 @@ PERF_TEST_P(DevInfo_Size_MatType, LUT, testing::Combine(testing::ValuesIn(device
GpuMat src(src_host);
GpuMat dst(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
LUT(src, lut, dst);
}
......@@ -108,9 +102,7 @@ PERF_TEST_P(DevInfo_Size, cartToPolar, testing::Combine(testing::ValuesIn(device
GpuMat magnitude(size, CV_32FC1);
GpuMat angle(size, CV_32FC1);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
cartToPolar(x, y, magnitude, angle);
}
......@@ -140,9 +132,7 @@ PERF_TEST_P(DevInfo_Size, polarToCart, testing::Combine(testing::ValuesIn(device
GpuMat x(size, CV_32FC1);
GpuMat y(size, CV_32FC1);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
polarToCart(magnitude, angle, x, y);
}
......@@ -173,9 +163,7 @@ PERF_TEST_P(DevInfo_Size_MatType, addMat, testing::Combine(testing::ValuesIn(dev
GpuMat b(b_host);
GpuMat c(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
add(a, b, c);
}
......@@ -203,9 +191,7 @@ PERF_TEST_P(DevInfo_Size_MatType, addScalar, testing::Combine(testing::ValuesIn(
Scalar b(1,2,3,4);
GpuMat c(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
add(a, b, c);
}
......@@ -234,9 +220,7 @@ PERF_TEST_P(DevInfo_Size_MatType, subtractMat, testing::Combine(testing::ValuesI
GpuMat b(b_host);
GpuMat c(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
subtract(a, b, c);
}
......@@ -254,7 +238,7 @@ PERF_TEST_P(DevInfo_Size, multiplyMat, testing::Combine(testing::ValuesIn(device
setDevice(devInfo.deviceID());
Mat a_host(size, CV_8UC1);
Mat a_host(size, CV_8UC4);
Mat b_host(size, CV_32FC1);
declare.in(a_host, b_host, WARMUP_RNG);
......@@ -263,9 +247,7 @@ PERF_TEST_P(DevInfo_Size, multiplyMat, testing::Combine(testing::ValuesIn(device
GpuMat b(b_host);
GpuMat c;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
multiply(a, b, c);
}
......@@ -293,9 +275,7 @@ PERF_TEST_P(DevInfo_Size_MatType, multiplyScalar, testing::Combine(testing::Valu
Scalar b(1,2,3,4);
GpuMat c(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
multiply(a, b, c);
}
......@@ -320,9 +300,7 @@ PERF_TEST_P(DevInfo_Size, exp, testing::Combine(testing::ValuesIn(devices()),
GpuMat a(a_host);
GpuMat b(size, CV_32FC1);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
exp(a, b);
}
......@@ -349,9 +327,7 @@ PERF_TEST_P(DevInfo_Size_MatType, pow, testing::Combine(testing::ValuesIn(device
GpuMat src(src_host);
GpuMat dst(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
pow(src, 2.0, dst);
}
......@@ -382,9 +358,7 @@ PERF_TEST_P(DevInfo_Size_MatType_CmpOp, compare, testing::Combine(testing::Value
GpuMat src2(src2_host);
GpuMat dst(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
compare(src1, src2, dst, cmpop);
}
......@@ -411,9 +385,7 @@ PERF_TEST_P(DevInfo_Size_MatType, bitwise_not, testing::Combine(testing::ValuesI
GpuMat src(src_host);
GpuMat dst(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
bitwise_not(src, dst);
}
......@@ -442,9 +414,7 @@ PERF_TEST_P(DevInfo_Size_MatType, bitwise_and, testing::Combine(testing::ValuesI
GpuMat src2(src2_host);
GpuMat dst(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
bitwise_and(src1, src2, dst);
}
......@@ -473,9 +443,7 @@ PERF_TEST_P(DevInfo_Size_MatType, min, testing::Combine(testing::ValuesIn(device
GpuMat src2(src2_host);
GpuMat dst(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
min(src1, src2, dst);
}
......@@ -501,9 +469,7 @@ PERF_TEST_P(DevInfo_Size, meanStdDev, testing::Combine(testing::ValuesIn(devices
Scalar mean;
Scalar stddev;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
meanStdDev(src, mean, stddev);
}
......@@ -532,9 +498,7 @@ PERF_TEST_P(DevInfo_Size_MatType_NormType, norm, testing::Combine(testing::Value
double dst;
GpuMat buf;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
dst = norm(src, normType, buf);
}
......@@ -561,9 +525,7 @@ PERF_TEST_P(DevInfo_Size_NormType, normDiff, testing::Combine(testing::ValuesIn(
GpuMat src2(src2_host);
double dst;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
dst = norm(src1, src2, normType);
}
......@@ -589,9 +551,7 @@ PERF_TEST_P(DevInfo_Size_MatType, sum, testing::Combine(testing::ValuesIn(device
Scalar dst;
GpuMat buf;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
dst = sum(src, buf);
}
......@@ -617,9 +577,7 @@ PERF_TEST_P(DevInfo_Size_MatType, minMax, testing::Combine(testing::ValuesIn(dev
double minVal, maxVal;
GpuMat buf;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
minMax(src, &minVal, &maxVal, GpuMat(), buf);
}
......@@ -647,9 +605,7 @@ PERF_TEST_P(DevInfo_Size_MatType, minMaxLoc, testing::Combine(testing::ValuesIn(
Point minLoc, maxLoc;
GpuMat valbuf, locbuf;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
minMaxLoc(src, &minVal, &maxVal, &minLoc, &maxLoc, GpuMat(), valbuf, locbuf);
}
......@@ -676,9 +632,7 @@ PERF_TEST_P(DevInfo_Size_MatType, countNonZero, testing::Combine(testing::Values
int dst=0;
GpuMat buf;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
dst = countNonZero(src, buf);
}
......@@ -705,9 +659,7 @@ PERF_TEST_P(DevInfo_Size_MatType, addWeighted, testing::Combine(testing::ValuesI
GpuMat src2(src2_host);
GpuMat dst(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
addWeighted(src1, 0.5, src2, 0.5, 0.0, dst);
}
......@@ -736,9 +688,7 @@ PERF_TEST_P(DevInfo_Size_MatType_FlipCode, reduce, testing::Combine(testing::Val
GpuMat src(src_host);
GpuMat dst(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
reduce(src, dst, dim, CV_REDUCE_MIN);
}
......@@ -769,7 +719,7 @@ PERF_TEST_P(DevInfo_Size, gemm, testing::Combine(testing::ValuesIn(devices()),
declare.time(5.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
gemm(src1, src2, 1.0, src3, 1.0, dst);
}
......
modules/gpu/perf/perf_calib3d.cpp
View file @ 1f3f4599
......@@ -13,9 +13,7 @@ PERF_TEST_P(DevInfo, transformPoints, testing::ValuesIn(devices()))
GpuMat src(src_host);
GpuMat dst;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
transformPoints(src, Mat::ones(1, 3, CV_32FC1), Mat::ones(1, 3, CV_32FC1), dst);
}
......@@ -38,9 +36,7 @@ PERF_TEST_P(DevInfo, projectPoints, testing::ValuesIn(devices()))
GpuMat src(src_host);
GpuMat dst;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
projectPoints(src, Mat::ones(1, 3, CV_32FC1), Mat::ones(1, 3, CV_32FC1), Mat::ones(3, 3, CV_32FC1), Mat(), dst);
}
......@@ -65,7 +61,7 @@ PERF_TEST_P(DevInfo, solvePnPRansac, testing::ValuesIn(devices()))
declare.time(3.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
solvePnPRansac(object, image, Mat::ones(3, 3, CV_32FC1), Mat(1, 8, CV_32F, Scalar::all(0)), rvec, tvec);
}
......@@ -93,9 +89,9 @@ PERF_TEST_P(DevInfo, StereoBM, testing::ValuesIn(devices()))
StereoBM_GPU bm(0, 256);
declare.time(0.5).iterations(100);
declare.time(5.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
bm(img_l, img_r, dst);
}
......@@ -126,7 +122,7 @@ PERF_TEST_P(DevInfo, StereoBeliefPropagation, testing::ValuesIn(devices()))
declare.time(10.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
bp(img_l, img_r, dst);
}
......@@ -157,7 +153,7 @@ PERF_TEST_P(DevInfo, StereoConstantSpaceBP, testing::ValuesIn(devices()))
declare.time(10.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
bp(img_l, img_r, dst);
}
......@@ -186,9 +182,7 @@ PERF_TEST_P(DevInfo, DisparityBilateralFilter, testing::ValuesIn(devices()))
DisparityBilateralFilter f(128);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
f(disp, img, dst);
}
......
modules/gpu/perf/perf_features2d.cpp
View file @ 1f3f4599
......@@ -21,7 +21,7 @@ PERF_TEST_P(DevInfo_DescSize, BruteForceMatcher_match, testing::Combine(testing:
declare.time(3.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
matcher.matchSingle(query, train, trainIdx, distance);
}
......@@ -56,7 +56,7 @@ PERF_TEST_P(DevInfo_K_DescSize, BruteForceMatcher_knnMatch, testing::Combine(tes
declare.time(3.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
matcher.knnMatchSingle(query, train, trainIdx, distance, allDist, k);
}
......@@ -87,7 +87,7 @@ PERF_TEST_P(DevInfo_DescSize, BruteForceMatcher_radiusMatch, testing::Combine(te
declare.time(3.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
matcher.radiusMatchSingle(query, train, trainIdx, distance, nMatches, 2.0);
}
......@@ -118,7 +118,7 @@ PERF_TEST_P(DevInfo, SURF, testing::ValuesIn(devices()))
declare.time(2.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
surf(img, GpuMat(), keypoints, descriptors);
}
......
modules/gpu/perf/perf_filters.cpp
View file @ 1f3f4599
......@@ -21,9 +21,7 @@ PERF_TEST_P(DevInfo_Size_MatType_KernelSize, boxFilter, testing::Combine(testing
Ptr<FilterEngine_GPU> filter = createBoxFilter_GPU(type, type, Size(ksize, ksize));
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
filter->apply(src, dst);
}
......@@ -56,9 +54,7 @@ PERF_TEST_P(DevInfo_Size_MatType_MorphOp_KernelSize, morphologyFilter, testing::
Ptr<FilterEngine_GPU> filter = createMorphologyFilter_GPU(op, type, Mat::ones(ksize, ksize, CV_8U));
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
filter->apply(src, dst);
}
......@@ -89,9 +85,9 @@ PERF_TEST_P(DevInfo_Size_MatType_KernelSize, linearFilter, testing::Combine(test
Ptr<FilterEngine_GPU> filter = createLinearFilter_GPU(type, type, Mat::ones(ksize, ksize, CV_8U));
declare.time(1.0).iterations(100);
declare.time(1.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
filter->apply(src, dst);
}
......@@ -123,9 +119,9 @@ PERF_TEST_P(DevInfo_Size_MatType_KernelSize, separableLinearFilter, testing::Com
Mat kernel = getGaussianKernel(ksize, 0.5, CV_32F);
Ptr<FilterEngine_GPU> filter = createSeparableLinearFilter_GPU(type, type, kernel, kernel, Point(-1,-1));
declare.time(1.0).iterations(100);
declare.time(1.0);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
filter->apply(src, dst, Rect(0, 0, src.cols, src.rows));
}
......
modules/gpu/perf/perf_imgproc.cpp
View file @ 1f3f4599
This diff is collapsed.
modules/gpu/perf/perf_matop.cpp
View file @ 1f3f4599
......@@ -18,9 +18,7 @@ PERF_TEST_P(DevInfo_Size_MatType, merge, testing::Combine(testing::ValuesIn(devi
GpuMat dst(size, CV_MAKETYPE(type, num_channels));
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
merge(src, dst);
}
......@@ -48,9 +46,7 @@ PERF_TEST_P(DevInfo_Size_MatType, split, testing::Combine(testing::ValuesIn(devi
for (int i = 0; i < num_channels; ++i)
dst[i] = GpuMat(size, type);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
split(src, dst);
}
......@@ -75,9 +71,7 @@ PERF_TEST_P(DevInfo_Size_MatType, setTo, testing::Combine(testing::ValuesIn(devi
GpuMat src(size, type);
Scalar val(1, 2, 3, 4);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
src.setTo(val);
}
......@@ -108,9 +102,7 @@ PERF_TEST_P(DevInfo_Size_MatType, setToMasked, testing::Combine(testing::ValuesI
randu(mask_host, 0.0, 2.0);
GpuMat mask(mask_host);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
src.setTo(val, mask);
}
......@@ -141,9 +133,7 @@ PERF_TEST_P(DevInfo_Size_MatType, copyToMasked, testing::Combine(testing::Values
randu(mask_host, 0.0, 2.0);
GpuMat mask(mask_host);
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
src.copyTo(dst, mask);
}
......@@ -175,9 +165,7 @@ PERF_TEST_P(DevInfo_Size_MatType_MatType, convertTo, testing::Combine(testing::V
double a = 0.5;
double b = 1.0;
declare.time(0.5).iterations(100);
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
src.convertTo(dst, type2, a, b);
}
......
modules/gpu/perf/perf_objdetect.cpp
View file @ 1f3f4599
......@@ -11,12 +11,10 @@ PERF_TEST_P(DevInfo, HOGDescriptor, testing::ValuesIn(devices()))
GpuMat img(img_host);
vector<Rect> found_locations;
declare.time(0.5).iterations(100);
gpu::HOGDescriptor hog;
hog.setSVMDetector(gpu::HOGDescriptor::getDefaultPeopleDetector());
SIMPLE_TEST_CYCLE()
TEST_CYCLE(100)
{
hog.detectMultiScale(img, found_locations);
}
......
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