boostorg/regex
1
0
Fork 1
mirror of https://github.com/boostorg/regex.git synced 2025-07-12 20:06:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

for apples-to-apples, add try/catch to time_boost functions, use syntax_option_type::optimize for dynamic xpressive

Browse Source 
[SVN r31024]
This commit is contained in:
Eric Niebler
2005-09-18 16:31:56 +00:00
parent badb291912
commit ae36194500
3 changed files with 99 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
performance/command_line.cpp
View File

@ -84,7 +84,7 @@ int handle_argument(const std::string& what)
time_pcre = true; time_pcre = true;
#endif #endif
#ifdef BOOST_HAS_XPRESSIVE #ifdef BOOST_HAS_XPRESSIVE
else if(what == "-xpressive") else if(what == "-xpressive" || what == "-dxpr")
time_xpressive = true; time_xpressive = true;
#endif #endif
else if(what == "-all") else if(what == "-all")
@ -160,6 +160,9 @@ int show_usage()
#endif #endif
#ifdef BOOST_HAS_PCRE #ifdef BOOST_HAS_PCRE
" -pcre Apply tests to PCRE library\n" " -pcre Apply tests to PCRE library\n"
#endif
#ifdef BOOST_HAS_XPRESSIVE
" -dxpr Apply tests to dynamic xpressive library\n"
#endif #endif
" -all Apply tests to all libraries\n\n" " -all Apply tests to all libraries\n\n"
" test options:\n" " test options:\n"

143
performance/time_boost.cpp
View File

@ -10,6 +10,7 @@
*/ */
#include "regex_comparison.hpp" #include "regex_comparison.hpp"
#include <iostream>
#include <boost/timer.hpp> #include <boost/timer.hpp>
#include <boost/regex.hpp> #include <boost/regex.hpp>
@ -17,37 +18,44 @@ namespace b{
double time_match(const std::string& re, const std::string& text, bool icase) double time_match(const std::string& re, const std::string& text, bool icase)
{ {
boost::regex e(re, (icase ? boost::regex::perl | boost::regex::icase : boost::regex::perl)); try{
boost::smatch what; boost::regex e(re, (icase ? boost::regex::perl | boost::regex::icase : boost::regex::perl));
boost::timer tim; boost::smatch what;
int iter = 1; boost::timer tim;
int counter, repeats; int iter = 1;
double result = 0; int counter, repeats;
double run; double result = 0;
do double run;
{ do
tim.restart(); {
for(counter = 0; counter < iter; ++counter) tim.restart();
{ for(counter = 0; counter < iter; ++counter)
boost::regex_match(text, what, e); {
} boost::regex_match(text, what, e);
result = tim.elapsed(); }
iter *= 2; result = tim.elapsed();
}while(result < 0.5); iter *= 2;
iter /= 2; }while(result < 0.5);
iter /= 2;
// repeat test and report least value for consistency: // repeat test and report least value for consistency:
for(repeats = 0; repeats < REPEAT_COUNT; ++repeats) for(repeats = 0; repeats < REPEAT_COUNT; ++repeats)
{ {
tim.restart(); tim.restart();
for(counter = 0; counter < iter; ++counter) for(counter = 0; counter < iter; ++counter)
{ {
boost::regex_match(text, what, e); boost::regex_match(text, what, e);
} }
run = tim.elapsed(); run = tim.elapsed();
result = (std::min)(run, result); result = (std::min)(run, result);
} }
return result / iter; return result / iter;
}
catch(const std::exception& e)
{
std::cout << "Exception: " << e.what() << std::endl;
return -1;
}
} }
bool dummy_grep_proc(const boost::smatch&) bool dummy_grep_proc(const boost::smatch&)
@ -62,42 +70,49 @@ struct noop
double time_find_all(const std::string& re, const std::string& text, bool icase) double time_find_all(const std::string& re, const std::string& text, bool icase)
{ {
boost::regex e(re, (icase ? boost::regex::perl | boost::regex::icase : boost::regex::perl)); try{
boost::smatch what; boost::regex e(re, (icase ? boost::regex::perl | boost::regex::icase : boost::regex::perl));
boost::timer tim; boost::smatch what;
int iter = 1; boost::timer tim;
int counter, repeats; int iter = 1;
double result = 0; int counter, repeats;
double run; double result = 0;
do double run;
{ do
tim.restart(); {
for(counter = 0; counter < iter; ++counter) tim.restart();
{ for(counter = 0; counter < iter; ++counter)
boost::sregex_iterator begin( text.begin(), text.end(), e ), end; {
std::for_each( begin, end, noop() ); boost::sregex_iterator begin( text.begin(), text.end(), e ), end;
//boost::regex_grep(&dummy_grep_proc, text, e); std::for_each( begin, end, noop() );
} //boost::regex_grep(&dummy_grep_proc, text, e);
result = tim.elapsed(); }
iter *= 2; result = tim.elapsed();
}while(result < 0.5); iter *= 2;
iter /= 2; }while(result < 0.5);
iter /= 2;
if(result >10) if(result >10)
return result / iter; return result / iter;
// repeat test and report least value for consistency: // repeat test and report least value for consistency:
for(repeats = 0; repeats < REPEAT_COUNT; ++repeats) for(repeats = 0; repeats < REPEAT_COUNT; ++repeats)
{ {
tim.restart(); tim.restart();
for(counter = 0; counter < iter; ++counter) for(counter = 0; counter < iter; ++counter)
{ {
boost::regex_grep(&dummy_grep_proc, text, e); boost::regex_grep(&dummy_grep_proc, text, e);
} }
run = tim.elapsed(); run = tim.elapsed();
result = (std::min)(run, result); result = (std::min)(run, result);
} }
return result / iter; return result / iter;
}
catch(const std::exception& e)
{
std::cout << "Exception: " << e.what() << std::endl;
return -1;
}
} }
} }

