diff options
Diffstat (limited to 'CPP/7zip/UI/Common/Bench.cpp')
| -rw-r--r--[-rwxr-xr-x] | CPP/7zip/UI/Common/Bench.cpp | 1480 |
1 files changed, 1196 insertions, 284 deletions
diff --git a/CPP/7zip/UI/Common/Bench.cpp b/CPP/7zip/UI/Common/Bench.cpp index 5adfcc20..1b10ee26 100755..100644 --- a/CPP/7zip/UI/Common/Bench.cpp +++ b/CPP/7zip/UI/Common/Bench.cpp @@ -28,6 +28,7 @@ #include "../../../../C/7zCrc.h" #include "../../../../C/Alloc.h" +#include "../../../../C/CpuArch.h" #if !defined(_7ZIP_ST) || defined(_WIN32) #include "../../../Windows/System.h" @@ -43,24 +44,38 @@ #include "../../../Common/StringToInt.h" #include "../../Common/MethodProps.h" +#include "../../Common/StreamUtils.h" #include "Bench.h" using namespace NWindows; -static const UInt64 kUncompressMinBlockSize = -#ifdef UNDER_CE -(UInt64)1 << 30; -#else -(UInt64)1 << 33; -#endif +static const UInt64 kComplexInCommands = (UInt64)1 << + #ifdef UNDER_CE + 31; + #else + 34; + #endif -static const UInt32 kCrcBlockSize = -#ifdef UNDER_CE -1 << 25; -#else -1 << 30; -#endif +static const UInt64 kComplexInSeconds = 4; + +static void SetComplexCommands(UInt32 complexInSeconds, UInt64 cpuFreq, UInt64 &complexInCommands) +{ + complexInCommands = kComplexInCommands; + const UInt64 kMinFreq = (UInt64)1000000 * 30; + const UInt64 kMaxFreq = (UInt64)1000000 * 20000; + if (cpuFreq < kMinFreq) cpuFreq = kMinFreq; + if (cpuFreq < kMaxFreq) + { + if (complexInSeconds != 0) + complexInCommands = complexInSeconds * cpuFreq; + else + complexInCommands = cpuFreq >> 2; + } +} + +static const unsigned kNumHashDictBits = 17; +static const UInt32 kFilterUnpackSize = (48 << 10); static const unsigned kOldLzmaDictBits = 30; @@ -88,6 +103,7 @@ class CBenchBuffer public: size_t BufferSize; Byte *Buffer; + CBenchBuffer(): Buffer(0) {} virtual ~CBenchBuffer() { Free(); } void Free() @@ -102,7 +118,7 @@ public: Free(); Buffer = (Byte *)::MidAlloc(bufferSize); BufferSize = bufferSize; - return (Buffer != 0); + return (Buffer != 0 || bufferSize == 0); } }; @@ -122,6 +138,13 @@ public: UInt32 len = GetVal(res, 2); return GetVal(res, 1 + len); } + + void GenerateSimpleRandom() + { + for (UInt32 i = 0; i < BufferSize; i++) + Buffer[i] = (Byte)RG->GetRnd(); + } + void Generate(unsigned dictBits) { UInt32 pos = 0; @@ -202,9 +225,16 @@ class CBenchmarkOutStream: // bool _overflow; public: UInt32 Pos; + bool RealCopy; + bool CalcCrc; + UInt32 Crc; + // CBenchmarkOutStream(): _overflow(false) {} - void Init() + void Init(bool realCopy, bool calcCrc) { + Crc = CRC_INIT_VAL; + RealCopy = realCopy; + CalcCrc = calcCrc; // _overflow = false; Pos = 0; } @@ -217,7 +247,10 @@ STDMETHODIMP CBenchmarkOutStream::Write(const void *data, UInt32 size, UInt32 *p size_t curSize = BufferSize - Pos; if (curSize > size) curSize = size; - memcpy(Buffer + Pos, data, curSize); + if (RealCopy) + memcpy(Buffer + Pos, data, curSize); + if (CalcCrc) + Crc = CrcUpdate(Crc, data, curSize); Pos += (UInt32)curSize; if(processedSize != NULL) *processedSize = (UInt32)curSize; @@ -234,15 +267,19 @@ class CCrcOutStream: public CMyUnknownImp { public: + bool CalcCrc; UInt32 Crc; MY_UNKNOWN_IMP + + CCrcOutStream(): CalcCrc(true) {}; void Init() { Crc = CRC_INIT_VAL; } STDMETHOD(Write)(const void *data, UInt32 size, UInt32 *processedSize); }; STDMETHODIMP CCrcOutStream::Write(const void *data, UInt32 size, UInt32 *processedSize) { - Crc = CrcUpdate(Crc, data, size); + if (CalcCrc) + Crc = CrcUpdate(Crc, data, size); if (processedSize != NULL) *processedSize = size; return S_OK; @@ -369,25 +406,16 @@ public: } }; -class CBenchProgressInfo: - public ICompressProgressInfo, - public CMyUnknownImp +struct CBenchInfoCalc { -public: - CBenchProgressStatus *Status; CBenchInfo BenchInfo; CUserTime UserTime; - HRESULT Res; - IBenchCallback *Callback; - CBenchProgressInfo(): Callback(0) {} void SetStartTime(); void SetFinishTime(CBenchInfo &dest); - MY_UNKNOWN_IMP - STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize); }; -void CBenchProgressInfo::SetStartTime() +void CBenchInfoCalc::SetStartTime() { BenchInfo.GlobalFreq = GetFreq(); BenchInfo.UserFreq = GetUserFreq(); @@ -396,13 +424,28 @@ void CBenchProgressInfo::SetStartTime() UserTime.Init(); } -void CBenchProgressInfo::SetFinishTime(CBenchInfo &dest) +void CBenchInfoCalc::SetFinishTime(CBenchInfo &dest) { dest = BenchInfo; dest.GlobalTime = ::GetTimeCount() - BenchInfo.GlobalTime; dest.UserTime = UserTime.GetUserTime(); } +class CBenchProgressInfo: + public ICompressProgressInfo, + public CMyUnknownImp, + public CBenchInfoCalc +{ +public: + CBenchProgressStatus *Status; + HRESULT Res; + IBenchCallback *Callback; + + CBenchProgressInfo(): Callback(0) {} + MY_UNKNOWN_IMP + STDMETHOD(SetRatioInfo)(const UInt64 *inSize, const UInt64 *outSize); +}; + STDMETHODIMP CBenchProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 *outSize) { HRESULT res = Status->GetResult(); @@ -414,8 +457,8 @@ STDMETHODIMP CBenchProgressInfo::SetRatioInfo(const UInt64 *inSize, const UInt64 SetFinishTime(info); if (Status->EncodeMode) { - info.UnpackSize = *inSize; - info.PackSize = *outSize; + info.UnpackSize = BenchInfo.UnpackSize + *inSize; + info.PackSize = BenchInfo.PackSize + *outSize; res = Callback->SetEncodeResult(info, false); } else @@ -488,6 +531,11 @@ static UInt64 MyMultDiv64(UInt64 value, UInt64 elapsedTime, UInt64 freq) return value * freq / elTime; } +UInt64 CBenchInfo::GetSpeed(UInt64 numCommands) const +{ + return MyMultDiv64(numCommands, GlobalTime, GlobalFreq); +} + struct CBenchProps { bool LzmaRatingMode; @@ -499,19 +547,25 @@ struct CBenchProps CBenchProps(): LzmaRatingMode(false) {} void SetLzmaCompexity(); + UInt64 GeComprCommands(UInt64 unpackSize) + { + return unpackSize * EncComplex; + } + UInt64 GeDecomprCommands(UInt64 packSize, UInt64 unpackSize) { return (packSize * DecComplexCompr + unpackSize * DecComplexUnc); } UInt64 GetCompressRating(UInt32 dictSize, UInt64 elapsedTime, UInt64 freq, UInt64 size); - UInt64 GetDecompressRating(UInt64 elapsedTime, UInt64 freq, UInt64 outSize, UInt64 inSize, UInt32 numIterations); + UInt64 GetDecompressRating(UInt64 elapsedTime, UInt64 freq, UInt64 outSize, UInt64 inSize, UInt64 numIterations); }; void CBenchProps::SetLzmaCompexity() { + EncComplex = 1200; DecComplexUnc = 4; - DecComplexCompr = 200; + DecComplexCompr = 190; LzmaRatingMode = true; } @@ -529,7 +583,7 @@ UInt64 CBenchProps::GetCompressRating(UInt32 dictSize, UInt64 elapsedTime, UInt6 return MyMultDiv64(numCommands, elapsedTime, freq); } -UInt64 CBenchProps::GetDecompressRating(UInt64 elapsedTime, UInt64 freq, UInt64 outSize, UInt64 inSize, UInt32 numIterations) +UInt64 CBenchProps::GetDecompressRating(UInt64 elapsedTime, UInt64 freq, UInt64 outSize, UInt64 inSize, UInt64 numIterations) { UInt64 numCommands = (inSize * DecComplexCompr + outSize * DecComplexUnc) * numIterations; return MyMultDiv64(numCommands, elapsedTime, freq); @@ -542,7 +596,7 @@ UInt64 GetCompressRating(UInt32 dictSize, UInt64 elapsedTime, UInt64 freq, UInt6 return props.GetCompressRating(dictSize, elapsedTime, freq, size); } -UInt64 GetDecompressRating(UInt64 elapsedTime, UInt64 freq, UInt64 outSize, UInt64 inSize, UInt32 numIterations) +UInt64 GetDecompressRating(UInt64 elapsedTime, UInt64 freq, UInt64 outSize, UInt64 inSize, UInt64 numIterations) { CBenchProps props; props.SetLzmaCompexity(); @@ -557,14 +611,21 @@ struct CEncoderInfo NWindows::CThread thread[2]; UInt32 NumDecoderSubThreads; #endif - CMyComPtr<ICompressCoder> encoder; + CMyComPtr<ICompressCoder> _encoder; + CMyComPtr<ICompressFilter> _encoderFilter; CBenchProgressInfo *progressInfoSpec[2]; CMyComPtr<ICompressProgressInfo> progressInfo[2]; - UInt32 NumIterations; + UInt64 NumIterations; #ifdef USE_ALLOCA size_t AllocaSize; #endif + Byte _key[32]; + Byte _iv[16]; + Byte _psw[16]; + bool CheckCrc_Enc; + bool CheckCrc_Dec; + struct CDecoderInfo { CEncoderInfo *Encoder; @@ -576,7 +637,9 @@ struct CEncoderInfo }; CDecoderInfo decodersInfo[2]; - CMyComPtr<ICompressCoder> decoders[2]; + CMyComPtr<ICompressCoder> _decoders[2]; + CMyComPtr<ICompressFilter> _decoderFilter; + HRESULT Results[2]; CBenchmarkOutStream *outStreamSpec; CMyComPtr<ISequentialOutStream> outStream; @@ -586,8 +649,14 @@ struct CEncoderInfo UInt32 kBufferSize; UInt32 compressedSize; CBenchRandomGenerator rg; + CBenchBuffer rgCopy; // it must be 16-byte aligned !!! CBenchmarkOutStream *propStreamSpec; CMyComPtr<ISequentialOutStream> propStream; + + // for decode + COneMethodInfo _method; + UInt32 _uncompressedDataSize; + HRESULT Init( const COneMethodInfo &method, UInt32 uncompressedDataSize, @@ -596,20 +665,30 @@ struct CEncoderInfo HRESULT Encode(); HRESULT Decode(UInt32 decoderIndex); - CEncoderInfo(): outStreamSpec(0), callback(0), printCallback(0), propStreamSpec(0) {} + CEncoderInfo(): + CheckCrc_Enc(true), + CheckCrc_Dec(true), + outStreamSpec(0), callback(0), printCallback(0), propStreamSpec(0) {} #ifndef _7ZIP_ST static THREAD_FUNC_DECL EncodeThreadFunction(void *param) { + HRESULT res; CEncoderInfo *encoder = (CEncoderInfo *)param; - #ifdef USE_ALLOCA - alloca(encoder->AllocaSize); - #endif - HRESULT res = encoder->Encode(); - encoder->Results[0] = res; + try + { + #ifdef USE_ALLOCA + alloca(encoder->AllocaSize); + #endif + res = encoder->Encode(); + encoder->Results[0] = res; + } + catch(...) + { + res = E_FAIL; + } if (res != S_OK) encoder->progressInfoSpec[0]->Status->SetResult(res); - return 0; } static THREAD_FUNC_DECL DecodeThreadFunction(void *param) @@ -656,12 +735,24 @@ HRESULT CEncoderInfo::Init( { rg.Set(rgLoc); kBufferSize = uncompressedDataSize; - UInt32 kCompressedBufferSize = (kBufferSize - kBufferSize / 4) + kCompressedAdditionalSize; + UInt32 kCompressedBufferSize = + kBufferSize + kCompressedAdditionalSize; + // (kBufferSize - kBufferSize / 4) + kCompressedAdditionalSize; if (!rg.Alloc(kBufferSize)) return E_OUTOFMEMORY; - rg.Generate(generateDictBits); + if (generateDictBits == 0) + rg.GenerateSimpleRandom(); + else + rg.Generate(generateDictBits); crc = CrcCalc(rg.Buffer, rg.BufferSize); + if (_encoderFilter) + { + if (!rgCopy.Alloc(rg.BufferSize)) + return E_OUTOFMEMORY; + } + + outStreamSpec = new CBenchmarkOutStream; if (!outStreamSpec->Alloc(kCompressedBufferSize)) return E_OUTOFMEMORY; @@ -676,12 +767,17 @@ HRESULT CEncoderInfo::Init( } if (!propStreamSpec->Alloc(kMaxLzmaPropSize)) return E_OUTOFMEMORY; - propStreamSpec->Init(); + propStreamSpec->Init(true, false); + CMyComPtr<IUnknown> coder; + if (_encoderFilter) + coder = _encoderFilter; + else + coder = _encoder; { CMyComPtr<ICompressSetCoderProperties> scp; - encoder.QueryInterface(IID_ICompressSetCoderProperties, &scp); + coder.QueryInterface(IID_ICompressSetCoderProperties, &scp); if (scp) { UInt64 reduceSize = uncompressedDataSize; @@ -690,29 +786,111 @@ HRESULT CEncoderInfo::Init( else { if (method.AreThereNonOptionalProps()) - return E_FAIL; + return E_INVALIDARG; } CMyComPtr<ICompressWriteCoderProperties> writeCoderProps; - encoder.QueryInterface(IID_ICompressWriteCoderProperties, &writeCoderProps); + coder.QueryInterface(IID_ICompressWriteCoderProperties, &writeCoderProps); if (writeCoderProps) { RINOK(writeCoderProps->WriteCoderProperties(propStream)); } + + { + CMyComPtr<ICryptoSetPassword> sp; + coder.QueryInterface(IID_ICryptoSetPassword, &sp); + if (sp) + { + RINOK(sp->CryptoSetPassword(_psw, sizeof(_psw))); + + // we must call encoding one time to calculate password key for key cache. + // it must be after WriteCoderProperties! + CBenchmarkInStream *inStreamSpec = new CBenchmarkInStream; + CMyComPtr<ISequentialInStream> inStream = inStreamSpec; + Byte temp[16]; + memset(temp, 0, sizeof(temp)); + inStreamSpec->Init(temp, sizeof(temp)); + + CCrcOutStream *outStreamSpec = new CCrcOutStream; + CMyComPtr<ISequentialOutStream> outStream = outStreamSpec; + outStreamSpec->Init(); + + if (_encoderFilter) + { + _encoderFilter->Init(); + _encoderFilter->Filter(temp, sizeof(temp)); + } + else + { + RINOK(_encoder->Code(inStream, outStream, 0, 0, NULL)); + } + } + } + } return S_OK; } HRESULT CEncoderInfo::Encode() { + CBenchInfo &bi = progressInfoSpec[0]->BenchInfo; + bi.UnpackSize = 0; + bi.PackSize = 0; + CMyComPtr<ICryptoProperties> cp; + CMyComPtr<IUnknown> coder; + if (_encoderFilter) + coder = _encoderFilter; + else + coder = _encoder; + coder.QueryInterface(IID_ICryptoProperties, &cp); CBenchmarkInStream *inStreamSpec = new CBenchmarkInStream; CMyComPtr<ISequentialInStream> inStream = inStreamSpec; - inStreamSpec->Init(rg.Buffer, rg.BufferSize); - outStreamSpec->Init(); + UInt64 prev = 0; + + UInt32 crcPrev = 0; + + if (cp) + { + RINOK(cp->SetKey(_key, sizeof(_key))); + RINOK(cp->SetInitVector(_iv, sizeof(_iv))); + } - RINOK(encoder->Code(inStream, outStream, 0, 0, progressInfo[0])); - compressedSize = outStreamSpec->Pos; - encoder.Release(); + for (UInt64 i = 0; i < NumIterations; i++) + { + if (printCallback && bi.UnpackSize - prev > (1 << 20)) + { + RINOK(printCallback->CheckBreak()); + prev = bi.UnpackSize; + } + + bool isLast = (i == NumIterations - 1); + bool calcCrc = ((isLast || (i & 0x7F) == 0 || CheckCrc_Enc) && NumIterations != 1); + outStreamSpec->Init(isLast, calcCrc); + + if (_encoderFilter) + { + memcpy(rgCopy.Buffer, rg.Buffer, rg.BufferSize); + _encoderFilter->Init(); + _encoderFilter->Filter(rgCopy.Buffer, (UInt32)rg.BufferSize); + RINOK(WriteStream(outStream, rgCopy.Buffer, rg.BufferSize)); + } + else + { + inStreamSpec->Init(rg.Buffer, rg.BufferSize); + RINOK(_encoder->Code(inStream, outStream, 0, 0, progressInfo[0])); + } + + UInt32 crcNew = CRC_GET_DIGEST(outStreamSpec->Crc); + if (i == 0) + crcPrev = crcNew; + else if (calcCrc && crcPrev != crcNew) + return E_FAIL; + compressedSize = outStreamSpec->Pos; + bi.UnpackSize += rg.BufferSize; + bi.PackSize += compressedSize; + } + _encoder.Release(); + _encoderFilter.Release(); return S_OK; } @@ -720,10 +898,19 @@ HRESULT CEncoderInfo::Decode(UInt32 decoderIndex) { CBenchmarkInStream *inStreamSpec = new CBenchmarkInStream; CMyComPtr<ISequentialInStream> inStream = inStreamSpec; - CMyComPtr<ICompressCoder> &decoder = decoders[decoderIndex]; + CMyComPtr<ICompressCoder> &decoder = _decoders[decoderIndex]; + CMyComPtr<IUnknown> coder; + if (_decoderFilter) + { + if (decoderIndex != 0) + return E_FAIL; + coder = _decoderFilter; + } + else + coder = decoder; CMyComPtr<ICompressSetDecoderProperties2> setDecProps; - decoder.QueryInterface(IID_ICompressSetDecoderProperties2, &setDecProps); + coder.QueryInterface(IID_ICompressSetDecoderProperties2, &setDecProps); if (!setDecProps && propStreamSpec->Pos != 0) return E_FAIL; @@ -737,7 +924,7 @@ HRESULT CEncoderInfo::Decode(UInt32 decoderIndex) #ifndef _7ZIP_ST { CMyComPtr<ICompressSetCoderMt> setCoderMt; - decoder.QueryInterface(IID_ICompressSetCoderMt, &setCoderMt); + coder.QueryInterface(IID_ICompressSetCoderMt, &setCoderMt); if (setCoderMt) { RINOK(setCoderMt->SetNumberOfThreads(NumDecoderSubThreads)); @@ -745,27 +932,72 @@ HRESULT CEncoderInfo::Decode(UInt32 decoderIndex) } #endif - for (UInt32 j = 0; j < NumIterations; j++) + CMyComPtr<ICompressSetCoderProperties> scp; + coder.QueryInterface(IID_ICompressSetCoderProperties, &scp); + if (scp) { - if (printCallback) + UInt64 reduceSize = _uncompressedDataSize; + RINOK(_method.SetCoderProps(scp, &reduceSize)); + } + + CMyComPtr<ICryptoProperties> cp; + coder.QueryInterface(IID_ICryptoProperties, &cp); + + if (setDecProps) + { + RINOK(setDecProps->SetDecoderProperties2(propStreamSpec->Buffer, propStreamSpec->Pos)); + } + + { + CMyComPtr<ICryptoSetPassword> sp; + coder.QueryInterface(IID_ICryptoSetPassword, &sp); + if (sp) + { + RINOK(sp->CryptoSetPassword(_psw, sizeof(_psw))); + } + } + + UInt64 prev = 0; + + if (cp) + { + RINOK(cp->SetKey(_key, sizeof(_key))); + RINOK(cp->SetInitVector(_iv, sizeof(_iv))); + } + + for (UInt64 i = 0; i < NumIterations; i++) + { + if (printCallback && pi->BenchInfo.UnpackSize - prev > (1 << 20)) { RINOK(printCallback->CheckBreak()); + prev = pi->BenchInfo.UnpackSize; } + inStreamSpec->Init(outStreamSpec->Buffer, compressedSize); crcOutStreamSpec->Init(); - if (setDecProps) + UInt64 outSize = kBufferSize; + crcOutStreamSpec->CalcCrc = ((i & 0x7F) == 0 || CheckCrc_Dec); + if (_decoderFilter) { - RINOK(setDecProps->SetDecoderProperties2(propStreamSpec->Buffer, propStreamSpec->Pos)); + if (compressedSize > rgCopy.BufferSize) + return E_FAIL; + memcpy(rgCopy.Buffer, outStreamSpec->Buffer, compressedSize); + _decoderFilter->Init(); + _decoderFilter->Filter(rgCopy.Buffer, compressedSize); + RINOK(WriteStream(crcOutStream, rgCopy.Buffer, rg.BufferSize)); } - UInt64 outSize = kBufferSize; - RINOK(decoder->Code(inStream, crcOutStream, 0, &outSize, progressInfo[decoderIndex])); - if (CRC_GET_DIGEST(crcOutStreamSpec->Crc) != crc) + else + { + RINOK(decoder->Code(inStream, crcOutStream, 0, &outSize, progressInfo[decoderIndex])); + } + if (crcOutStreamSpec->CalcCrc && CRC_GET_DIGEST(crcOutStreamSpec->Crc) != crc) return S_FALSE; pi->BenchInfo.UnpackSize += kBufferSize; pi->BenchInfo.PackSize += compressedSize; } decoder.Release(); + _decoderFilter.Release(); return S_OK; } @@ -778,8 +1010,17 @@ struct CBenchEncoders ~CBenchEncoders() { delete []encoders; } }; +static UInt64 GetNumIterations(UInt64 numCommands, UInt64 complexInCommands) +{ + if (numCommands < (1 << 4)) + numCommands = (1 << 4); + UInt64 res = complexInCommands / numCommands; + return (res == 0 ? 1 : res); +} + static HRESULT MethodBench( DECL_EXTERNAL_CODECS_LOC_VARS + UInt64 complexInCommands, bool oldLzmaBenchMode, UInt32 numThreads, const COneMethodInfo &method2, @@ -819,9 +1060,6 @@ static HRESULT MethodBench( } #endif - if (numThreads < 1 || numEncoderThreads > kNumThreadsMax) - return E_INVALIDARG; - CBenchEncoders encodersSpec(numEncoderThreads); CEncoderInfo *encoders = encodersSpec.encoders; @@ -832,13 +1070,27 @@ static HRESULT MethodBench( encoder.callback = (i == 0) ? callback : 0; encoder.printCallback = printCallback; - RINOK(CreateCoder(EXTERNAL_CODECS_LOC_VARS methodId, encoder.encoder, true)); - if (!encoder.encoder) + CMyComPtr<ICompressCoder2> coder2; + RINOK(CreateCoder(EXTERNAL_CODECS_LOC_VARS methodId, + encoder._encoderFilter, encoder._encoder, coder2, true, false)); + if (!encoder._encoder && !encoder._encoderFilter) return E_NOTIMPL; + // encoder._encoderFilter.Release(); // we can disable filter to check the speed of FilterCoder. + + encoder.CheckCrc_Enc = (benchProps->EncComplex) > 30 ; + encoder.CheckCrc_Dec = (benchProps->DecComplexCompr + benchProps->DecComplexUnc) > 30 ; + + memset(encoder._iv, 0, sizeof(encoder._iv)); + memset(encoder._key, 0, sizeof(encoder._key)); + memset(encoder._psw, 0, sizeof(encoder._psw)); + for (UInt32 j = 0; j < numSubDecoderThreads; j++) { - RINOK(CreateCoder(EXTERNAL_CODECS_LOC_VARS methodId, encoder.decoders[j], false)); - if (!encoder.decoders[j]) + CMyComPtr<ICompressCoder2> coder2de; + CMyComPtr<ICompressCoder> &decoder = encoder._decoders[j]; + RINOK(CreateCoder(EXTERNAL_CODECS_LOC_VARS methodId, + encoder._decoderFilter, decoder, coder2de, false, false)); + if (!encoder._decoderFilter && !decoder) return E_NOTIMPL; } } @@ -847,6 +1099,9 @@ static HRESULT MethodBench( rg.Init(); for (i = 0; i < numEncoderThreads; i++) { + CEncoderInfo &encoder = encoders[i]; + encoder._method = method; + encoder._uncompressedDataSize = uncompressedDataSize; RINOK(encoders[i].Init(method, uncompressedDataSize, generateDictBits, &rg)); } @@ -857,10 +1112,14 @@ static HRESULT MethodBench( for (i = 0; i < numEncoderThreads; i++) { CEncoderInfo &encoder = encoders[i]; + encoder.NumIterations = GetNumIterations(benchProps->GeComprCommands(uncompressedDataSize), complexInCommands); + for (int j = 0; j < 2; j++) { - encoder.progressInfo[j] = encoder.progressInfoSpec[j] = new CBenchProgressInfo; - encoder.progressInfoSpec[j]->Status = &status; + CBenchProgressInfo *spec = new CBenchProgressInfo; + encoder.progressInfoSpec[j] = spec; + encoder.progressInfo[j] = spec; + spec->Status = &status; } if (i == 0) { @@ -897,7 +1156,7 @@ static HRESULT MethodBench( encoders[0].progressInfoSpec[0]->SetFinishTime(info); info.UnpackSize = 0; info.PackSize = 0; - info.NumIterations = 1; // progressInfoSpec->NumIterations; + info.NumIterations = encoders[0].NumIterations; for (i = 0; i < numEncoderThreads; i++) { CEncoderInfo &encoder = encoders[i]; @@ -917,8 +1176,7 @@ static HRESULT MethodBench( if (i == 0) { - encoder.NumIterations = (UInt32)(1 + kUncompressMinBlockSize / - benchProps->GeDecomprCommands(encoder.compressedSize, encoder.kBufferSize)); + encoder.NumIterations = GetNumIterations(benchProps->GeDecomprCommands(encoder.compressedSize, encoder.kBufferSize), complexInCommands); CBenchProgressInfo *bpi = encoder.progressInfoSpec[0]; bpi->Callback = callback; bpi->BenchInfo.NumIterations = numDecoderThreads; @@ -1018,23 +1276,123 @@ UInt64 GetBenchMemoryUsage(UInt32 numThreads, UInt32 dictionary) GetLZMAUsage((numThreads > 1), dictionary) + (2 << 20)) * numBigThreads; } -static bool CrcBig(const void *data, UInt32 size, UInt32 numCycles, UInt32 crcBase) +static HRESULT CrcBig(const void *data, UInt32 size, UInt64 numIterations, + const UInt32 *checkSum, IHasher *hf, + IBenchPrintCallback *callback) { - for (UInt32 i = 0; i < numCycles; i++) - if (CrcCalc(data, size) != crcBase) - return false; - return true; + Byte hash[64]; + UInt64 i; + for (i = 0; i < sizeof(hash); i++) + hash[i] = 0; + for (i = 0; i < numIterations; i++) + { + if (callback && (i & 0xFF) == 0) + { + RINOK(callback->CheckBreak()); + } + hf->Init(); + hf->Update(data, size); + hf->Final(hash); + UInt32 hashSize = hf->GetDigestSize(); + if (hashSize > sizeof(hash)) + return S_FALSE; + UInt32 sum = 0; + for (UInt32 j = 0; j < hashSize; j += 4) + sum ^= GetUi32(hash + j); + if (checkSum && sum != *checkSum) + { + // printf(" %08X ", sum); + return S_FALSE; + } + } + return S_OK; +} + +UInt32 g_BenchCpuFreqTemp = 1; + +#define YY1 sum += val; sum ^= val; +#define YY3 YY1 YY1 YY1 YY1 +#define YY5 YY3 YY3 YY3 YY3 +#define YY7 YY5 YY5 YY5 YY5 +static const UInt32 kNumFreqCommands = 128; + +static UInt32 CountCpuFreq(UInt32 num, UInt32 val) +{ + UInt32 sum = 0; + for (UInt32 i = 0; i < num; i++) + { + YY7 + } + return sum; } #ifndef _7ZIP_ST + +struct CFreqInfo +{ + NWindows::CThread Thread; + IBenchPrintCallback *Callback; + HRESULT CallbackRes; + UInt32 ValRes; + UInt32 Size; + UInt64 NumIterations; + + void Wait() + { + Thread.Wait(); + Thread.Close(); + } +}; + +static THREAD_FUNC_DECL FreqThreadFunction(void *param) +{ + CFreqInfo *p = (CFreqInfo *)param; + + UInt32 sum = g_BenchCpuFreqTemp; + for (UInt64 k = p->NumIterations; k > 0; k--) + { + p->CallbackRes = p->Callback->CheckBreak(); + if (p->CallbackRes != S_OK) + return 0; + sum = CountCpuFreq(p->Size, sum); + } + p->ValRes = sum; + return 0; +} + +struct CFreqThreads +{ + CFreqInfo *Items; + UInt32 NumThreads; + + CFreqThreads(): Items(0), NumThreads(0) {} + void WaitAll() + { + for (UInt32 i = 0; i < NumThreads; i++) + Items[i].Wait(); + NumThreads = 0; + } + ~CFreqThreads() + { + WaitAll(); + delete []Items; + } +}; + struct CCrcInfo { NWindows::CThread Thread; + IBenchPrintCallback *Callback; + HRESULT CallbackRes; + const Byte *Data; UInt32 Size; - UInt32 NumCycles; - UInt32 Crc; - bool Res; + UInt64 NumIterations; + bool CheckSumDefined; + UInt32 CheckSum; + CMyComPtr<IHasher> Hasher; + HRESULT Res; + void Wait() { Thread.Wait(); @@ -1045,14 +1403,17 @@ struct CCrcInfo static THREAD_FUNC_DECL CrcThreadFunction(void *param) { CCrcInfo *p = (CCrcInfo *)param; - p->Res = CrcBig(p->Data, p->Size, p->NumCycles, p->Crc); + p->Res = CrcBig(p->Data, p->Size, p->NumIterations, + p->CheckSumDefined ? &p->CheckSum : NULL, p->Hasher, + p->Callback); return 0; } struct CCrcThreads { - UInt32 NumThreads; CCrcInfo *Items; + UInt32 NumThreads; + CCrcThreads(): Items(0), NumThreads(0) {} void WaitAll() { @@ -1066,6 +1427,7 @@ struct CCrcThreads delete []Items; } }; + #endif static UInt32 CrcCalc1(const Byte *buf, UInt32 size) @@ -1112,70 +1474,9 @@ bool CrcInternalTest() return true; } -static HRESULT CrcBench(UInt32 numThreads, UInt32 bufferSize, UInt64 &speed) -{ - if (numThreads == 0) - numThreads = 1; - - CBenchBuffer buffer; - size_t totalSize = (size_t)bufferSize * numThreads; - if (totalSize / numThreads != bufferSize) - return E_OUTOFMEMORY; - if (!buffer.Alloc(totalSize)) - return E_OUTOFMEMORY; - - Byte *buf = buffer.Buffer; - CBaseRandomGenerator RG; - UInt32 numCycles = (kCrcBlockSize) / ((bufferSize >> 2) + 1) + 1; - - UInt64 timeVal; - #ifndef _7ZIP_ST - CCrcThreads threads; - if (numThreads > 1) - { - threads.Items = new CCrcInfo[numThreads]; - UInt32 i; - for (i = 0; i < numThreads; i++) - { - CCrcInfo &info = threads.Items[i]; - Byte *data = buf + (size_t)bufferSize * i; - info.Data = data; - info.NumCycles = numCycles; - info.Size = bufferSize; - info.Crc = RandGenCrc(data, bufferSize, RG); - } - timeVal = GetTimeCount(); - for (i = 0; i < numThreads; i++) - { - CCrcInfo &info = threads.Items[i]; - RINOK(info.Thread.Create(CrcThreadFunction, &info)); - threads.NumThreads++; - } - threads.WaitAll(); - for (i = 0; i < numThreads; i++) - if (!threads.Items[i].Res) - return S_FALSE; - } - else - #endif - { - UInt32 crc = RandGenCrc(buf, bufferSize, RG); - timeVal = GetTimeCount(); - if (!CrcBig(buf, bufferSize, numCycles, crc)) - return S_FALSE; - } - timeVal = GetTimeCount() - timeVal; - if (timeVal == 0) - timeVal = 1; - - UInt64 size = (UInt64)numCycles * totalSize; - speed = MyMultDiv64(size, timeVal, GetFreq()); - return S_OK; -} - struct CBenchMethod { - unsigned dictBits; + unsigned DictBits; UInt32 EncComplex; UInt32 DecComplexCompr; UInt32 DecComplexUnc; @@ -1184,21 +1485,39 @@ struct CBenchMethod static const CBenchMethod g_Bench[] = { - { 17, 340, 155, 20, "LZMA:x1" }, - { 24, 1182, 155, 20, "LZMA:x5:mt1" }, - { 24, 1182, 155, 20, "LZMA:x5:mt2" }, - { 16, 124, 47, 14, "Deflate:x1" }, - { 16, 376, 47, 14, "Deflate:x5" }, - { 16, 1084, 47, 14, "Deflate:x7" }, - { 17, 420, 47, 14, "Deflate64:x5" }, - { 15, 590, 69, 70, "BZip2:x1" }, - { 19, 792, 119, 119, "BZip2:x5" }, - #ifndef UNDER_CE - { 19, 792, 119, 119, "BZip2:x5:mt2" }, - #endif - { 19, 2500, 118, 118, "BZip2:x7" }, - { 18, 1010, 0, 1155, "PPMD:x1" }, - { 22, 1650, 0, 1830, "PPMD:x5" } + { 17, 357, 145, 20, "LZMA:x1" }, + { 24, 1220, 145, 20, "LZMA:x5:mt1" }, + { 24, 1220, 145, 20, "LZMA:x5:mt2" }, + { 16, 124, 40, 14, "Deflate:x1" }, + { 16, 376, 40, 14, "Deflate:x5" }, + { 16, 1082, 40, 14, "Deflate:x7" }, + { 17, 422, 40, 14, "Deflate64:x5" }, + { 15, 590, 69, 69, "BZip2:x1" }, + { 19, 815, 122, 122, "BZip2:x5" }, + { 19, 815, 122, 122, "BZip2:x5:mt2" }, + { 19, 2530, 122, 122, "BZip2:x7" }, + { 18, 1010, 0, 1150, "PPMD:x1" }, + { 22, 1655, 0, 1830, "PPMD:x5" }, + { 0, 6, 0, 6, "Delta:4" }, + { 0, 4, 0, 4, "BCJ" }, + { 0, 24, 0, 24, "AES256CBC:1" }, + { 0, 8, 0, 2, "AES256CBC:2" } +}; + +struct CBenchHash +{ + UInt32 Complex; + UInt32 CheckSum; + const char *Name; +}; + +static const CBenchHash g_Hash[] = +{ + { 558, 0x8F8FEDAB, "CRC32:4" }, + { 339, 0x8F8FEDAB, "CRC32:8" }, + { 512, 0xDF1C17CC, "CRC64" }, + { 11900, 0x2D79FF2E, "SHA256" }, + { 5230, 0x4C25132B, "SHA1" } }; struct CTotalBenchRes @@ -1208,31 +1527,22 @@ struct CTotalBenchRes UInt64 Usage; UInt64 RPU; void Init() { NumIterations = 0; Rating = 0; Usage = 0; RPU = 0; } - void Normalize() + void SetSum(const CTotalBenchRes &r1, const CTotalBenchRes &r2) { - if (NumIterations == 0) - return; - Rating /= NumIterations; - Usage /= NumIterations; - RPU /= NumIterations; - NumIterations = 1; - } - void SetMid(const CTotalBenchRes &r1, const CTotalBenchRes &r2) - { - Rating = (r1.Rating + r2.Rating) / 2; - Usage = (r1.Usage + r2.Usage) / 2; - RPU = (r1.RPU + r2.RPU) / 2; - NumIterations = (r1.NumIterations + r2.NumIterations) / 2; + Rating = (r1.Rating + r2.Rating); + Usage = (r1.Usage + r2.Usage); + RPU = (r1.RPU + r2.RPU); + NumIterations = (r1.NumIterations + r2.NumIterations); } }; -static void PrintNumber(IBenchPrintCallback &f, UInt64 value, int size, bool withSpace = true) +static void PrintNumber(IBenchPrintCallback &f, UInt64 value, int size) { char s[128]; int startPos = (int)sizeof(s) - 32; memset(s, ' ', startPos); ConvertUInt64ToString(value, s + startPos); - if (withSpace) + // if (withSpace) { startPos--; size++; @@ -1247,45 +1557,106 @@ static void PrintNumber(IBenchPrintCallback &f, UInt64 value, int size, bool wit f.Print(s + startPos); } -static void PrintRating(IBenchPrintCallback &f, UInt64 rating) +static const int kFieldSize_Name = 12; +static const int kFieldSize_SmallName = 4; +static const int kFieldSize_Speed = 9; +static const int kFieldSize_Usage = 5; +static const int kFieldSize_RU = 6; +static const int kFieldSize_Rating = 6; +static const int kFieldSize_EU = 5; +static const int kFieldSize_Effec = 5; + +static const int kFieldSize_TotalSize = 4 + kFieldSize_Speed + kFieldSize_Usage + kFieldSize_RU + kFieldSize_Rating; +static const int kFieldSize_EUAndEffec = 2 + kFieldSize_EU + kFieldSize_Effec; + + +static void PrintRating(IBenchPrintCallback &f, UInt64 rating, int size) +{ + PrintNumber(f, (rating + 500000) / 1000000, size); +} + + +static void PrintPercents(IBenchPrintCallback &f, UInt64 val, UInt64 divider, int size) +{ + PrintNumber(f, (val * 100 + divider / 2) / divider, size); +} + +static void PrintChars(IBenchPrintCallback &f, char c, int size) { - PrintNumber(f, rating / 1000000, 6); + char s[256]; + memset(s, (Byte)c, size); + s[size] = 0; + f.Print(s); } -static void PrintResults(IBenchPrintCallback &f, UInt64 usage, UInt64 rpu, UInt64 rating) +static void PrintSpaces(IBenchPrintCallback &f, int size) { - PrintNumber(f, (usage + 5000) / 10000, 5); - PrintRating(f, rpu); - PrintRating(f, rating); + PrintChars(f, ' ', size); } -static void PrintResults(IBenchPrintCallback &f, const CBenchInfo &info, UInt64 rating, CTotalBenchRes &res) +static void PrintResults(IBenchPrintCallback &f, UInt64 usage, UInt64 rpu, UInt64 rating, bool showFreq, UInt64 cpuFreq) { - UInt64 speed = MyMultDiv64(info.UnpackSize, info.GlobalTime, info.GlobalFreq); - PrintNumber(f, speed / 1024, 7); + PrintNumber(f, (usage + 5000) / 10000, kFieldSize_Usage); + PrintRating(f, rpu, kFieldSize_RU); + PrintRating(f, rating, kFieldSize_Rating); + if (showFreq) + { + if (cpuFreq == 0) + PrintSpaces(f, kFieldSize_EUAndEffec); + else + { + UInt64 ddd = cpuFreq * usage / 100; + if (ddd == 0) + ddd = 1; + PrintPercents(f, (rating * 10000), ddd, kFieldSize_EU); + PrintPercents(f, rating, cpuFreq, kFieldSize_Effec); + } + } +} + +static void PrintResults(IBenchPrintCallback *f, const CBenchInfo &info, UInt64 rating, bool showFreq, UInt64 cpuFreq, CTotalBenchRes *res) +{ + UInt64 speed = info.GetSpeed(info.UnpackSize * info.NumIterations); + if (f) + { + if (speed != 0) + PrintNumber(*f, speed / 1024, kFieldSize_Speed); + else + PrintSpaces(*f, 1 + kFieldSize_Speed); + } UInt64 usage = info.GetUsage(); UInt64 rpu = info.GetRatingPerUsage(rating); - PrintResults(f, usage, rpu, rating); - res.NumIterations++; - res.RPU += rpu; - res.Rating += rating; - res.Usage += usage; + if (f) + { + PrintResults(*f, usage, rpu, rating, showFreq, cpuFreq); + } + + if (res) + { + res->NumIterations++; + res->RPU += rpu; + res->Rating += rating; + res->Usage += usage; + } } -static void PrintTotals(IBenchPrintCallback &f, const CTotalBenchRes &res) +static void PrintTotals(IBenchPrintCallback &f, bool showFreq, UInt64 cpuFreq, const CTotalBenchRes &res) { - f.Print(" "); - PrintResults(f, res.Usage, res.RPU, res.Rating); + PrintSpaces(f, 1 + kFieldSize_Speed); + UInt64 numIterations = res.NumIterations; + if (numIterations == 0) + numIterations = 1; + PrintResults(f, res.Usage / numIterations, res.RPU / numIterations, res.Rating / numIterations, showFreq, cpuFreq); } static void PrintRequirements(IBenchPrintCallback &f, const char *sizeString, UInt64 size, const char *threadsString, UInt32 numThreads) { f.Print("RAM "); f.Print(sizeString); - PrintNumber(f, (size >> 20), 5, true); + PrintNumber(f, (size >> 20), 5); f.Print(" MB, # "); f.Print(threadsString); - PrintNumber(f, numThreads, 3, true); + PrintNumber(f, numThreads, 3); f.NewLine(); } @@ -1297,41 +1668,61 @@ struct CBenchCallbackToPrint: public IBenchCallback IBenchPrintCallback *_file; UInt32 DictSize; + bool Use2Columns; + int NameFieldSize; + + bool ShowFreq; + UInt64 CpuFreq; + + CBenchCallbackToPrint(): Use2Columns(false), NameFieldSize(0), ShowFreq(false), CpuFreq(0) {} + void Init() { EncodeRes.Init(); DecodeRes.Init(); } - void Normalize() { EncodeRes.Normalize(); DecodeRes.Normalize(); } + void Print(const char *s); + void NewLine(); + + HRESULT SetFreq(bool showFreq, UInt64 cpuFreq); HRESULT SetEncodeResult(const CBenchInfo &info, bool final); HRESULT SetDecodeResult(const CBenchInfo &info, bool final); - void Print(const char *string); - void NewLine(); - void PrintLeftAligned(const char *string, unsigned size); }; +HRESULT CBenchCallbackToPrint::SetFreq(bool showFreq, UInt64 cpuFreq) +{ + ShowFreq = showFreq; + CpuFreq = cpuFreq; + return S_OK; +} + HRESULT CBenchCallbackToPrint::SetEncodeResult(const CBenchInfo &info, bool final) { RINOK(_file->CheckBreak()); if (final) { - UInt64 rating = BenchProps.GetCompressRating(DictSize, info.GlobalTime, info.GlobalFreq, info.UnpackSize); - PrintResults(*_file, info, rating, EncodeRes); + UInt64 rating = BenchProps.GetCompressRating(DictSize, info.GlobalTime, info.GlobalFreq, info.UnpackSize * info.NumIterations); + PrintResults(_file, info, rating, ShowFreq, CpuFreq, &EncodeRes); } return S_OK; } static const char *kSep = " | "; - HRESULT CBenchCallbackToPrint::SetDecodeResult(const CBenchInfo &info, bool final) { RINOK(_file->CheckBreak()); if (final) { UInt64 rating = BenchProps.GetDecompressRating(info.GlobalTime, info.GlobalFreq, info.UnpackSize, info.PackSize, info.NumIterations); - _file->Print(kSep); + if (Use2Columns) + _file->Print(kSep); + else + { + _file->NewLine(); + PrintSpaces(*_file, NameFieldSize); + } CBenchInfo info2 = info; info2.UnpackSize *= info2.NumIterations; info2.PackSize *= info2.NumIterations; info2.NumIterations = 1; - PrintResults(*_file, info2, rating, DecodeRes); + PrintResults(_file, info2, rating, ShowFreq, CpuFreq, &DecodeRes); } return S_OK; } @@ -1346,22 +1737,31 @@ void CBenchCallbackToPrint::NewLine() _file->NewLine(); } -void CBenchCallbackToPrint::PrintLeftAligned(const char *s, unsigned size) +void PrintLeft(IBenchPrintCallback &f, const char *s, unsigned size) { - AString s2 = s; - for (unsigned len = (unsigned)strlen(s); len < size; len++) - s2 += ' '; - Print(s2); + f.Print(s); + int numSpaces = size - MyStringLen(s); + if (numSpaces > 0) + PrintSpaces(f, numSpaces); +} + +void PrintRight(IBenchPrintCallback &f, const char *s, unsigned size) +{ + int numSpaces = size - MyStringLen(s); + if (numSpaces > 0) + PrintSpaces(f, numSpaces); + f.Print(s); } static HRESULT TotalBench( - DECL_EXTERNAL_CODECS_LOC_VARS - UInt32 numThreads, UInt32 unpackSize, IBenchPrintCallback *printCallback, CBenchCallbackToPrint *callback) + DECL_EXTERNAL_CODECS_LOC_VARS + UInt64 complexInCommands, + UInt32 numThreads, bool forceUnpackSize, UInt32 unpackSize, IBenchPrintCallback *printCallback, CBenchCallbackToPrint *callback) { - for (unsigned i = 0; i < sizeof(g_Bench) / sizeof(g_Bench[0]); i++) + for (unsigned i = 0; i < ARRAY_SIZE(g_Bench); i++) { CBenchMethod bench = g_Bench[i]; - callback->PrintLeftAligned(bench.Name, 12); + PrintLeft(*callback->_file, bench.Name, kFieldSize_Name); callback->BenchProps.DecComplexUnc = bench.DecComplexUnc; callback->BenchProps.DecComplexCompr = bench.DecComplexCompr; callback->BenchProps.EncComplex = bench.EncComplex; @@ -1370,19 +1770,294 @@ static HRESULT TotalBench( propVariant = bench.Name; RINOK(method.ParseMethodFromPROPVARIANT(L"", propVariant)); + UInt32 unpackSize2 = unpackSize; + if (!forceUnpackSize && bench.DictBits == 0) + unpackSize2 = kFilterUnpackSize; + HRESULT res = MethodBench( EXTERNAL_CODECS_LOC_VARS - false, numThreads, method, unpackSize, bench.dictBits, + complexInCommands, + false, numThreads, method, unpackSize2, bench.DictBits, printCallback, callback, &callback->BenchProps); if (res == E_NOTIMPL) - callback->Print(" ---"); + { + // callback->Print(" ---"); + // we need additional empty line as line for decompression results + if (!callback->Use2Columns) + callback->NewLine(); + } else { RINOK(res); } callback->NewLine(); } - return S_OK; + return S_OK; +} + + +static HRESULT FreqBench( + UInt64 complexInCommands, + UInt32 numThreads, + IBenchPrintCallback *_file, + bool showFreq, + UInt64 &cpuFreq, + UInt32 &res) +{ + res = 0; + cpuFreq = 0; + + UInt32 bufferSize = 1 << 20; + UInt32 complexity = kNumFreqCommands; + if (numThreads == 0) + numThreads = 1; + + #ifdef _7ZIP_ST + numThreads = 1; + #endif + + UInt32 bsize = (bufferSize == 0 ? 1 : bufferSize); + UInt64 numIterations = complexInCommands / complexity / bsize; + if (numIterations == 0) + numIterations = 1; + + CBenchInfoCalc progressInfoSpec; + + #ifndef _7ZIP_ST + CFreqThreads threads; + if (numThreads > 1) + { + threads.Items = new CFreqInfo[numThreads]; + UInt32 i; + for (i = 0; i < numThreads; i++) + { + CFreqInfo &info = threads.Items[i]; + info.Callback = _file; + info.CallbackRes = S_OK; + info.NumIterations = numIterations; + info.Size = bufferSize; + } + progressInfoSpec.SetStartTime(); + for (i = 0; i < numThreads; i++) + { + CFreqInfo &info = threads.Items[i]; + RINOK(info.Thread.Create(FreqThreadFunction, &info)); + threads.NumThreads++; + } + threads.WaitAll(); + for (i = 0; i < numThreads; i++) + { + RINOK(threads.Items[i].CallbackRes); + } + } + else + #endif + { + progressInfoSpec.SetStartTime(); + UInt32 sum = g_BenchCpuFreqTemp; + for (UInt64 k = numIterations; k > 0; k--) + { + RINOK(_file->CheckBreak()); + sum = CountCpuFreq(bufferSize, sum); + } + res += sum; + } + CBenchInfo info; + progressInfoSpec.SetFinishTime(info); + + info.UnpackSize = 0; + info.PackSize = 0; + info.NumIterations = 1; + + if (_file) + { + { + UInt64 numCommands = (UInt64)numIterations * bufferSize * numThreads * complexity; + UInt64 rating = info.GetSpeed(numCommands); + cpuFreq = rating / numThreads; + PrintResults(_file, info, rating, showFreq, showFreq ? cpuFreq : 0, NULL); + } + RINOK(_file->CheckBreak()); + } + + return S_OK; +} + + + +static HRESULT CrcBench( + DECL_EXTERNAL_CODECS_LOC_VARS + UInt64 complexInCommands, + UInt32 numThreads, UInt32 bufferSize, + UInt64 &speed, + UInt32 complexity, + const UInt32 *checkSum, + const COneMethodInfo &method, + IBenchPrintCallback *_file, + CTotalBenchRes *encodeRes, + bool showFreq, UInt64 cpuFreq) +{ + if (numThreads == 0) + numThreads = 1; + + #ifdef _7ZIP_ST + numThreads = 1; + #endif + + UString methodName = method.MethodName; + // methodName.RemoveChar(L'-'); + CMethodId hashID; + if (!FindHashMethod( + EXTERNAL_CODECS_LOC_VARS + methodName, hashID)) + return E_NOTIMPL; + + CBenchBuffer buffer; + size_t totalSize = (size_t)bufferSize * numThreads; + if (totalSize / numThreads != bufferSize) + return E_OUTOFMEMORY; + if (!buffer.Alloc(totalSize)) + return E_OUTOFMEMORY; + + Byte *buf = buffer.Buffer; + CBaseRandomGenerator RG; + UInt32 bsize = (bufferSize == 0 ? 1 : bufferSize); + UInt64 numIterations = complexInCommands * 256 / complexity / bsize; + if (numIterations == 0) + numIterations = 1; + + CBenchInfoCalc progressInfoSpec; + + #ifndef _7ZIP_ST + CCrcThreads threads; + if (numThreads > 1) + { + threads.Items = new CCrcInfo[numThreads]; + UInt32 i; + for (i = 0; i < numThreads; i++) + { + CCrcInfo &info = threads.Items[i]; + UString name; + RINOK(CreateHasher(EXTERNAL_CODECS_LOC_VARS hashID, name, info.Hasher)); + if (!info.Hasher) + return E_NOTIMPL; + CMyComPtr<ICompressSetCoderProperties> scp; + info.Hasher.QueryInterface(IID_ICompressSetCoderProperties, &scp); + if (scp) + { + UInt64 reduceSize = 1; + RINOK(method.SetCoderProps(scp, &reduceSize)); + } + + Byte *data = buf + (size_t)bufferSize * i; + info.Callback = _file; + info.Data = data; + info.NumIterations = numIterations; + info.Size = bufferSize; + /* info.Crc = */ RandGenCrc(data, bufferSize, RG); + info.CheckSumDefined = false; + if (checkSum) + { + info.CheckSum = *checkSum; + info.CheckSumDefined = (checkSum && (i == 0)); + } + } + progressInfoSpec.SetStartTime(); + for (i = 0; i < numThreads; i++) + { + CCrcInfo &info = threads.Items[i]; + RINOK(info.Thread.Create(CrcThreadFunction, &info)); + threads.NumThreads++; + } + threads.WaitAll(); + for (i = 0; i < numThreads; i++) + { + RINOK(threads.Items[i].Res); + } + } + else + #endif + { + /* UInt32 crc = */ RandGenCrc(buf, bufferSize, RG); + progressInfoSpec.SetStartTime(); + CMyComPtr<IHasher> hasher; + UString name; + RINOK(CreateHasher(EXTERNAL_CODECS_LOC_VARS hashID, name, hasher)); + if (!hasher) + return E_NOTIMPL; + CMyComPtr<ICompressSetCoderProperties> scp; + hasher.QueryInterface(IID_ICompressSetCoderProperties, &scp); + if (scp) + { + UInt64 reduceSize = 1; + RINOK(method.SetCoderProps(scp, &reduceSize)); + } + RINOK(CrcBig(buf, bufferSize, numIterations, checkSum, hasher, _file)); + } + CBenchInfo info; + progressInfoSpec.SetFinishTime(info); + + UInt64 unpSize = numIterations * bufferSize; + UInt64 unpSizeThreads = unpSize * numThreads; + info.UnpackSize = unpSizeThreads; + info.PackSize = unpSizeThreads; + info.NumIterations = 1; + + if (_file) + { + { + UInt64 numCommands = unpSizeThreads * complexity / 256; + UInt64 rating = info.GetSpeed(numCommands); + PrintResults(_file, info, rating, showFreq, cpuFreq, encodeRes); + } + RINOK(_file->CheckBreak()); + } + + speed = info.GetSpeed(unpSizeThreads); + + return S_OK; +} + +static HRESULT TotalBench_Hash( + DECL_EXTERNAL_CODECS_LOC_VARS + UInt64 complexInCommands, + UInt32 numThreads, UInt32 bufSize, + IBenchPrintCallback *printCallback, CBenchCallbackToPrint *callback, + CTotalBenchRes *encodeRes, + bool showFreq, UInt64 cpuFreq) +{ + for (unsigned i = 0; i < ARRAY_SIZE(g_Hash); i++) + { + const CBenchHash &bench = g_Hash[i]; + PrintLeft(*callback->_file, bench.Name, kFieldSize_Name); + // callback->BenchProps.DecComplexUnc = bench.DecComplexUnc; + // callback->BenchProps.DecComplexCompr = bench.DecComplexCompr; + // callback->BenchProps.EncComplex = bench.EncComplex; + + COneMethodInfo method; + NCOM::CPropVariant propVariant; + propVariant = bench.Name; + RINOK(method.ParseMethodFromPROPVARIANT(L"", propVariant)); + + UInt64 speed; + HRESULT res = CrcBench( + EXTERNAL_CODECS_LOC_VARS + complexInCommands, + numThreads, bufSize, + speed, + bench.Complex, &bench.CheckSum, method, + printCallback, encodeRes, showFreq, cpuFreq); + if (res == E_NOTIMPL) + { + // callback->Print(" ---"); + } + else + { + RINOK(res); + } + callback->NewLine(); + } + return S_OK; } struct CTempValues @@ -1392,23 +2067,45 @@ struct CTempValues ~CTempValues() { delete []Values; } }; -static void String_to_PropVariant(const UString &s, NCOM::CPropVariant &prop) +static void ParseNumberString(const UString &s, NCOM::CPropVariant &prop) { - const wchar_t *endPtr; - UInt64 result = ConvertStringToUInt64(s, &endPtr); - if (endPtr - (const wchar_t *)s != s.Length()) + const wchar_t *end; + UInt64 result = ConvertStringToUInt64(s, &end); + if (*end != 0 || s.IsEmpty()) prop = s; - else if (result <= 0xFFFFFFFF) + else if (result <= (UInt32)0xFFFFFFFF) prop = (UInt32)result; else prop = result; } +static UInt32 GetNumThreadsNext(unsigned i, UInt32 numThreads) +{ + if (i < 2) + return i + 1; + i -= 1; + UInt32 num = (UInt32)(2 + (i & 1)) << (i >> 1); + return (num <= numThreads) ? num : numThreads; +} + +static bool AreSameMethodNames(const char *fullName, const wchar_t *shortName) +{ + for (;;) + { + wchar_t c2 = *shortName++; + if (c2 == 0) + return true; + char c1 = *fullName++; + if ((unsigned char)MyCharLower_Ascii(c1) != MyCharLower_Ascii(c2)) + return false; + } +} + HRESULT Bench( DECL_EXTERNAL_CODECS_LOC_VARS IBenchPrintCallback *printCallback, IBenchCallback *benchCallback, - const CObjectVector<CProperty> props, + const CObjectVector<CProperty> &props, UInt32 numIterations, bool multiDict) { @@ -1425,29 +2122,76 @@ HRESULT Bench( #endif UInt32 numThreads = numCPUs; - if (printCallback) - PrintRequirements(*printCallback, "size: ", ramSize, "CPU hardware threads:", numCPUs); + UInt32 testTime = kComplexInSeconds; COneMethodInfo method; - int i; + unsigned i; for (i = 0; i < props.Size(); i++) { const CProperty &property = props[i]; NCOM::CPropVariant propVariant; UString name = property.Name; - name.MakeUpper(); + name.MakeLower_Ascii(); if (!property.Value.IsEmpty()) - String_to_PropVariant(property.Value, propVariant); - if (name.Left(2).CompareNoCase(L"MT") == 0) + ParseNumberString(property.Value, propVariant); + if (name.IsEqualTo("testtime")) + { + RINOK(ParsePropToUInt32(L"", propVariant, testTime)); + continue; + } + if (name.IsPrefixedBy(L"mt")) { #ifndef _7ZIP_ST - RINOK(ParseMtProp(name.Mid(2), propVariant, numCPUs, numThreads)); + RINOK(ParseMtProp(name.Ptr(2), propVariant, numCPUs, numThreads)); #endif continue; } RINOK(method.ParseMethodFromPROPVARIANT(name, propVariant)); } + if (printCallback) + { + printCallback->Print("CPU Freq:"); + } + + UInt64 complexInCommands = kComplexInCommands; + + if (printCallback) + { + UInt64 numMilCommands = (1 << 6); + + for (int jj = 0;; jj++) + { + UInt64 start = ::GetTimeCount(); + UInt32 sum = (UInt32)start; + sum += CountCpuFreq((UInt32)(numMilCommands * 1000000 / kNumFreqCommands), g_BenchCpuFreqTemp); + start = ::GetTimeCount() - start; + if (start == 0) + start = 1; + UInt64 freq = GetFreq(); + UInt64 mips = numMilCommands * freq / start; + if (printCallback) + PrintNumber(*printCallback, mips, 5 + ((sum >> 31) & 1)); + if (jj >= 3) + { + SetComplexCommands(testTime, mips * 1000000, complexInCommands); + if (jj >= 8 || start >= freq) + break; + // break; // change it + numMilCommands <<= 1; + } + } + } + if (printCallback) + { + printCallback->NewLine(); + printCallback->NewLine(); + PrintRequirements(*printCallback, "size: ", ramSize, "CPU hardware threads:", numCPUs); + } + + if (numThreads < 1 || numThreads > kNumThreadsMax) + return E_INVALIDARG; + UInt32 dict; bool dictIsDefined = method.Get_DicSize(dict); @@ -1462,12 +2206,18 @@ HRESULT Bench( UInt32 uncompressedDataSize = kAdditionalSize + dictSize; return MethodBench( EXTERNAL_CODECS_LOC_VARS + complexInCommands, true, numThreads, method, uncompressedDataSize, kOldLzmaDictBits, printCallback, benchCallback, &benchProps); } - if (method.MethodName.CompareNoCase(L"CRC") == 0) + UString methodName = method.MethodName; + if (methodName.IsEqualToNoCase(L"CRC")) + methodName = L"crc32"; + method.MethodName = methodName; + CMethodId hashID; + if (FindHashMethod(EXTERNAL_CODECS_LOC_VARS methodName, hashID)) { if (!printCallback) return S_FALSE; @@ -1475,33 +2225,69 @@ HRESULT Bench( if (!dictIsDefined) dict = (1 << 24); - CTempValues speedTotals(numThreads); + + // methhodName.RemoveChar(L'-'); + UInt32 complexity = 10000; + const UInt32 *checkSum = NULL; + { + for (unsigned i = 0; i < ARRAY_SIZE(g_Hash); i++) + { + const CBenchHash &h = g_Hash[i]; + if (AreSameMethodNames(h.Name, methodName)) + { + complexity = h.Complex; + checkSum = &h.CheckSum; + if (strcmp(h.Name, "CRC32:4") != 0) + break; + } + } + } + f.NewLine(); f.Print("Size"); - for (UInt32 ti = 0; ti < numThreads; ti++) + const int kFieldSize_CrcSpeed = 6; + unsigned numThreadsTests = 0; + for (;;) { - PrintNumber(f, ti + 1, 5); - speedTotals.Values[ti] = 0; + UInt32 t = GetNumThreadsNext(numThreadsTests, numThreads); + PrintNumber(f, t, kFieldSize_CrcSpeed); + numThreadsTests++; + if (t >= numThreads) + break; } f.NewLine(); f.NewLine(); + CTempValues speedTotals(numThreadsTests); + { + for (unsigned ti = 0; ti < numThreadsTests; ti++) + speedTotals.Values[ti] = 0; + } UInt64 numSteps = 0; for (UInt32 i = 0; i < numIterations; i++) { - for (int pow = 10; pow < 32; pow++) + for (unsigned pow = 10; pow < 32; pow++) { UInt32 bufSize = (UInt32)1 << pow; if (bufSize > dict) break; - PrintNumber(f, pow, 2, false); - f.Print(": "); - for (UInt32 ti = 0; ti < numThreads; ti++) + char s[16]; + ConvertUInt32ToString(pow, s); + int pos = MyStringLen(s); + s[pos++] = ':'; + s[pos++] = ' '; + s[pos] = 0; + f.Print(s); + + for (unsigned ti = 0; ti < numThreadsTests; ti++) { RINOK(f.CheckBreak()); - UInt64 speed; - RINOK(CrcBench(ti + 1, bufSize, speed)); - PrintNumber(f, (speed >> 20), 5); + UInt32 t = GetNumThreadsNext(ti, numThreads); + UInt64 speed = 0; + RINOK(CrcBench(EXTERNAL_CODECS_LOC_VARS complexInCommands, + t, bufSize, speed, complexity, + (pow == kNumHashDictBits) ? checkSum : NULL, method, NULL, NULL, false, 0)); + PrintNumber(f, (speed >> 20), kFieldSize_CrcSpeed); speedTotals.Values[ti] += speed; } f.NewLine(); @@ -1512,13 +2298,17 @@ HRESULT Bench( { f.NewLine(); f.Print("Avg:"); - for (UInt32 ti = 0; ti < numThreads; ti++) - PrintNumber(f, ((speedTotals.Values[ti] / numSteps) >> 20), 5); + for (unsigned ti = 0; ti < numThreadsTests; ti++) + { + PrintNumber(f, ((speedTotals.Values[ti] / numSteps) >> 20), kFieldSize_CrcSpeed); + } f.NewLine(); } return S_OK; } + bool use2Columns = false; + CBenchCallbackToPrint callback; callback.Init(); callback._file = printCallback; @@ -1537,27 +2327,80 @@ HRESULT Bench( bool totalBenchMode = (method.MethodName == L"*"); f.NewLine(); - f.Print(totalBenchMode ? "Method " : "Dict"); - f.Print(" Compressing | Decompressing"); + + if (totalBenchMode) + { + callback.NameFieldSize = kFieldSize_Name; + use2Columns = false; + } + else + { + callback.NameFieldSize = kFieldSize_SmallName; + use2Columns = true; + } + callback.Use2Columns = use2Columns; + + bool showFreq = false; + UInt64 cpuFreq = 0; + + if (totalBenchMode) + { + showFreq = true; + } + + int fileldSize = kFieldSize_TotalSize; + if (showFreq) + fileldSize += kFieldSize_EUAndEffec; + + if (use2Columns) + { + PrintSpaces(f, callback.NameFieldSize); + PrintRight(f, "Compressing", fileldSize); + f.Print(kSep); + PrintRight(f, "Decompressing", fileldSize); + } f.NewLine(); - const char *kSpaces = totalBenchMode ? " " : " "; - f.Print(kSpaces); + PrintLeft(f, totalBenchMode ? "Method" : "Dict", callback.NameFieldSize); + int j; - + for (j = 0; j < 2; j++) { - f.Print(" Speed Usage R/U Rating"); + PrintRight(f, "Speed", kFieldSize_Speed + 1); + PrintRight(f, "Usage", kFieldSize_Usage + 1); + PrintRight(f, "R/U", kFieldSize_RU + 1); + PrintRight(f, "Rating", kFieldSize_Rating + 1); + if (showFreq) + { + PrintRight(f, "E/U", kFieldSize_EU + 1); + PrintRight(f, "Effec", kFieldSize_Effec + 1); + } + if (!use2Columns) + break; if (j == 0) f.Print(kSep); } + f.NewLine(); - f.Print(kSpaces); + PrintSpaces(f, callback.NameFieldSize); + for (j = 0; j < 2; j++) { - f.Print(" KB/s % MIPS MIPS"); + PrintRight(f, "KB/s", kFieldSize_Speed + 1); + PrintRight(f, "%", kFieldSize_Usage + 1); + PrintRight(f, "MIPS", kFieldSize_RU + 1); + PrintRight(f, "MIPS", kFieldSize_Rating + 1); + if (showFreq) + { + PrintRight(f, "%", kFieldSize_EU + 1); + PrintRight(f, "%", kFieldSize_Effec + 1); + } + if (!use2Columns) + break; if (j == 0) f.Print(kSep); } + f.NewLine(); f.NewLine(); @@ -1574,38 +2417,101 @@ HRESULT Bench( { if (i != 0) printCallback->NewLine(); - HRESULT res = TotalBench( - EXTERNAL_CODECS_LOC_VARS - numThreads, dict, printCallback, &callback); + HRESULT res; + + int freqTest; + const int kNumCpuTests = 3; + for (freqTest = 0; freqTest < kNumCpuTests; freqTest++) + { + PrintLeft(f, "CPU", kFieldSize_Name); + UInt32 resVal; + RINOK(FreqBench(complexInCommands, numThreads, printCallback, freqTest == kNumCpuTests - 1, cpuFreq, resVal)); + callback.NewLine(); + + if (freqTest == kNumCpuTests - 1) + SetComplexCommands(testTime, cpuFreq, complexInCommands); + } + callback.NewLine(); + + callback.SetFreq(true, cpuFreq); + res = TotalBench(EXTERNAL_CODECS_LOC_VARS complexInCommands, numThreads, dictIsDefined, dict, printCallback, &callback); RINOK(res); + + res = TotalBench_Hash(EXTERNAL_CODECS_LOC_VARS complexInCommands, numThreads, + 1 << kNumHashDictBits, printCallback, &callback, &callback.EncodeRes, true, cpuFreq); + RINOK(res); + + callback.NewLine(); + { + PrintLeft(f, "CPU", kFieldSize_Name); + UInt32 resVal; + UInt64 cpuFreqLastTemp = cpuFreq; + RINOK(FreqBench(complexInCommands, numThreads, printCallback, false, cpuFreqLastTemp, resVal)); + callback.NewLine(); + } } } else { + bool needSetComplexity = true; + if (!methodName.IsEqualToNoCase(L"LZMA")) + { + for (unsigned i = 0; i < ARRAY_SIZE(g_Bench); i++) + { + const CBenchMethod &h = g_Bench[i]; + AString s = h.Name; + if (AreSameMethodNames(h.Name, methodName)) + { + callback.BenchProps.EncComplex = h.EncComplex; + callback.BenchProps.DecComplexCompr = h.DecComplexCompr; + callback.BenchProps.DecComplexUnc = h.DecComplexUnc;; + needSetComplexity = false; + break; + } + } + } + if (needSetComplexity) + callback.BenchProps.SetLzmaCompexity(); - callback.BenchProps.SetLzmaCompexity(); - - for (i = 0; i < (int)numIterations; i++) + for (i = 0; i < numIterations; i++) { - const int kStartDicLog = 22; - int pow = (dict < ((UInt32)1 << kStartDicLog)) ? kBenchMinDicLogSize : kStartDicLog; + const unsigned kStartDicLog = 22; + unsigned pow = (dict < ((UInt32)1 << kStartDicLog)) ? kBenchMinDicLogSize : kStartDicLog; if (!multiDict) pow = 31; - while (((UInt32)1 << pow) > dict) + while (((UInt32)1 << pow) > dict && pow > 0) pow--; for (; ((UInt32)1 << pow) <= dict; pow++) { - PrintNumber(f, pow, 2, false); - f.Print(":"); + char s[16]; + ConvertUInt32ToString(pow, s); + unsigned pos = MyStringLen(s); + s[pos++] = ':'; + s[pos] = 0; + PrintLeft(f, s, kFieldSize_SmallName); callback.DictSize = (UInt32)1 << pow; - UInt32 uncompressedDataSize = kAdditionalSize + callback.DictSize; + COneMethodInfo method2 = method; + + if (StringsAreEqualNoCase_Ascii(method2.MethodName, L"LZMA")) + { + // We add dictionary size property. + // method2 can have two different dictionary size properties. + // And last property is main. + NCOM::CPropVariant propVariant = (UInt32)pow; + RINOK(method2.ParseMethodFromPROPVARIANT(L"d", propVariant)); + } + + UInt32 uncompressedDataSize = callback.DictSize; + if (uncompressedDataSize >= (1 << 18)) + uncompressedDataSize += kAdditionalSize; HRESULT res = MethodBench( - EXTERNAL_CODECS_LOC_VARS - true, numThreads, - method, uncompressedDataSize, - kOldLzmaDictBits, printCallback, &callback, &callback.BenchProps); + EXTERNAL_CODECS_LOC_VARS + complexInCommands, + true, numThreads, + method2, uncompressedDataSize, + kOldLzmaDictBits, printCallback, &callback, &callback.BenchProps); f.NewLine(); RINOK(res); if (!multiDict) @@ -1613,21 +2519,27 @@ HRESULT Bench( } } } - callback.Normalize(); - f.Print("----------------------------------------------------------------"); - f.NewLine(); - f.Print("Avr:"); - const char *kSpaces2 = totalBenchMode ? " " : ""; - f.Print(kSpaces2); - PrintTotals(f, callback.EncodeRes); - f.Print(" "); - PrintTotals(f, callback.DecodeRes); + + PrintChars(f, '-', callback.NameFieldSize + fileldSize); + + if (use2Columns) + { + f.Print(kSep); + PrintChars(f, '-', fileldSize); + } f.NewLine(); - f.Print("Tot:"); - f.Print(kSpaces2); + if (use2Columns) + { + PrintLeft(f, "Avr:", callback.NameFieldSize); + PrintTotals(f, showFreq, cpuFreq, callback.EncodeRes); + f.Print(kSep); + PrintTotals(f, showFreq, cpuFreq, callback.DecodeRes); + f.NewLine(); + } + PrintLeft(f, "Tot:", callback.NameFieldSize); CTotalBenchRes midRes; - midRes.SetMid(callback.EncodeRes, callback.DecodeRes); - PrintTotals(f, midRes); + midRes.SetSum(callback.EncodeRes, callback.DecodeRes); + PrintTotals(f, showFreq, cpuFreq, midRes); f.NewLine(); return S_OK; } |