refactored GPU performance sample, added filter suport

This commit is contained in:
Alexey Spizhevoy
2011-02-17 15:25:50 +00:00
parent 12c2ead83f
commit e5b563b3fd
2 changed files with 92 additions and 80 deletions

View File

@@ -5,42 +5,6 @@
using namespace std;
using namespace cv;
void TestSystem::run()
{
// Run initializers
vector<Runnable*>::iterator it = inits_.begin();
for (; it != inits_.end(); ++it)
{
(*it)->run();
}
printHeading();
// Run tests
it = tests_.begin();
for (; it != tests_.end(); ++it)
{
cout << endl << (*it)->name() << ":\n";
try
{
(*it)->run();
flushSubtestData();
}
catch (const Exception&)
{
// Message is printed via callback
resetSubtestData();
}
catch (const runtime_error& e)
{
printError(e.what());
resetSubtestData();
}
}
printSummary();
}
void TestSystem::setWorkingDir(const string& val)
{
@@ -48,21 +12,70 @@ void TestSystem::setWorkingDir(const string& val)
}
void TestSystem::flushSubtestData()
void TestSystem::setTestFilter(const string& val)
{
if (!can_flush_)
test_filter_ = val;
}
void TestSystem::run()
{
// Run test initializers
vector<Runnable*>::iterator it = inits_.begin();
for (; it != inits_.end(); ++it)
{
if ((*it)->name().find(test_filter_, 0) != string::npos)
(*it)->run();
}
printHeading();
// Run tests
it = tests_.begin();
for (; it != tests_.end(); ++it)
{
try
{
if ((*it)->name().find(test_filter_, 0) != string::npos)
{
cout << endl << (*it)->name() << ":\n";
(*it)->run();
finishCurrentSubtest();
}
}
catch (const Exception&)
{
// Message is printed via callback
resetCurrentSubtest();
}
catch (const runtime_error& e)
{
printError(e.what());
resetCurrentSubtest();
}
}
printSummary();
}
void TestSystem::finishCurrentSubtest()
{
if (cur_subtest_is_empty_)
// There is no need to print subtest statistics
return;
int cpu_time = static_cast<int>(cpu_elapsed_ / getTickFrequency() * 1000.0);
int gpu_time = static_cast<int>(gpu_elapsed_ / getTickFrequency() * 1000.0);
double speedup = static_cast<double>(cpu_elapsed_) / std::max((int64)1, gpu_elapsed_);
double speedup = static_cast<double>(cpu_elapsed_) /
std::max((int64)1, gpu_elapsed_);
speedup_total_ += speedup;
printItem(cpu_time, gpu_time, speedup);
printMetrics(cpu_time, gpu_time, speedup);
num_subtests_called_++;
resetSubtestData();
resetCurrentSubtest();
}
@@ -86,7 +99,7 @@ void TestSystem::printSummary()
}
void TestSystem::printItem(double cpu_time, double gpu_time, double speedup)
void TestSystem::printMetrics(double cpu_time, double gpu_time, double speedup)
{
cout << TAB << setiosflags(ios_base::left);
stringstream stream;
@@ -102,14 +115,14 @@ void TestSystem::printItem(double cpu_time, double gpu_time, double speedup)
stream << "x" << setprecision(3) << speedup;
cout << setw(14) << stream.str();
cout << description_.str();
cout << cur_subtest_description_.str();
cout << resetiosflags(ios_base::left) << endl;
}
void TestSystem::printError(const std::string& msg)
{
cout << TAB << "[error: " << msg << "] " << description_.str() << endl;
cout << TAB << "[error: " << msg << "] " << cur_subtest_description_.str() << endl;
}
@@ -138,13 +151,15 @@ int CV_CDECL cvErrorCallback(int /*status*/, const char* /*func_name*/,
int main(int argc, char** argv)
{
if (argc < 2)
cout << "Usage: performance_gpu <working_dir_with_slash>\n\n";
else
TestSystem::instance().setWorkingDir(argv[1]);
if (argc < 3)
cout << "Usage: performance_gpu <test_filter> <working_dir_with_slash>\n\n";
if (argc >= 2)
TestSystem::instance().setTestFilter(argv[1]);
if (argc >= 3)
TestSystem::instance().setWorkingDir(argv[2]);
redirectError(cvErrorCallback);
TestSystem::instance().run();
return 0;
}
}