From: Ivailo Monev Date: Thu, 10 Dec 2020 03:23:05 +0000 (+0000) Subject: reimplement QBenchmarkTickMeasurer via clock_gettime() X-Git-Tag: 4.12.0~3108 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7727fcf8c366d5fdba72ada6d059cbea4f72dcba;p=kde%2FKatie.git reimplement QBenchmarkTickMeasurer via clock_gettime() Signed-off-by: Ivailo Monev --- diff --git a/README b/README index 6c546745a..39440acf2 100644 --- a/README +++ b/README @@ -18,7 +18,6 @@ There are several things you should be aware before considering Katie: - QtUiTools is build as shared library by default - moc, uic, rcc, etc. are linked to components - updated bundled Harfbuzz from upstream (not Harfbuzz-NG) - - updated bundled FFTW from upstream - versioned and extended classes have been merged into the base class, e.g. QIconEngineV2 into QIconEngine and QKeyEventEx into QKeyEvent - QGuiPlatformPlugin class is public diff --git a/src/3rdparty/fftw/cycle.h b/src/3rdparty/fftw/cycle.h deleted file mode 100644 index fe3dd50d6..000000000 --- a/src/3rdparty/fftw/cycle.h +++ /dev/null @@ -1,564 +0,0 @@ -/* - * Copyright (c) 2003, 2007-14 Matteo Frigo - * Copyright (c) 2003, 2007-14 Massachusetts Institute of Technology - * - * Permission is hereby granted, free of charge, to any person obtaining - * a copy of this software and associated documentation files (the - * "Software"), to deal in the Software without restriction, including - * without limitation the rights to use, copy, modify, merge, publish, - * distribute, sublicense, and/or sell copies of the Software, and to - * permit persons to whom the Software is furnished to do so, subject to - * the following conditions: - * - * The above copyright notice and this permission notice shall be - * included in all copies or substantial portions of the Software. - * - * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - * EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND - * NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - * LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - * OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - * WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - * - */ - - -/* machine-dependent cycle counters code. Needs to be inlined. */ - -/***************************************************************************/ -/* To use the cycle counters in your code, simply #include "cycle.h" (this - file), and then use the functions/macros: - - ticks getticks(void); - - ticks is an opaque typedef defined below, representing the current time. - You extract the elapsed time between two calls to gettick() via: - - double elapsed(ticks t1, ticks t0); - - which returns a double-precision variable in arbitrary units. You - are not expected to convert this into human units like seconds; it - is intended only for *comparisons* of time intervals. - - (In order to use some of the OS-dependent timer routines like - Solaris' gethrtime, you need to paste the autoconf snippet below - into your configure.ac file and #include "config.h" before cycle.h, - or define the relevant macros manually if you are not using autoconf.) -*/ - -/***************************************************************************/ -/* This file uses macros like HAVE_GETHRTIME that are assumed to be - defined according to whether the corresponding function/type/header - is available on your system. The necessary macros are most - conveniently defined if you are using GNU autoconf, via the tests: - - dnl --------------------------------------------------------------------- - - AC_C_INLINE - AC_HEADER_TIME - AC_CHECK_HEADERS([sys/time.h c_asm.h intrinsics.h mach/mach_time.h]) - - AC_CHECK_TYPE([hrtime_t],[AC_DEFINE(HAVE_HRTIME_T, 1, [Define to 1 if hrtime_t is defined in ])],,[#if HAVE_SYS_TIME_H -#include -#endif]) - - AC_CHECK_FUNCS([gethrtime read_real_time time_base_to_time clock_gettime mach_absolute_time]) - - dnl Cray UNICOS _rtc() (real-time clock) intrinsic - AC_MSG_CHECKING([for _rtc intrinsic]) - rtc_ok=yes - AC_TRY_LINK([#ifdef HAVE_INTRINSICS_H -#include -#endif], [_rtc()], [AC_DEFINE(HAVE__RTC,1,[Define if you have the UNICOS _rtc() intrinsic.])], [rtc_ok=no]) - AC_MSG_RESULT($rtc_ok) - - dnl --------------------------------------------------------------------- -*/ - -/***************************************************************************/ - -#if TIME_WITH_SYS_TIME -# include -# include -#else -# if HAVE_SYS_TIME_H -# include -# else -# include -# endif -#endif - -#define INLINE_ELAPSED(INL) static INL double elapsed(ticks t1, ticks t0) \ -{ \ - return (double)t1 - (double)t0; \ -} - -/*----------------------------------------------------------------*/ -/* Solaris */ -#if defined(HAVE_GETHRTIME) && defined(HAVE_HRTIME_T) && !defined(HAVE_TICK_COUNTER) -typedef hrtime_t ticks; - -#define getticks gethrtime - -INLINE_ELAPSED(inline) - -#define HAVE_TICK_COUNTER -#endif - -/*----------------------------------------------------------------*/ -/* AIX v. 4+ routines to read the real-time clock or time-base register */ -#if defined(HAVE_READ_REAL_TIME) && defined(HAVE_TIME_BASE_TO_TIME) && !defined(HAVE_TICK_COUNTER) -typedef timebasestruct_t ticks; - -static __inline ticks getticks(void) -{ - ticks t; - read_real_time(&t, TIMEBASE_SZ); - return t; -} - -static __inline double elapsed(ticks t1, ticks t0) /* time in nanoseconds */ -{ - time_base_to_time(&t1, TIMEBASE_SZ); - time_base_to_time(&t0, TIMEBASE_SZ); - return (((double)t1.tb_high - (double)t0.tb_high) * 1.0e9 + - ((double)t1.tb_low - (double)t0.tb_low)); -} - -#define HAVE_TICK_COUNTER -#endif - -/*----------------------------------------------------------------*/ -/* - * PowerPC ``cycle'' counter using the time base register. - */ -#if ((((defined(__GNUC__) && (defined(__powerpc__) || defined(__ppc__))) || (defined(__MWERKS__) && defined(macintosh)))) || (defined(__IBM_GCC_ASM) && (defined(__powerpc__) || defined(__ppc__)))) && !defined(HAVE_TICK_COUNTER) -typedef unsigned long long ticks; - -static __inline__ ticks getticks(void) -{ - unsigned int tbl, tbu0, tbu1; - - do { - __asm__ __volatile__ ("mftbu %0" : "=r"(tbu0)); - __asm__ __volatile__ ("mftb %0" : "=r"(tbl)); - __asm__ __volatile__ ("mftbu %0" : "=r"(tbu1)); - } while (tbu0 != tbu1); - - return (((unsigned long long)tbu0) << 32) | tbl; -} - -INLINE_ELAPSED(__inline__) - -#define HAVE_TICK_COUNTER -#endif - -/* MacOS/Mach (Darwin) time-base register interface (unlike UpTime, - from Carbon, requires no additional libraries to be linked). */ -#if defined(HAVE_MACH_ABSOLUTE_TIME) && defined(HAVE_MACH_MACH_TIME_H) && !defined(HAVE_TICK_COUNTER) -#include -typedef uint64_t ticks; -#define getticks mach_absolute_time -INLINE_ELAPSED(__inline__) -#define HAVE_TICK_COUNTER -#endif - -/*----------------------------------------------------------------*/ -/* - * Pentium cycle counter - */ -#if (defined(__GNUC__) || defined(__ICC)) && defined(__i386__) && !defined(HAVE_TICK_COUNTER) -typedef unsigned long long ticks; - -static __inline__ ticks getticks(void) -{ - ticks ret; - - __asm__ __volatile__("rdtsc": "=A" (ret)); - /* no input, nothing else clobbered */ - return ret; -} - -INLINE_ELAPSED(__inline__) - -#define HAVE_TICK_COUNTER -#define TIME_MIN 5000.0 /* unreliable pentium IV cycle counter */ -#endif - -/* Visual C++ -- thanks to Morten Nissov for his help with this */ -#if _MSC_VER >= 1200 && _M_IX86 >= 500 && !defined(HAVE_TICK_COUNTER) -#include -typedef LARGE_INTEGER ticks; -#define RDTSC __asm __emit 0fh __asm __emit 031h /* hack for VC++ 5.0 */ - -static __inline ticks getticks(void) -{ - ticks retval; - - __asm { - RDTSC - mov retval.HighPart, edx - mov retval.LowPart, eax - } - return retval; -} - -static __inline double elapsed(ticks t1, ticks t0) -{ - return (double)t1.QuadPart - (double)t0.QuadPart; -} - -#define HAVE_TICK_COUNTER -#define TIME_MIN 5000.0 /* unreliable pentium IV cycle counter */ -#endif - -/*----------------------------------------------------------------*/ -/* - * X86-64 cycle counter - */ -#if (defined(__GNUC__) || defined(__ICC) || defined(__SUNPRO_C)) && defined(__x86_64__) && !defined(HAVE_TICK_COUNTER) -typedef unsigned long long ticks; - -static __inline__ ticks getticks(void) -{ - unsigned a, d; - __asm__ __volatile__ ("rdtsc" : "=a" (a), "=d" (d)); - return ((ticks)a) | (((ticks)d) << 32); -} - -INLINE_ELAPSED(__inline__) - -#define HAVE_TICK_COUNTER -#define TIME_MIN 5000.0 -#endif - -/* PGI compiler, courtesy Cristiano Calonaci, Andrea Tarsi, & Roberto Gori. - NOTE: this code will fail to link unless you use the -Masmkeyword compiler - option (grrr). */ -#if defined(__PGI) && defined(__x86_64__) && !defined(HAVE_TICK_COUNTER) -typedef unsigned long long ticks; -static ticks getticks(void) -{ - asm(" rdtsc; shl $0x20,%rdx; mov %eax,%eax; or %rdx,%rax; "); -} -INLINE_ELAPSED(__inline__) -#define HAVE_TICK_COUNTER -#define TIME_MIN 5000.0 -#endif - -/* Visual C++, courtesy of Dirk Michaelis */ -#if _MSC_VER >= 1400 && (defined(_M_AMD64) || defined(_M_X64)) && !defined(HAVE_TICK_COUNTER) - -#include -#pragma intrinsic(__rdtsc) -typedef unsigned __int64 ticks; -#define getticks __rdtsc -INLINE_ELAPSED(__inline) - -#define HAVE_TICK_COUNTER -#define TIME_MIN 5000.0 -#endif - -/*----------------------------------------------------------------*/ -/* - * IA64 cycle counter - */ - -/* intel's icc/ecc compiler */ -#if (defined(__EDG_VERSION) || defined(__ECC)) && defined(__ia64__) && !defined(HAVE_TICK_COUNTER) -typedef unsigned long ticks; -#include - -static __inline__ ticks getticks(void) -{ - return __getReg(_IA64_REG_AR_ITC); -} - -INLINE_ELAPSED(__inline__) - -#define HAVE_TICK_COUNTER -#endif - -/* gcc */ -#if defined(__GNUC__) && defined(__ia64__) && !defined(HAVE_TICK_COUNTER) -typedef unsigned long ticks; - -static __inline__ ticks getticks(void) -{ - ticks ret; - - __asm__ __volatile__ ("mov %0=ar.itc" : "=r"(ret)); - return ret; -} - -INLINE_ELAPSED(__inline__) - -#define HAVE_TICK_COUNTER -#endif - -/* HP/UX IA64 compiler, courtesy Teresa L. Johnson: */ -#if defined(__hpux) && defined(__ia64) && !defined(HAVE_TICK_COUNTER) -#include -typedef unsigned long ticks; - -static inline ticks getticks(void) -{ - ticks ret; - - ret = _Asm_mov_from_ar (_AREG_ITC); - return ret; -} - -INLINE_ELAPSED(inline) - -#define HAVE_TICK_COUNTER -#endif - -/* Microsoft Visual C++ */ -#if defined(_MSC_VER) && defined(_M_IA64) && !defined(HAVE_TICK_COUNTER) -typedef unsigned __int64 ticks; - -# ifdef __cplusplus -extern "C" -# endif -ticks __getReg(int whichReg); -#pragma intrinsic(__getReg) - -static __inline ticks getticks(void) -{ - volatile ticks temp; - temp = __getReg(3116); - return temp; -} - -INLINE_ELAPSED(inline) - -#define HAVE_TICK_COUNTER -#endif - -/*----------------------------------------------------------------*/ -/* - * PA-RISC cycle counter - */ -#if (defined(__hppa__) || defined(__hppa)) && !defined(HAVE_TICK_COUNTER) -typedef unsigned long ticks; - -# ifdef __GNUC__ -static __inline__ ticks getticks(void) -{ - ticks ret; - - __asm__ __volatile__("mfctl 16, %0": "=r" (ret)); - /* no input, nothing else clobbered */ - return ret; -} -# else -# include -static inline unsigned long getticks(void) -{ - register ticks ret; - _MFCTL(16, ret); - return ret; -} -# endif - -INLINE_ELAPSED(inline) - -#define HAVE_TICK_COUNTER -#endif - -/*----------------------------------------------------------------*/ -/* S390, courtesy of James Treacy */ -#if defined(__GNUC__) && defined(__s390__) && !defined(HAVE_TICK_COUNTER) -typedef unsigned long long ticks; - -static __inline__ ticks getticks(void) -{ - ticks cycles; - __asm__("stck 0(%0)" : : "a" (&(cycles)) : "memory", "cc"); - return cycles; -} - -INLINE_ELAPSED(__inline__) - -#define HAVE_TICK_COUNTER -#endif -/*----------------------------------------------------------------*/ -#if defined(__GNUC__) && defined(__alpha__) && !defined(HAVE_TICK_COUNTER) -/* - * The 32-bit cycle counter on alpha overflows pretty quickly, - * unfortunately. A 1GHz machine overflows in 4 seconds. - */ -typedef unsigned int ticks; - -static __inline__ ticks getticks(void) -{ - unsigned long cc; - __asm__ __volatile__ ("rpcc %0" : "=r"(cc)); - return (cc & 0xFFFFFFFF); -} - -INLINE_ELAPSED(__inline__) - -#define HAVE_TICK_COUNTER -#endif - -/*----------------------------------------------------------------*/ -#if defined(__GNUC__) && defined(__sparc_v9__) && !defined(HAVE_TICK_COUNTER) -typedef unsigned long ticks; - -static __inline__ ticks getticks(void) -{ - ticks ret; - __asm__ __volatile__("rd %%tick, %0" : "=r" (ret)); - return ret; -} - -INLINE_ELAPSED(__inline__) - -#define HAVE_TICK_COUNTER -#endif - -/*----------------------------------------------------------------*/ -#if (defined(__DECC) || defined(__DECCXX)) && defined(__alpha) && defined(HAVE_C_ASM_H) && !defined(HAVE_TICK_COUNTER) -# include -typedef unsigned int ticks; - -static __inline ticks getticks(void) -{ - unsigned long cc; - cc = asm("rpcc %v0"); - return (cc & 0xFFFFFFFF); -} - -INLINE_ELAPSED(__inline) - -#define HAVE_TICK_COUNTER -#endif -/*----------------------------------------------------------------*/ -/* SGI/Irix */ -#if defined(HAVE_CLOCK_GETTIME) && defined(CLOCK_SGI_CYCLE) && !defined(HAVE_TICK_COUNTER) && !defined(__ANDROID__) -typedef struct timespec ticks; - -static inline ticks getticks(void) -{ - struct timespec t; - clock_gettime(CLOCK_SGI_CYCLE, &t); - return t; -} - -static inline double elapsed(ticks t1, ticks t0) -{ - return ((double)t1.tv_sec - (double)t0.tv_sec) * 1.0E9 + - ((double)t1.tv_nsec - (double)t0.tv_nsec); -} -#define HAVE_TICK_COUNTER -#endif - -/*----------------------------------------------------------------*/ -/* Cray UNICOS _rtc() intrinsic function */ -#if defined(HAVE__RTC) && !defined(HAVE_TICK_COUNTER) -#ifdef HAVE_INTRINSICS_H -# include -#endif - -typedef long long ticks; - -#define getticks _rtc - -INLINE_ELAPSED(inline) - -#define HAVE_TICK_COUNTER -#endif - -/*----------------------------------------------------------------*/ -/* MIPS ZBus */ -#if HAVE_MIPS_ZBUS_TIMER -#if defined(__mips__) && !defined(HAVE_TICK_COUNTER) -#include -#include -#include - -typedef uint64_t ticks; - -static inline ticks getticks(void) -{ - static uint64_t* addr = 0; - - if (addr == 0) - { - uint32_t rq_addr = 0x10030000; - int fd; - int pgsize; - - pgsize = getpagesize(); - fd = open ("/dev/mem", O_RDONLY | O_SYNC, 0); - if (fd < 0) { - perror("open"); - return NULL; - } - addr = mmap(0, pgsize, PROT_READ, MAP_SHARED, fd, rq_addr); - close(fd); - if (addr == (uint64_t *)-1) { - perror("mmap"); - return NULL; - } - } - - return *addr; -} - -INLINE_ELAPSED(inline) - -#define HAVE_TICK_COUNTER -#endif -#endif /* HAVE_MIPS_ZBUS_TIMER */ - -#if defined(HAVE_ARMV7A_CNTVCT) -typedef uint64_t ticks; -static inline ticks getticks(void) -{ - uint32_t Rt, Rt2 = 0; - asm volatile("mrrc p15, 1, %0, %1, c14" : "=r"(Rt), "=r"(Rt2)); - return ((uint64_t)Rt) | (((uint64_t)Rt2) << 32); -} -INLINE_ELAPSED(inline) -#define HAVE_TICK_COUNTER -#endif - -#if defined(HAVE_ARMV7A_PMCCNTR) -typedef uint64_t ticks; -static inline ticks getticks(void) -{ - uint32_t r; - asm volatile("mrc p15, 0, %0, c9, c13, 0" : "=r"(r) ); - return r; -} -INLINE_ELAPSED(inline) -#define HAVE_TICK_COUNTER -#endif - -#if defined(__aarch64__) && defined(HAVE_ARMV8_CNTVCT_EL0) && !defined(HAVE_ARMV8_PMCCNTR_EL0) -typedef uint64_t ticks; -static inline ticks getticks(void) -{ - uint64_t Rt; - asm volatile("mrs %0, CNTVCT_EL0" : "=r" (Rt)); - return Rt; -} -INLINE_ELAPSED(inline) -#define HAVE_TICK_COUNTER -#endif - -#if defined(__aarch64__) && defined(HAVE_ARMV8_PMCCNTR_EL0) -typedef uint64_t ticks; -static inline ticks getticks(void) -{ - uint64_t cc = 0; - asm volatile("mrs %0, PMCCNTR_EL0" : "=r"(cc)); - return cc; -} -INLINE_ELAPSED(inline) -#define HAVE_TICK_COUNTER -#endif diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt index bb5560b01..fbefe7165 100644 --- a/src/test/CMakeLists.txt +++ b/src/test/CMakeLists.txt @@ -2,9 +2,6 @@ add_definitions( -DQT_NO_CAST_TO_ASCII -DQT_NO_CAST_FROM_ASCII -DQT_NO_DATASTREAM - # for 3rd party source - -DTIME_WITH_SYS_TIME=1 - -DHAVE_SYS_TIME_H ) set(EXTRA_TEST_LIBS KtCore) @@ -30,8 +27,6 @@ include_directories( ${CMAKE_BINARY_DIR}/privateinclude ${CMAKE_BINARY_DIR}/include/QtCore ${CMAKE_BINARY_DIR}/include/QtTest - # for fftw - ${CMAKE_SOURCE_DIR}/src ) set(TEST_HEADERS diff --git a/src/test/qbenchmark.cpp b/src/test/qbenchmark.cpp index a02c8584b..c550a7c52 100644 --- a/src/test/qbenchmark.cpp +++ b/src/test/qbenchmark.cpp @@ -74,7 +74,7 @@ void QBenchmarkGlobalData::setMode(Mode mode) if (mode_ == EventCounter) { measurer = new QBenchmarkEvent; -#ifdef HAVE_TICK_COUNTER +#ifdef QT_HAVE_CLOCK_GETTIME } else if (mode_ == TickCounter) { measurer = new QBenchmarkTickMeasurer; #endif diff --git a/src/test/qbenchmarkmeasurement.cpp b/src/test/qbenchmarkmeasurement.cpp index 36048467f..c1b736b4c 100644 --- a/src/test/qbenchmarkmeasurement.cpp +++ b/src/test/qbenchmarkmeasurement.cpp @@ -72,7 +72,14 @@ QTest::QBenchmarkMetric QBenchmarkTimeMeasurer::metricType() return QTest::WalltimeMilliseconds; } -#ifdef HAVE_TICK_COUNTER // defined in 3rdparty/cycle_p.h +#ifdef QT_HAVE_CLOCK_GETTIME +static qint64 getticks() +{ + struct timespec ts; + if (::clock_gettime(CLOCK_PROCESS_CPUTIME_ID, &ts) == -1) + return 0; + return (ts.tv_sec * 1000000000) + ts.tv_nsec; +} void QBenchmarkTickMeasurer::start() { @@ -81,14 +88,12 @@ void QBenchmarkTickMeasurer::start() qint64 QBenchmarkTickMeasurer::checkpoint() { - ticks now = getticks(); - return qRound64(elapsed(now, startTicks)); + return (getticks() - startTicks); } qint64 QBenchmarkTickMeasurer::stop() { - ticks now = getticks(); - return qRound64(elapsed(now, startTicks)); + return (getticks() - startTicks); } bool QBenchmarkTickMeasurer::isMeasurementAccepted(qint64) @@ -105,7 +110,6 @@ QTest::QBenchmarkMetric QBenchmarkTickMeasurer::metricType() { return QTest::CPUTicks; } - #endif diff --git a/src/test/qbenchmarkmeasurement_p.h b/src/test/qbenchmarkmeasurement_p.h index 49e63902b..d4588b026 100644 --- a/src/test/qbenchmarkmeasurement_p.h +++ b/src/test/qbenchmarkmeasurement_p.h @@ -47,7 +47,6 @@ #include "qelapsedtimer.h" #include "qbenchmark.h" -#include "3rdparty/fftw/cycle.h" QT_BEGIN_NAMESPACE @@ -76,8 +75,7 @@ private: QElapsedTimer time; }; -#ifdef HAVE_TICK_COUNTER // defined in 3rdparty/cycle_p.h - +#ifdef QT_HAVE_CLOCK_GETTIME class QBenchmarkTickMeasurer : public QBenchmarkMeasurerBase { public: @@ -88,9 +86,8 @@ public: bool needsWarmupIteration(); QTest::QBenchmarkMetric metricType(); private: - ticks startTicks; + qint64 startTicks; }; - #endif QT_END_NAMESPACE diff --git a/src/test/qtestcase.cpp b/src/test/qtestcase.cpp index 923342516..661ac004f 100644 --- a/src/test/qtestcase.cpp +++ b/src/test/qtestcase.cpp @@ -52,7 +52,6 @@ #include "qtestresult_p.h" #include "qsignaldumper_p.h" #include "qbenchmark_p.h" -#include "3rdparty/fftw/cycle.h" #include #include @@ -1091,7 +1090,7 @@ Q_TEST_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) #endif "\n" " Benchmark related options:\n" -#ifdef HAVE_TICK_COUNTER +#ifdef QT_HAVE_CLOCK_GETTIME " -tickcounter : Use CPU tick counters to time benchmarks\n" #endif " -eventcounter : Counts events received during benchmarks\n" @@ -1179,7 +1178,7 @@ Q_TEST_EXPORT void qtest_qParseArgs(int argc, char *argv[], bool qml) #endif } else if (strcmp(argv[i], "-keyevent-verbose") == 0) { QTest::keyVerbose = 1; -#ifdef HAVE_TICK_COUNTER +#ifdef QT_HAVE_CLOCK_GETTIME } else if (strcmp(argv[i], "-tickcounter") == 0) { QBenchmarkGlobalData::current->setMode(QBenchmarkGlobalData::TickCounter); #endif