From 10afbc1984097404e0a3f2945b0ff233800634c1 Mon Sep 17 00:00:00 2001
From: John Tromp <john.tromp@gmail.com>
Date: Wed, 23 Oct 2019 13:13:08 +0200
Subject: [PATCH] Single Stage Seeding and gpu cycle finding in cuckatoo mean
 cuda (#229)

---
 .../src/cuckoo_sys/plugins/CMakeLists.txt     |  4 +--
 cuckoo-miner/src/cuckoo_sys/plugins/cuckoo    |  2 +-
 grin-miner.toml                               | 34 +++++--------------
 3 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt b/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt
index f2faa24..aecde15 100644
--- a/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt
+++ b/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt
@@ -100,8 +100,8 @@ set (AT_MEAN_CUDA_SRC
 
 if (NOT SKIP_CUCKATOO_GPU)
   build_cuda_target("${AT_MEAN_CUDA_SRC}" cuckatoo_mean_cuda_19 "-DNEPS_A=512 -DNEPS_B=384 -DIDXSHIFT=6 -DEDGEBITS=19")
-  build_cuda_target("${AT_MEAN_CUDA_SRC}" cuckatoo_mean_cuda_gtx_31 "-DNRB1=26 -DNEPS_A=135 -DNEPS_B=88 -DPART_BITS=1 -DEDGEBITS=31")
-  build_cuda_target("${AT_MEAN_CUDA_SRC}" cuckatoo_mean_cuda_rtx_31 "-DNRB1=26 -DNEPS_A=133 -DNEPS_B=85 -DPART_BITS=0 -DEDGEBITS=31")
+  build_cuda_target("${AT_MEAN_CUDA_SRC}" cuckatoo_mean_cuda_gtx_31 "-DNEPS_A=135 -DNEPS_B=88 -DPART_BITS=1 -DFLUSHA=2 -DEDGEBITS=31")
+  build_cuda_target("${AT_MEAN_CUDA_SRC}" cuckatoo_mean_cuda_rtx_31 "-DNEPS_A=135 -DNEPS_B=88 -DPART_BITS=0 -DEDGEBITS=31")
 endif()
 
 ##################################################################################
diff --git a/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo b/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo
index c2222c5..1bfb7f3 160000
--- a/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo
+++ b/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo
@@ -1 +1 @@
-Subproject commit c2222c588821d3c414a5105159c45c53a08a0a1f
+Subproject commit 1bfb7f3d6a44f20ff7b364768908d5cdb0154653
diff --git a/grin-miner.toml b/grin-miner.toml
index ef01fc6..12514ad 100644
--- a/grin-miner.toml
+++ b/grin-miner.toml
@@ -154,16 +154,11 @@ nthreads = 4
 #plugin_name = "cuckatoo_mean_cuda_gtx_31"
 #[mining.miner_plugin_config.parameters]
 #device = 0
-#expand = 3
 #cpuload = 1
-#ntrims = 176
-#genablocks = 4096
-#genatpb = 128
-#genbtpb = 128
-#trimtpb = 512
-#tailtpb = 1024
-#recoverblocks = 1024
-#recovertpb = 1024
+#ntrims = 31
+#genablocks = 1024
+#recoverblocks = 2048
+#recovertpb = 256
 
 #mean cuda optimised to use slightly less memory,
 #will work on a 2080TI with expand rounds set to 2
@@ -174,32 +169,19 @@ nthreads = 4
 #plugin_name = "cuckatoo_mean_cuda_rtx_31"
 #[mining.miner_plugin_config.parameters]
 #device = 0
-#expand = 3
 #cpuload = 1
-#ntrims = 176
-#genablocks = 4096
-#genatpb = 128
-#genbtpb = 128
-#trimtpb = 512
-#tailtpb = 1024
-#recoverblocks = 1024
-#recovertpb = 1024
+#ntrims = 31
+#genablocks = 1024
+#recoverblocks = 2048
+#recovertpb = 256
 
 #lean cuda
 #[[mining.miner_plugin_config]]
 #plugin_name = "cuckatoo_lean_cuda_31"
 #[mining.miner_plugin_config.parameters]
-#expand = 0
 #device = 0
 #cpuload = 1
 #ntrims = 176
-#genablocks = 4096
-#genatpb = 128
-#genbtpb = 128
-#trimtpb = 512
-#tailtpb = 1024
-#recoverblocks = 1024
-#recovertpb = 1024
 
 # lean OpenCL supports both NVidia and AMD
 # very slow but requires ~ 3GB of RAM