fzorb/REDACTED-rig
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fixed hugepages/memory printout for CN-Turtle/Ultralite

Browse source 
- Added more names to the algo parse CN-Turtle/Ultralite
This commit is contained in:
Ben Gräf 2019-01-30 20:51:11 +01:00
parent 25b1e2e223
commit 61778ab4c2
4 changed files with 7 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
src/Mem.cpp
View file

@ -62,7 +62,7 @@ ScratchPadMem Mem::create(ScratchPad** scratchPads, int threadId)
scratchPadMem.realSize = scratchPadSize * getThreadHashFactor(threadId); scratchPadMem.realSize = scratchPadSize * getThreadHashFactor(threadId);
scratchPadMem.size = scratchPadSize * getThreadHashFactor(threadId); scratchPadMem.size = scratchPadSize * getThreadHashFactor(threadId);
scratchPadMem.size += scratchPadMem.size % MEMORY; scratchPadMem.size += scratchPadMem.size % MEMORY;
scratchPadMem.pages = scratchPadMem.size / MEMORY; scratchPadMem.pages = std::max(scratchPadMem.size / MEMORY, static_cast<size_t>(1));
allocate(scratchPadMem, m_useHugePages); allocate(scratchPadMem, m_useHugePages);

2
src/Options.cpp
View file

@ -1098,7 +1098,7 @@ bool Options::setAlgo(const char *algo)
} }
if (i == ARRAY_SIZE(algo_names) - 1 && (!strcmp(algo, "cn-ultra-lite") || !strcmp(algo, "cryptonight-ultra-lite") || !strcmp(algo, "cryptonight-ultralight"))) { if (i == ARRAY_SIZE(algo_names) - 1 && (!strcmp(algo, "cn-ultra-lite") || !strcmp(algo, "cryptonight-ultra-lite") || !strcmp(algo, "cryptonight-ultralight") || !strcmp(algo, "cryptonight-turtle") || !strcmp(algo, "cn-turtle") || !strcmp(algo, "cryptonight-pico") || !strcmp(algo, "cn-pico"))) {
m_algo = ALGO_CRYPTONIGHT_ULTRALITE; m_algo = ALGO_CRYPTONIGHT_ULTRALITE;
break; break;
} }

2
src/crypto/CryptoNight.h
View file

@ -31,6 +31,8 @@
#include "AsmOptimization.h" #include "AsmOptimization.h"
#include "Options.h" #include "Options.h"
#define ONE_MB 1048576
#define MEMORY 2097152 /* 2 MiB */ #define MEMORY 2097152 /* 2 MiB */
#define MEMORY_LITE 1048576 /* 1 MiB */ #define MEMORY_LITE 1048576 /* 1 MiB */
#define MEMORY_SUPER_LITE 524288 /* 512 KiB */ #define MEMORY_SUPER_LITE 524288 /* 512 KiB */

6
src/workers/MultiWorker.cpp
View file

@ -102,13 +102,13 @@ MultiWorker::~MultiWorker()
void MultiWorker::start() void MultiWorker::start()
{ {
const size_t memory = scratchPadMem.realSize / 1048576; size_t memory = scratchPadMem.realSize > ONE_MB ? scratchPadMem.realSize / ONE_MB : scratchPadMem.realSize / 1024;
if (Options::i()->colors()) { if (Options::i()->colors()) {
LOG_INFO(WHITE_BOLD("Starting thread ") GREEN_BOLD("%zu/%zu") " affined to core: " GREEN_BOLD("#%d") " -> huge pages:" GREEN_BOLD(" %s%zu/%zu") " scratchpad: " CYAN_BOLD("%zu.0 MB"), LOG_INFO(WHITE_BOLD("Starting thread ") GREEN_BOLD("%zu/%zu") " affined to core: " GREEN_BOLD("#%d") " -> huge pages:" GREEN_BOLD(" %s%zu/%zu") " scratchpad: " CYAN_BOLD("%zu.0 %s"),
m_id+1, Options::i()->threads(), m_affinedCpu, m_id+1, Options::i()->threads(), m_affinedCpu,
(scratchPadMem.hugePages == scratchPadMem.pages ? "\x1B[1;32m" : (scratchPadMem.hugePages == 0 ? "\x1B[1;31m" : "\x1B[1;33m")), (scratchPadMem.hugePages == scratchPadMem.pages ? "\x1B[1;32m" : (scratchPadMem.hugePages == 0 ? "\x1B[1;31m" : "\x1B[1;33m")),
scratchPadMem.hugePages, scratchPadMem.pages, memory); scratchPadMem.hugePages, scratchPadMem.pages, memory, scratchPadMem.realSize > ONE_MB ? "MB" : "KB");
} }
else { else {
LOG_INFO("Starting thread %zu/%zu affined to core: #%d -> huge pages: %zu/%zu scratchpad: %zu.0 MB", LOG_INFO("Starting thread %zu/%zu affined to core: #%d -> huge pages: %zu/%zu scratchpad: %zu.0 MB",