32
performance/time_dynamic_xpressive.cpp
View File

@ -22,11 +22,11 @@ namespace dxpr
double time_match(const std::string& re, const std::string& text, bool icase) double time_match(const std::string& re, const std::string& text, bool icase)
{ {
try{ try{
boost::xpressive::sregex e; boost::xpressive::regex_constants::syntax_option_type flags = boost::xpressive::regex_constants::optimize;
e = (icase ? if(icase)
boost::xpressive::sregex(boost::xpressive::sregex::compile(re)) flags = flags | boost::xpressive::regex_constants::icase;
: boost::xpressive::sregex(boost::xpressive::sregex::compile(re, boost::xpressive::regex_constants::icase))); boost::xpressive::sregex e(boost::xpressive::sregex::compile(re, flags));
boost::xpressive::smatch what; boost::xpressive::smatch what;
boost::timer tim; boost::timer tim;
int iter = 1; int iter = 1;
@ -75,11 +75,11 @@ struct noop
double time_find_all(const std::string& re, const std::string& text, bool icase) double time_find_all(const std::string& re, const std::string& text, bool icase)
{ {
try{ try{
boost::xpressive::sregex e; boost::xpressive::regex_constants::syntax_option_type flags = boost::xpressive::regex_constants::optimize;
e = (icase ? if(icase)
boost::xpressive::sregex(boost::xpressive::sregex::compile(re)) flags = flags | boost::xpressive::regex_constants::icase;
: boost::xpressive::sregex(boost::xpressive::sregex::compile(re, boost::xpressive::regex_constants::icase))); boost::xpressive::sregex e(boost::xpressive::sregex::compile(re, flags));
boost::xpressive::smatch what; boost::xpressive::smatch what;
boost::timer tim; boost::timer tim;
int iter = 1; int iter = 1;
@ -115,12 +115,12 @@ double time_find_all(const std::string& re, const std::string& text, bool icase)
result = (std::min)(run, result); result = (std::min)(run, result);
} }
return result / iter; return result / iter;
} }
catch(const std::exception& e) catch(const std::exception& e)
{ {
std::cout << "Exception: " << e.what() << std::endl; std::cout << "Exception: " << e.what() << std::endl;
return -1; return -1;
} }
} }
} }