Improved cpu autodetection for cn-ultralite

Bendr0id · Jan 13, 2019 · eadd17f · eadd17f
1 parent d05244e
commit eadd17f
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/Cpu.cpp b/src/Cpu.cpp
@@ -92,7 +92,11 @@ void CpuImpl::optimizeParameters(size_t& threadsCount, size_t& hashFactor,
     if (algo == Options::ALGO_CRYPTONIGHT_HEAVY || powVariant == POW_XFH) {
         maximumReasonableHashFactor = 3;
     } else if (algo == Options::ALGO_CRYPTONIGHT_ULTRA_LITE) {
-        maximumReasonableHashFactor = 2;
+        if (m_asmOptimization == ASM_INTEL) {
+            maximumReasonableHashFactor = 2;
+        } else {
+            maximumReasonableHashFactor = 1;
+        }
     }
     if (safeMode) {
         if (threadsCount > maximumReasonableThreadCount) {

diff --git a/src/crypto/CryptoNight.cpp b/src/crypto/CryptoNight.cpp
@@ -537,9 +537,9 @@ bool CryptoNight::selfTest(int algo)
     } else if (algo == Options::ALGO_CRYPTONIGHT_SUPER_LITE) {
 
     } else if (algo == Options::ALGO_CRYPTONIGHT_ULTRA_LITE) {
-        // cn ultralite turtle
+        // cn ultralite (cnv8 + turtle)
 
-        cryptonight_hash_ctx[0](asmOptimization, PowVariant::POW_TURTLE, test_input, 76, output, scratchPads);
+        cryptonight_hash_ctx[0](asmOptimization, PowVariant::POW_V0, test_input, 76, output, scratchPads);
         resultUltraLite = resultUltraLite && memcmp(output,  test_output_turtle, 32) == 0;
 
     } else {
@@ -593,7 +593,7 @@ bool CryptoNight::selfTest(int algo)
         result = result && memcmp(output, test_output_v1, 160) == 0;
         #endif
 
-        // cn v7 + xtl
+        // cnv7 + xtl
 
         cryptonight_hash_ctx[0](asmOptimization, PowVariant::POW_XTL,test_input, 76, output, scratchPads);
         result = result && memcmp(output, test_output_xtl, 32) == 0;
@@ -608,7 +608,7 @@ bool CryptoNight::selfTest(int algo)
         cryptonight_hash_ctx[0](asmOptimization, PowVariant::POW_ALLOY,test_input, 76, output, scratchPads);
         result = result && memcmp(output, test_output_alloy, 32) == 0;
 
-        // cn v8 aka cnv2
+        // cnv8 aka cnv2
 
         cryptonight_hash_ctx[0](asmOptimization, PowVariant::POW_V2, test_input, 76, output, scratchPads);
         result = result && memcmp(output, test_output_v2, 32) == 0;

diff --git a/src/net/Job.cpp b/src/net/Job.cpp
@@ -139,7 +139,7 @@ bool Job::setTarget(const char *target)
 PowVariant Job::powVariant() const
 {
     if (Options::i()->algo() == Options::ALGO_CRYPTONIGHT_ULTRA_LITE) {
-        return PowVariant::POW_TURTLE;
+        return PowVariant::POW_V0;
     }
 
     if (m_powVariant == PowVariant::POW_AUTODETECT) {

diff --git a/src/net/strategies/DonateStrategy.cpp b/src/net/strategies/DonateStrategy.cpp
@@ -60,6 +60,8 @@ DonateStrategy::DonateStrategy(const char *agent, IStrategyListener *listener) :
         url = new Url("donate2.graef.in", 8443, userId, nullptr, true, false, true);
     } else if (Options::i()->algo() == Options::ALGO_CRYPTONIGHT_LITE) {
         url = new Url("donate2.graef.in", 1080, userId, nullptr, true, false, true);
+    } else if (Options::i()->algo() == Options::ALGO_CRYPTONIGHT_ULTRA_LITE) {
+        url = new Url("donate2.graef.in", 8090, userId, nullptr, true, false, true);
     } else {
         url = new Url("donate2.graef.in", 443, userId, nullptr, true, false, true);
     }
@@ -68,6 +70,8 @@ DonateStrategy::DonateStrategy(const char *agent, IStrategyListener *listener) :
         url = new Url("donate.graef.in", 8443, userId, nullptr, false, false, true);
     } else if (Options::i()->algo() == Options::ALGO_CRYPTONIGHT_LITE) {
         url = new Url("donate.graef.in", 1080, userId, nullptr, false, false, true);
+    } else if (Options::i()->algo() == Options::ALGO_CRYPTONIGHT_ULTRA_LITE) {
+        url = new Url("donate2.graef.in", 8088, userId, nullptr, false, false, true);
     } else {
         url = new Url("donate2.graef.in", 80, userId, nullptr, false, false, true);
     }