Merged v4.5.0-beta

src/backend/common/Tags.h

@@ -27,10 +27,15 @@
 #define XMRIG_TAGS_H
 
 
+#include <cstdint>
+
+
 namespace xmrig {
 
 
+const char *backend_tag(uint32_t backend);
 const char *cpu_tag();
+const char *net_tag();
 
 
 #ifdef XMRIG_FEATURE_OPENCL
@@ -38,6 +43,12 @@ const char *ocl_tag();
 #endif
 
 
+#ifdef XMRIG_FEATURE_CUDA
+const char *cuda_tag();
+#endif
+
+
+
 #ifdef XMRIG_ALGO_RANDOMX
 const char *rx_tag();
 #endif

src/backend/common/Threads.cpp

@@ -34,6 +34,11 @@
 #endif
 
 
+#ifdef XMRIG_FEATURE_CUDA
+#   include "backend/cuda/CudaThreads.h"
+#endif
+
+
 namespace xmrig {
 
 
@@ -169,4 +174,8 @@ template class Threads<CpuThreads>;
 template class Threads<OclThreads>;
 #endif
 
+#ifdef XMRIG_FEATURE_CUDA
+template class Threads<CudaThreads>;
+#endif
+
 } // namespace xmrig

src/backend/common/WorkerJob.h

@@ -26,7 +26,7 @@
 #define XMRIG_WORKERJOB_H
 
 
-#include <string.h>
+#include <cstring>
 
 
 #include "base/net/stratum/Job.h"
@@ -47,9 +47,9 @@ public:
     inline uint8_t index() const            { return m_index; }
 
 
-    inline void add(const Job &job, uint64_t sequence, uint32_t reserveCount)
+    inline void add(const Job &job, uint32_t reserveCount, Nonce::Backend backend)
     {
-        m_sequence = sequence;
+        m_sequence = Nonce::sequence(backend);
 
         if (currentJob() == job) {
             return;
@@ -60,7 +60,7 @@ public:
             return;
         }
 
-        save(job, reserveCount);
+        save(job, reserveCount, backend);
     }
 
 
@@ -82,13 +82,15 @@ public:
 
 
 private:
-    inline void save(const Job &job, uint32_t reserveCount)
+    inline void save(const Job &job, uint32_t reserveCount, Nonce::Backend backend)
     {
         m_index           = job.index();
         const size_t size = job.size();
         m_jobs[index()]   = job;
         m_rounds[index()] = 0;
 
+        m_jobs[index()].setBackend(backend);
+
         for (size_t i = 0; i < N; ++i) {
             memcpy(m_blobs[index()] + (i * size), job.blob(), size);
             *nonce(i) = Nonce::next(index(), *nonce(i), reserveCount, job.isNicehash());
@@ -96,7 +98,7 @@ private:
     }
 
 
-    alignas(16) uint8_t m_blobs[2][Job::kMaxBlobSize * N];
+    alignas(16) uint8_t m_blobs[2][Job::kMaxBlobSize * N]{};
     Job m_jobs[2];
     uint32_t m_rounds[2] = { 0, 0 };
     uint64_t m_sequence  = 0;
@@ -126,12 +128,14 @@ inline void xmrig::WorkerJob<1>::nextRound(uint32_t rounds, uint32_t roundSize)
 
 
 template<>
-inline void xmrig::WorkerJob<1>::save(const Job &job, uint32_t reserveCount)
+inline void xmrig::WorkerJob<1>::save(const Job &job, uint32_t reserveCount, Nonce::Backend backend)
 {
     m_index           = job.index();
     m_jobs[index()]   = job;
     m_rounds[index()] = 0;
 
+    m_jobs[index()].setBackend(backend);
+
     memcpy(blob(), job.blob(), job.size());
     *nonce() = Nonce::next(index(), *nonce(), reserveCount, currentJob().isNicehash());
 }

src/backend/common/Workers.cpp

@@ -37,6 +37,11 @@
 #endif
 
 
+#ifdef XMRIG_FEATURE_CUDA
+#   include "backend/cuda/CudaWorker.h"
+#endif
+
+
 namespace xmrig {
 
 
@@ -217,4 +222,16 @@ template class Workers<OclLaunchData>;
 #endif
 
 
+#ifdef XMRIG_FEATURE_CUDA
+template<>
+xmrig::IWorker *xmrig::Workers<CudaLaunchData>::create(Thread<CudaLaunchData> *handle)
+{
+    return new CudaWorker(handle->id(), handle->config());
+}
+
+
+template class Workers<CudaLaunchData>;
+#endif
+
+
 } // namespace xmrig

src/backend/common/Workers.h

@@ -37,6 +37,11 @@
 #endif
 
 
+#ifdef XMRIG_FEATURE_CUDA
+#   include "backend/cuda/CudaLaunchData.h"
+#endif
+
+
 namespace xmrig {
 
 
@@ -80,6 +85,13 @@ extern template class Workers<OclLaunchData>;
 #endif
 
 
+#ifdef XMRIG_FEATURE_CUDA
+template<>
+IWorker *Workers<CudaLaunchData>::create(Thread<CudaLaunchData> *handle);
+extern template class Workers<CudaLaunchData>;
+#endif
+
+
 } // namespace xmrig
 
 

src/backend/common/interfaces/IBackend.h

@@ -53,6 +53,7 @@ public:
     virtual const Hashrate *hashrate() const                            = 0;
     virtual const String &profileName() const                           = 0;
     virtual const String &type() const                                  = 0;
+    virtual void execCommand(char command)                              = 0;
     virtual void prepare(const Job &nextJob)                            = 0;
     virtual void printHashrate(bool details)                            = 0;
     virtual void setJob(const Job &job)                                 = 0;