| -rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.cpp | 88 | ||||
| -rw-r--r-- | noncore/settings/sysinfo/benchmarkinfo.h | 14 |
2 files changed, 48 insertions, 54 deletions
diff --git a/noncore/settings/sysinfo/benchmarkinfo.cpp b/noncore/settings/sysinfo/benchmarkinfo.cpp index 1d0b140..3dd4121 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.cpp +++ b/noncore/settings/sysinfo/benchmarkinfo.cpp @@ -52,2 +52,5 @@ extern "C" +#define DHRYSTONE_RUNS 20000000 +#define TEST_DURATION 3 + //=========================================================================== @@ -127,3 +130,3 @@ void BenchmarkInfo::run() int d = round( dhry_main( DHRYSTONE_RUNS ) ); - test_alu->setText( 1, QString( "%1 DHRYS" ).arg( QString::number( d ) ) ); + test_alu->setText( 1, QString( "%1 dhrys" ).arg( QString::number( d ) ) ); test_alu->setOn( false ); @@ -141,5 +144,4 @@ void BenchmarkInfo::run() { - t.start(); - paintChar(); - test_txt->setText( 1, QString( "%1 secs" ).arg( QString::number( t.elapsed() / 1000.0 ) ) ); + int value = textRendering( TEST_DURATION ); + test_txt->setText( 1, QString( "%1 chars/sec" ).arg( QString::number( value / TEST_DURATION ) ) ); test_txt->setOn( false ); @@ -149,5 +151,4 @@ void BenchmarkInfo::run() { - t.start(); - paintLineRect(); - test_gfx->setText( 1, QString( "%1 secs" ).arg( QString::number( t.elapsed() / 1000.0 ) ) ); + int value = gfxRendering( TEST_DURATION ); + test_gfx->setText( 1, QString( "%1 gops/sec" ).arg( QString::number( value / 4 / TEST_DURATION ) ) ); // 4 tests test_gfx->setOn( false ); @@ -192,29 +193,8 @@ void BenchmarkInfo::run() -void BenchmarkInfo::benchInteger() const +int BenchmarkInfo::textRendering( int seconds ) { - long dummy = 1; - - for ( long i= 0 ; i < INT_TEST_ITERATIONS ; i++ ) - { - for ( long j= 0 ; j < INT_TEST_ITERATIONS ; j++ ) - { - for( long k= 0 ; k < INT_TEST_ITERATIONS ; k++ ) - { - long xx = ( rand() % 1000 + 111 ) * 7 / 3 + 31; - long yy = ( rand() % 100 + 23 ) * 11 / 7 + 17; - long zz = ( rand() % 100 + 47 ) * 13 / 11 - 211; - dummy = xx * yy / zz; - dummy *= 23; - dummy += ( xx - yy + zz ); - dummy -= ( xx + yy - zz ); - dummy *= ( xx * zz * yy ); - dummy /= 1 + ( xx * yy * zz ); - } - } - } -} - + QTime t; + t.start(); + int stop = t.elapsed() + seconds * 1000; -void BenchmarkInfo::paintChar() -{ int rr[] = { 255, 255, 255, 0, 0, 0, 0, 128, 128 }; @@ -231,12 +211,18 @@ void BenchmarkInfo::paintChar() - for ( int i = 0; i < CHAR_TEST_ITERATIONS; ++i ) + int loops = 0; + + while ( t.elapsed() < stop ) { int k = rand() % 9; + int s = rand() % 100; bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) ); - bpw.p.setFont( QFont( "Vera", k*10 ) ); + bpw.p.setFont( QFont( "Vera", s ) ); bpw.p.drawText( rand() % w, rand() % h, text, text.length() ); + ++loops; } + + return loops * text.length(); } -void BenchmarkInfo::paintLineRect() +int BenchmarkInfo::gfxRendering( int seconds ) { @@ -253,3 +239,8 @@ void BenchmarkInfo::paintLineRect() - for ( int i = 0; i < DRAW_TEST_ITERATIONS*3; ++i ) + QTime t; + t.start(); + int stop = t.elapsed() + seconds*1000; + int loops = 0; + + while ( t.elapsed() < stop ) { @@ -258,5 +249,9 @@ void BenchmarkInfo::paintLineRect() bpw.p.drawLine( rand()%w, rand()%h, rand()%w, rand()%h ); + ++loops; } - for ( int i = 0; i < DRAW_TEST_ITERATIONS; ++i ) + t.restart(); + stop = t.elapsed() + seconds*1000; + + while ( t.elapsed() < stop ) { @@ -265,2 +260,3 @@ void BenchmarkInfo::paintLineRect() bpw.p.drawArc( rand()%w, rand()%h, rand()%w, rand()%h, 360 * 16, 360 * 16 ); + ++loops; } @@ -269,4 +265,6 @@ void BenchmarkInfo::paintLineRect() br1.setStyle( SolidPattern ); - - for ( int i = 0; i < DRAW_TEST_ITERATIONS*2; ++i ) + t.restart(); + stop = t.elapsed() + seconds*1000; + + while ( t.elapsed() < stop ) { @@ -275,11 +273,17 @@ void BenchmarkInfo::paintLineRect() bpw.p.fillRect( rand()%w, rand()%h, rand()%w, rand()%h, br1 ); + ++loops; } - QPixmap p = Resource::loadPixmap( "pattern" ); - for ( int i = 0; i < DRAW_TEST_ITERATIONS; ++i ) + QPixmap p = Resource::loadPixmap( "sysinfo/pattern" ); + t.restart(); + stop = t.elapsed() + seconds*1000; + + while ( t.elapsed() < stop ) { bpw.p.drawPixmap( rand()%w, rand()%h, p ); + ++loops; } - + return loops; + } diff --git a/noncore/settings/sysinfo/benchmarkinfo.h b/noncore/settings/sysinfo/benchmarkinfo.h index 2d994b4..55398eb 100644 --- a/noncore/settings/sysinfo/benchmarkinfo.h +++ b/noncore/settings/sysinfo/benchmarkinfo.h @@ -26,11 +26,2 @@ class QListView; -//#define INT_TEST_ITERATIONS 50 -//#define CHAR_TEST_ITERATIONS 15000 -//#define DRAW_TEST_ITERATIONS 5000 - -#define INT_TEST_ITERATIONS 50 -#define DHRYSTONE_RUNS 20000000 -#define CHAR_TEST_ITERATIONS 15000 -#define DRAW_TEST_ITERATIONS 5000 - class BenchmarkInfo : public QWidget @@ -63,5 +54,4 @@ public: - void benchInteger() const; - void paintChar(); - void paintLineRect(); + int textRendering( int ); + int gfxRendering( int ); bool writeFile( const QString& ); |