ICU-9345 merged from ICU-9258 branch - add more perf tests

X-SVN-Rev: 31863
This commit is contained in:
Steven R. Loomis 2012-05-25 20:09:01 +00:00
parent 85312fdf16
commit 4600b80db6
2 changed files with 334 additions and 8 deletions

View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2011,International Business Machines
* Copyright (c) 2011-2012,International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -8,9 +8,15 @@
#include "sieve.h"
#include "unicode/utimer.h"
#include "udbgutil.h"
#include "unicode/ustring.h"
void runTests(void);
#ifndef ITERATIONS
#define ITERATIONS 5
#endif
FILE *out = NULL;
UErrorCode setupStatus = U_ZERO_ERROR;
@ -44,7 +50,9 @@ int main(int argc, const char* argv[]){
if(out!=NULL) {
#ifndef SKIP_INFO
udbg_writeIcuInfo(out);
#endif
fprintf(out, "</tests>\n");
fclose(out);
}
@ -68,6 +76,8 @@ protected:
*/
virtual int32_t run() = 0;
virtual void warmup() { run(); }
public:
virtual const char *getName() { return fName; }
public:
virtual int32_t runTest(double *subTime) {
UTimer a,b;
@ -80,7 +90,6 @@ public:
virtual int32_t runTests(double *subTime, double *marginOfError) {
warmup(); /* warmup */
#define ITERATIONS 5
double times[ITERATIONS];
int subIterations = 0;
for(int i=0;i<ITERATIONS;i++) {
@ -101,7 +110,8 @@ public:
};
void runTestOn(HowExpensiveTest &t) {
fprintf(stderr, "%s:%d: Running: %s\n", t.fFile, t.fLine, t.fName);
if(U_FAILURE(setupStatus)) return; // silently
fprintf(stderr, "%s:%d: Running: %s\n", t.fFile, t.fLine, t.getName());
double sieveTime = uprv_getSieveTime(NULL);
double st;
double me;
@ -109,16 +119,20 @@ void runTestOn(HowExpensiveTest &t) {
fflush(stdout);
fflush(stderr);
int32_t iter = t.runTests(&st,&me);
if(U_FAILURE(setupStatus)) {
fprintf(stderr, "Error in tests: %s\n", u_errorName(setupStatus));
return;
}
fflush(stdout);
fflush(stderr);
double stn = st/sieveTime;
printf("%s\t%.9f\t%.9f +/- %.9f, @ %d iter\n", t.fName,stn,st,me,iter);
printf("%s\t%.9f\t%.9f +/- %.9f, @ %d iter\n", t.getName(),stn,st,me,iter);
if(out!=NULL) {
fprintf(out, " <test name=\"%s\" standardizedTime=\"%f\" realDuration=\"%f\" marginOfError=\"%f\" iterations=\"%d\" />\n",
t.fName,stn,st,me,iter);
t.getName(),stn,st,me,iter);
fflush(out);
}
}
@ -151,20 +165,284 @@ public:
#define OpenCloseTest(n, svc,suffix,c,a,d) class OCName(svc,_,Test_,suffix,n) : public HowExpensiveTest { public: OCName(svc,_,Test_,suffix,n)():HowExpensiveTest(OCStr(svc,_,suffix,n),__FILE__,__LINE__) c int32_t run() { int32_t i; for(i=0;i<U_LOTS_OF_TIMES;i++){ OCRun(svc,_,close) ( OCRun(svc,_,suffix) a ); } return i; } void warmup() { OCRun(svc,_,close) ( OCRun(svc,_,suffix) a); } virtual ~ OCName(svc,_,Test_,suffix,n) () d };
#define QuickTest(n,c,r,d) class n : public HowExpensiveTest { public: n():HowExpensiveTest(#n,__FILE__,__LINE__) c int32_t run() r virtual ~n () d };
class NumTest : public HowExpensiveTest {
private:
double fExpect;
UNumberFormat *fFmt;
UnicodeString fPat;
UnicodeString fString;
const UChar *fStr;
int32_t fLen;
const char *fFile;
int fLine;
const char *fCPat;
const char *fCStr;
char name[100];
public:
virtual const char *getName() {
if(name[0]==0) {
sprintf(name,"%s:p=|%s|,str=|%s|",getClassName(),fCPat,fCStr);
}
return name;
}
protected:
virtual UNumberFormat* initFmt() {
return unum_open(UNUM_PATTERN_DECIMAL, fPat.getTerminatedBuffer(), 1, "en_US", 0, &setupStatus);
}
virtual const char *getClassName() {
return "NumTest";
}
public:
NumTest(const char *pat, const char *num, double expect, const char *FILE, int LINE)
: HowExpensiveTest("(n/a)",FILE, LINE),
fExpect(expect),
fFmt(0),
fPat(pat, -1, US_INV),
fString(num,-1,US_INV),
fStr(fString.getTerminatedBuffer()),
fLen(u_strlen(fStr)),
fFile(FILE),
fLine(LINE),
fCPat(pat),
fCStr(num)
{
name[0]=0;
}
void warmup() {
fFmt = initFmt();
if(U_SUCCESS(setupStatus)) {
double trial = unum_parseDouble(fFmt,fStr,fLen, NULL, &setupStatus);
if(U_SUCCESS(setupStatus) && trial!=fExpect) {
setupStatus = U_INTERNAL_PROGRAM_ERROR;
printf("%s:%d: warmup() %s got %.8f expected %.8f\n",
fFile,fLine,getName(),trial,fExpect);
}
}
}
int32_t run() {
double trial=0.0;
int i;
for(i=0;i<U_LOTS_OF_TIMES;i++){
trial = unum_parse(fFmt,fStr,fLen, NULL, &setupStatus);
}
return i;
}
virtual ~NumTest(){}
};
#define DO_NumTest(p,n,x) { NumTest t(p,n,x,__FILE__,__LINE__); runTestOn(t); }
class AttrNumTest : public NumTest
{
private:
UNumberFormatAttribute fAttr;
int32_t fAttrValue;
char name2[100];
protected:
virtual const char *getClassName() {
sprintf(name2,"AttrNumTest:%d=%d", fAttr,fAttrValue);
return name2;
}
public:
AttrNumTest(const char *pat, const char *num, double expect, const char *FILE, int LINE, UNumberFormatAttribute attr, int32_t newValue)
: NumTest(pat,num,expect,FILE,LINE),
fAttr(attr),
fAttrValue(newValue)
{
}
virtual UNumberFormat* initFmt() {
UNumberFormat *fmt = NumTest::initFmt();
unum_setAttribute(fmt, fAttr,fAttrValue);
return fmt;
}
};
#define DO_AttrNumTest(p,n,x,a,v) { AttrNumTest t(p,n,x,__FILE__,__LINE__,a,v); runTestOn(t); }
#define DO_TripleNumTest(p,n,x) DO_AttrNumTest(p,n,x,UNUM_PARSE_ALL_INPUT,UNUM_YES) \
DO_AttrNumTest(p,n,x,UNUM_PARSE_ALL_INPUT,UNUM_NO) \
DO_AttrNumTest(p,n,x,UNUM_PARSE_ALL_INPUT,UNUM_MAYBE)
class NumFmtTest : public HowExpensiveTest {
private:
double fExpect;
UNumberFormat *fFmt;
UnicodeString fPat;
UnicodeString fString;
const UChar *fStr;
int32_t fLen;
const char *fFile;
int fLine;
const char *fCPat;
const char *fCStr;
char name[100];
public:
virtual const char *getName() {
if(name[0]==0) {
sprintf(name,"%s:p=|%s|,str=|%s|",getClassName(),fCPat,fCStr);
}
return name;
}
protected:
virtual UNumberFormat* initFmt() {
return unum_open(UNUM_PATTERN_DECIMAL, fPat.getTerminatedBuffer(), 1, "en_US", 0, &setupStatus);
}
virtual const char *getClassName() {
return "NumFmtTest";
}
public:
NumFmtTest(const char *pat, const char *num, double expect, const char *FILE, int LINE)
: HowExpensiveTest("(n/a)",FILE, LINE),
fExpect(expect),
fFmt(0),
fPat(pat, -1, US_INV),
fString(num,-1,US_INV),
fStr(fString.getTerminatedBuffer()),
fLen(u_strlen(fStr)),
fFile(FILE),
fLine(LINE),
fCPat(pat),
fCStr(num)
{
name[0]=0;
}
void warmup() {
fFmt = initFmt();
UChar buf[100];
if(U_SUCCESS(setupStatus)) {
int32_t trial = unum_formatDouble(fFmt,fExpect, buf, 100, NULL, &setupStatus);
if(!U_SUCCESS(setupStatus)
|| trial!=fLen
||trial<=0
|| u_strncmp(fStr,buf,trial) ) {
char strBuf[200];
u_strToUTF8(strBuf,200,NULL,buf,trial+1,&setupStatus);
printf("%s:%d: warmup() %s got %s expected %s, err %s\n",
fFile,fLine,getName(),strBuf,fCStr, u_errorName(setupStatus));
setupStatus = U_INTERNAL_PROGRAM_ERROR;
}
}
}
int32_t run() {
int32_t trial;
int i;
UChar buf[100];
if(U_SUCCESS(setupStatus)) {
for(i=0;i<U_LOTS_OF_TIMES;i++){
trial = unum_formatDouble(fFmt,fExpect, buf, 100, NULL, &setupStatus);
}
}
return i;
}
virtual ~NumFmtTest(){}
};
#define DO_NumFmtTest(p,n,x) { NumFmtTest t(p,n,x,__FILE__,__LINE__); runTestOn(t); }
class NumFmtInt64Test : public HowExpensiveTest {
private:
int64_t fExpect;
UNumberFormat *fFmt;
UnicodeString fPat;
UnicodeString fString;
const UChar *fStr;
int32_t fLen;
const char *fFile;
int fLine;
const char *fCPat;
const char *fCStr;
char name[100];
public:
virtual const char *getName() {
if(name[0]==0) {
sprintf(name,"%s:p=|%s|,str=|%s|",getClassName(),fCPat,fCStr);
}
return name;
}
protected:
virtual UNumberFormat* initFmt() {
return unum_open(UNUM_PATTERN_DECIMAL, fPat.getTerminatedBuffer(), 1, "en_US", 0, &setupStatus);
}
virtual const char *getClassName() {
return "NumFmtInt64Test";
}
public:
NumFmtInt64Test(const char *pat, const char *num, int64_t expect, const char *FILE, int LINE)
: HowExpensiveTest("(n/a)",FILE, LINE),
fExpect(expect),
fFmt(0),
fPat(pat, -1, US_INV),
fString(num,-1,US_INV),
fStr(fString.getTerminatedBuffer()),
fLen(u_strlen(fStr)),
fFile(FILE),
fLine(LINE),
fCPat(pat),
fCStr(num)
{
name[0]=0;
}
void warmup() {
fFmt = initFmt();
UChar buf[100];
if(U_SUCCESS(setupStatus)) {
int32_t trial = unum_formatInt64(fFmt,fExpect, buf, 100, NULL, &setupStatus);
if(!U_SUCCESS(setupStatus)
|| trial!=fLen
||trial<=0
|| u_strncmp(fStr,buf,trial) ) {
char strBuf[200];
u_strToUTF8(strBuf,200,NULL,buf,trial+1,&setupStatus);
printf("%s:%d: warmup() %s got %s (len %d) expected %s (len %d), err %s\n",
fFile,fLine,getName(),strBuf,trial,fCStr,fLen, u_errorName(setupStatus));
setupStatus = U_INTERNAL_PROGRAM_ERROR;
}
}
}
int32_t run() {
int32_t trial;
int i;
UChar buf[100];
if(U_SUCCESS(setupStatus)) {
for(i=0;i<U_LOTS_OF_TIMES;i++){
trial = unum_formatInt64(fFmt,fExpect, buf, 100, NULL, &setupStatus);
}
}
return i;
}
virtual ~NumFmtInt64Test(){}
};
#define DO_NumFmtInt64Test(p,n,x) { NumFmtInt64Test t(p,n,x,__FILE__,__LINE__); runTestOn(t); }
// TODO: move, scope.
static UChar pattern[] = { 0x23 }; // '#'
static UChar strdot[] = { '2', '.', '0', 0 };
static UChar strspc[] = { '2', ' ', 0 };
static UChar strgrp[] = {'2',',','2','2','2', 0 };
static UChar strbeng[] = {0x09E8,0x09E8,0x09E8,0x09E8, 0 };
UNumberFormat *NumParseTest_fmt;
// TODO: de-uglify.
QuickTest(NumParseTest,{ static UChar pattern[] = { 0x23 }; NumParseTest_fmt = unum_open(UNUM_PATTERN_DECIMAL, pattern, 1, "en_US", 0, &setupStatus); },{ int32_t i; static UChar str[] = { 0x31 };double val; for(i=0;i<U_LOTS_OF_TIMES;i++) { val=unum_parse(NumParseTest_fmt,str,1,NULL,&setupStatus); } return i; },{unum_close(NumParseTest_fmt);})
QuickTest(NumParseTestdot,{ static UChar pattern[] = { 0x23 }; NumParseTest_fmt = unum_open(UNUM_PATTERN_DECIMAL, pattern, 1, "en_US", 0, &setupStatus); },{ int32_t i; double val; for(i=0;i<U_LOTS_OF_TIMES;i++) { val=unum_parse(NumParseTest_fmt,strdot,1,NULL,&setupStatus); } return i; },{unum_close(NumParseTest_fmt);})
QuickTest(NumParseTestspc,{ static UChar pattern[] = { 0x23 }; NumParseTest_fmt = unum_open(UNUM_PATTERN_DECIMAL, pattern, 1, "en_US", 0, &setupStatus); },{ int32_t i; double val; for(i=0;i<U_LOTS_OF_TIMES;i++) { val=unum_parse(NumParseTest_fmt,strspc,1,NULL,&setupStatus); } return i; },{unum_close(NumParseTest_fmt);})
QuickTest(NumParseTestgrp,{ static UChar pattern[] = { 0x23 }; NumParseTest_fmt = unum_open(UNUM_PATTERN_DECIMAL, pattern, 1, "en_US", 0, &setupStatus); },{ int32_t i; double val; for(i=0;i<U_LOTS_OF_TIMES;i++) { val=unum_parse(NumParseTest_fmt,strgrp,-1,NULL,&setupStatus); } return i; },{unum_close(NumParseTest_fmt);})
QuickTest(NumParseTestbeng,{ static UChar pattern[] = { 0x23 }; NumParseTest_fmt = unum_open(UNUM_PATTERN_DECIMAL, pattern, 1, "en_US", 0, &setupStatus); },{ int32_t i; double val; for(i=0;i<U_LOTS_OF_TIMES;i++) { val=unum_parse(NumParseTest_fmt,strbeng,-1,NULL,&setupStatus); } return i; },{unum_close(NumParseTest_fmt);})
QuickTest(NullTest,{},{int j=U_LOTS_OF_TIMES;while(--j);return U_LOTS_OF_TIMES;},{})
OpenCloseTest(pattern,unum,open,{},(UNUM_PATTERN_DECIMAL,pattern,1,"en_US",0,&setupStatus),{})
OpenCloseTest(default,unum,open,{},(UNUM_DEFAULT,NULL,-1,"en_US",0,&setupStatus),{})
#if !UCONFIG_NO_CONVERSION
#include "unicode/ucnv.h"
OpenCloseTest(gb18030,ucnv,open,{},("gb18030",&setupStatus),{})
#endif
#include "unicode/ures.h"
OpenCloseTest(root,ures,open,{},(NULL,"root",&setupStatus),{})
@ -177,18 +455,64 @@ void runTests() {
NullTest t;
runTestOn(t);
}
#ifndef SKIP_NUMPARSE_TESTS
{
NumParseTest t;
runTestOn(t);
// parse tests
DO_NumTest("#","0",0.0);
DO_NumTest("#","2.0",2.0);
DO_NumTest("#","2 ",2);
DO_NumTest("#","-2 ",-2);
DO_NumTest("+#","+2",2);
DO_NumTest("#,###.0","2222.0",2222.0);
DO_NumTest("#.0","1.000000000000000000000000000000000000000000000000000000000000000000000000000000",1.0);
// attr
#ifdef HAVE_UNUM_MAYBE
DO_AttrNumTest("#","0",0.0,UNUM_PARSE_ALL_INPUT,UNUM_YES);
DO_AttrNumTest("#","0",0.0,UNUM_PARSE_ALL_INPUT,UNUM_NO);
DO_AttrNumTest("#","0",0.0,UNUM_PARSE_ALL_INPUT,UNUM_MAYBE);
DO_TripleNumTest("#","2.0",2.0);
DO_AttrNumTest("#.0","1.000000000000000000000000000000000000000000000000000000000000000000000000000000",1.0,UNUM_PARSE_ALL_INPUT,UNUM_NO);
#endif
// { NumParseTestgrp t; runTestOn(t); }
{ NumParseTestbeng t; runTestOn(t); }
}
#endif
#ifndef SKIP_NUMFORMAT_TESTS
// format tests
{
DO_NumFmtTest("#","0",0.0);
DO_NumFmtTest("#","12345",12345);
DO_NumFmtTest("#","-2",-2);
DO_NumFmtTest("+#","+2",2);
DO_NumFmtInt64Test("#","-682",-682);
DO_NumFmtInt64Test("#","0",0);
DO_NumFmtInt64Test("#","12345",12345);
DO_NumFmtInt64Test("#","1234",1234);
DO_NumFmtInt64Test("#","123",123);
DO_NumFmtInt64Test("#","-2",-2);
DO_NumFmtInt64Test("+#","+2",2);
}
#endif
{
Test_unum_opendefault t;
runTestOn(t);
}
#if !UCONFIG_NO_CONVERSION
{
Test_ucnv_opengb18030 t;
runTestOn(t);
}
#endif
{
Test_unum_openpattern t;
runTestOn(t);

View File

@ -1,6 +1,6 @@
/*
**********************************************************************
* Copyright (c) 2011,International Business Machines
* Copyright (c) 2011-2012,International Business Machines
* Corporation and others. All Rights Reserved.
**********************************************************************
*/
@ -8,7 +8,9 @@
#ifndef SIEVE_H
#define SIEVE_H
#ifndef U_LOTS_OF_TIMES
#define U_LOTS_OF_TIMES 1000000
#endif
#include "unicode/utypes.h"
/**