summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2004-02-27 21:02:29 (UTC)
committer mickeyl <mickeyl>2004-02-27 21:02:29 (UTC)
commita7f2e72eeb595c8f68d5af963ed6e00a4c3a4fe3 (patch) (side-by-side diff)
tree8b30c59362edb898e425ef7d6f9ee717d20c3e1e
parenta43a2e70536e9a47c0fee542c2c1ad5cc027fff4 (diff)
downloadopie-a7f2e72eeb595c8f68d5af963ed6e00a4c3a4fe3.zip
opie-a7f2e72eeb595c8f68d5af963ed6e00a4c3a4fe3.tar.gz
opie-a7f2e72eeb595c8f68d5af963ed6e00a4c3a4fe3.tar.bz2
convert text and gfx tests to using a fixed time of seconds. that makes
results more comparable between a broad range of machines
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.cpp88
-rw-r--r--noncore/settings/sysinfo/benchmarkinfo.h14
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
@@ -41,24 +41,27 @@
#include <stdio.h>
#include <stdlib.h>
#include <math.h>
#include "benchmarkinfo.h"
extern "C"
{
void BenchFFT( void );
double dhry_main( int );
}
+#define DHRYSTONE_RUNS 20000000
+#define TEST_DURATION 3
+
//===========================================================================
class BenchmarkPaintWidget : public QWidget
{
public:
BenchmarkPaintWidget() : QWidget( 0, "Benchmark Paint Widget", WStyle_Customize|WStyle_StaysOnTop|WPaintUnclipped|WPaintClever )
{
resize( QApplication::desktop()->size() );
show();
p.begin( this );
};
@@ -116,49 +119,47 @@ BenchmarkInfo::~BenchmarkInfo()
{}
void BenchmarkInfo::run()
{
startButton->setText( "> Don't touch! Running Tests! Don't touch! <" );
qApp->processEvents();
QTime t;
if ( test_alu->isOn() )
{
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 );
}
if ( test_fpu->isOn() )
{
t.start();
BenchFFT();
test_fpu->setText( 1, QString( "%1 secs" ).arg( QString::number( t.elapsed() / 1000.0 ) ) );
test_fpu->setOn( false );
}
if ( test_txt->isOn() )
{
- 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 );
}
if ( test_gfx->isOn() )
{
- 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 );
}
if ( test_ram->isOn() )
{
t.start();
writeFile( "/tmp/benchmarkFile.dat" ); // /tmp is supposed to be in RAM on a PDA
readFile( "/tmp/benchmarkFile.dat" );
QFile::remove( "/tmp/benchmarkFile.dat" );
test_ram->setText( 1, QString( "%1 secs" ).arg( QString::number( t.elapsed() / 1000.0 ) ) );
test_ram->setOn( false );
}
@@ -181,116 +182,119 @@ void BenchmarkInfo::run()
if ( ( which_clipb ) && ( buf.length() > 0 ) )
{
clb = QApplication::clipboard();
clb->setText( dt_buf + buf );
}
*/
startButton->setText( tr( "&Start Tests!" ) );
}
-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 };
int gg[] = { 0, 255, 0, 0, 255, 255, 0, 128, 128 };
int bb[] = { 0, 0, 255, 0, 0, 255, 255, 128, 0 };
const QString text( "Opie Benchmark Test" );
int w = QApplication::desktop()->width();
int h = QApplication::desktop()->height();
srand( time( NULL ) );
BenchmarkPaintWidget bpw;
- 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 )
{
int rr[] = { 255, 255, 255, 0, 0, 0, 0, 128, 128 };
int gg[] = { 0, 255, 0, 0, 255, 255, 0, 128, 128 };
int bb[] = { 0, 0, 255, 0, 0, 255, 255, 128, 0 };
int w = QApplication::desktop()->width();
int h = QApplication::desktop()->height();
srand( time( NULL ) );
BenchmarkPaintWidget bpw;
- 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 )
{
int k = rand() % 9;
bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
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 )
{
int k = rand() % 9;
bpw.p.setPen( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
bpw.p.drawArc( rand()%w, rand()%h, rand()%w, rand()%h, 360 * 16, 360 * 16 );
+ ++loops;
}
QBrush br1;
br1.setStyle( SolidPattern );
-
- for ( int i = 0; i < DRAW_TEST_ITERATIONS*2; ++i )
+ t.restart();
+ stop = t.elapsed() + seconds*1000;
+
+ while ( t.elapsed() < stop )
{
int k = rand() % 9;
br1.setColor( QColor( rr[ k ], gg[ k ], bb[ k ] ) );
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;
+
}
// **********************************************************************
// Read & Write
// v2.0.0
// **********************************************************************
#define BUFF_SIZE 8192
#define FILE_SIZE 1024 * 1024 // 1Mb
char FileBuf[ BUFF_SIZE + 1 ];
bool BenchmarkInfo::writeFile( const QString& w_path )
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
@@ -15,33 +15,24 @@
** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
**
**********************************************************************/
#include <qwidget.h>
#include <qdialog.h>
class QClipboard;
class QCheckListItem;
class QPushButton;
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
{
Q_OBJECT
public:
BenchmarkInfo( QWidget *parent = 0, const char *name = 0, int wFlags = 0 );
~BenchmarkInfo();
QCheckListItem* test_alu;
QCheckListItem* test_fpu;
QCheckListItem* test_txt;
QCheckListItem* test_gfx;
@@ -52,22 +43,21 @@ public:
bool main_rd;
bool main_wt;
bool sd_rd;
bool sd_wt;
bool cf_rd;
bool cf_wt;
QClipboard* clb;
QListView* tests;
QPushButton* startButton;
- void benchInteger() const;
- void paintChar();
- void paintLineRect();
+ int textRendering( int );
+ int gfxRendering( int );
bool writeFile( const QString& );
bool readFile( const QString& );
private slots:
void run();
};