diff options
Diffstat (limited to 'benchmark')
| -rw-r--r-- | benchmark/cancel.cc | 127 | ||||
| -rw-r--r-- | benchmark/j2k_transcode.cc | 26 | ||||
| -rw-r--r-- | benchmark/wscript | 4 |
3 files changed, 145 insertions, 12 deletions
diff --git a/benchmark/cancel.cc b/benchmark/cancel.cc new file mode 100644 index 00000000..af475318 --- /dev/null +++ b/benchmark/cancel.cc @@ -0,0 +1,127 @@ +/* + Copyright (C) 2015-2019 Carl Hetherington <cth@carlh.net> + + This file is part of libdcp. + + libdcp is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + libdcp is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License + along with libdcp. If not, see <http://www.gnu.org/licenses/>. + + In addition, as a special exception, the copyright holders give + permission to link the code of portions of this program with the + OpenSSL library under certain conditions as described in each + individual source file, and distribute linked combinations + including the two. + + You must obey the GNU General Public License in all respects + for all of the code used other than OpenSSL. If you modify + file(s) with this exception, you may extend this exception to your + version of the file(s), but you are not obligated to do so. If you + do not wish to do so, delete this exception statement from your + version. If you delete this exception statement from all source + files in the program, then also delete it here. +*/ + + +#include "j2k_transcode.h" +#include <boost/thread.hpp> +#include <sys/time.h> +#include <cfloat> +#include <iomanip> +#include <iostream> + + +using std::cout; +using std::cerr; +using std::fixed; +using std::make_shared; +using std::setprecision; +using std::vector; + + +class Timer +{ +public: + Timer() + { + gettimeofday(&_start, 0); + } + + float get() + { + struct timeval now; + gettimeofday(&now, 0); + return (now.tv_sec + now.tv_usec / 1e6) - (_start.tv_sec + _start.tv_usec / 1e6); + } + +private: + struct timeval _start; +}; + + +/** Test how fast J2K decodes can be cancelled */ +int +main(int argc, char* argv[]) +{ + if (argc < 2) { + cerr << "Syntax: " << argv[0] << " private-test-path\n"; + exit(EXIT_FAILURE); + } + + int const trials = 512; + int const max_sleep_ms = 200; + + dcp::ArrayData j2k(boost::filesystem::path(argv[1]) / "thx.j2c"); + + float minimum = FLT_MAX; + float maximum = 0; + float total = 0; + + vector<int> histo(25); + + for (int i = 0; i < trials; ++i) { + auto cancel = make_shared<dcp::OpenJPEGCancel>(); + boost::thread thread([&]() { + try { + dcp::decompress_j2k(j2k, 0, cancel); + } catch (...) {} + }); + + usleep((rand() % max_sleep_ms) * 1000); + Timer timer; + cancel->cancel(); + thread.join(); + auto time = timer.get(); + minimum = std::min(minimum, time); + maximum = std::max(maximum, time); + total += time; + + int const ms = time * 1000; + if (ms < static_cast<int>(histo.size())) { + histo[ms]++; + } + } + + cout << fixed << setprecision(3) << "min: " << minimum << "\n"; + cout << fixed << setprecision(3) << "max: " << maximum << "\n"; + cout << fixed << setprecision(3) << "ave: " << (total / trials) << "\n"; + + for (auto i = 0U; i < histo.size(); ++i) { + std::cout << i << ": " << histo[i] << "\n"; + } + + return 0; +} + + + + diff --git a/benchmark/j2k_transcode.cc b/benchmark/j2k_transcode.cc index 71602e0b..1e628079 100644 --- a/benchmark/j2k_transcode.cc +++ b/benchmark/j2k_transcode.cc @@ -37,6 +37,7 @@ #include "openjpeg_image.h" #include "util.h" #include "version.h" +#include <boost/thread/thread.hpp> #include <sys/time.h> #include <iostream> #include <cstdio> @@ -86,8 +87,9 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } - int const count = 100; + int const count = 128; int const j2k_bandwidth = 100000000; + int const threads = 16; dcp::ArrayData j2k (boost::filesystem::path (argv[1]) / "thx.j2c"); @@ -95,16 +97,20 @@ main (int argc, char* argv[]) Timer compress; dcp::ArrayData recomp; - for (int i = 0; i < count; ++i) { - decompress.start (); - shared_ptr<dcp::OpenJPEGImage> xyz = dcp::decompress_j2k (j2k, 0); - decompress.stop (); - compress.start (); - recomp = dcp::compress_j2k (xyz, j2k_bandwidth, 24, false, false); - compress.stop (); - cout << (i + 1) << " "; - cout.flush (); + + auto body = [&]() { + for (int i = 0; i < (count / threads); ++i) { + auto xyz = dcp::decompress_j2k(j2k, 0); + } + }; + + boost::thread_group group; + decompress.start (); + for (int i = 0; i < threads; ++i) { + group.create_thread(body); } + group.join_all(); + decompress.stop (); cout << "\n"; cout << "Decompress: " << count / decompress.get() << " fps.\n"; diff --git a/benchmark/wscript b/benchmark/wscript index 7305bdaa..f3d4621b 100644 --- a/benchmark/wscript +++ b/benchmark/wscript @@ -32,10 +32,10 @@ # def build(bld): - for p in ['rgb_to_xyz', 'j2k_transcode']: + for p in ['rgb_to_xyz', 'j2k_transcode', 'cancel']: obj = bld(features='cxx cxxprogram') obj.name = p - obj.uselib = 'BOOST_FILESYSTEM ASDCPLIB_DCPOMATIC CXML AVCODEC AVUTIL' + obj.uselib = 'BOOST_FILESYSTEM BOOST_THREAD ASDCPLIB_DCPOMATIC CXML AVCODEC AVUTIL OPENJPEG' obj.cppflags = ['-g', '-O2'] obj.use = 'libdcp%s' % bld.env.API_VERSION obj.source = "%s.cc" % p |