Cuckarooz (#249)

* support CUDA C32 mining * add nearly 2x faster cuda mean cuckaroom solver * update cuckoo * update cuckoo again * add old plugin * update to latest cuckoo using only 2 arg version of static_assert * add cuckarooz * v4 featuring CUDA Cuckarooz * Fix version and cargo update * fix config line Co-authored-by: Quentin Le Sceller <[email protected]>
mimblewimble · Jul 16, 2020 · e78aec6 · e78aec6
1 parent 038c77d
commit e78aec6
Showing 11 changed files with 403 additions and 362 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_miner"
-version = "3.0.0-beta.1"
+version = "4.0.0"
 authors = ["Grin Developers <[email protected]>"]
 description = "Mining software for Grin, supports CPU and CUDA GPUs."
 build = "src/build/build.rs"
@@ -32,12 +32,12 @@ slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"
 term = "0.6"
 time = "0.1"
 
-grin_miner_util = { path = "./util", version = "3.0.0-beta.1" }
-grin_miner_plugin = { path = "./plugin", version = "3.0.0-beta.1" }
-grin_miner_config = { path = "./config", version = "3.0.0-beta.1" }
-cuckoo_miner = { path = "./cuckoo-miner", version = "3.0.0-beta.1" }
+grin_miner_util = { path = "./util", version = "4.0.0" }
+grin_miner_plugin = { path = "./plugin", version = "4.0.0" }
+grin_miner_config = { path = "./config", version = "4.0.0" }
+#cuckoo_miner = { path = "./cuckoo-miner", version = "4.0.0" }
 #use this alternative inclusion below to build cuda plugins
-#cuckoo_miner = { path = "./cuckoo-miner", version = "3.0.0-beta.1", features = ["build-cuda-plugins"]}
+cuckoo_miner = { path = "./cuckoo-miner", version = "4.0.0", features = ["build-cuda-plugins"]}
 ocl_cuckatoo = { path = "./ocl_cuckatoo", version = "1.0.2", optional = true}
 ocl_cuckaroo = { path = "./ocl_cuckaroo", version = "1.0.2", optional = true}
 

diff --git a/config/Cargo.toml b/config/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "grin_miner_config"
-version = "3.0.0-beta.1"
+version = "4.0.0"
 authors = ["Grin Developers <[email protected]>"]
 description = "Configuration handling for the grin miner"
 license = "Apache-2.0"
 repository = "https://github.com/mimblewimble/grin-miner"
 workspace = ".."
 
 [dependencies]
-cuckoo_miner = { path = "../cuckoo-miner", version = "3.0.0-beta.1" }
+cuckoo_miner = { path = "../cuckoo-miner", version = "4.0.0" }
 dirs = "2"
-grin_miner_util = { path = "../util", version = "3.0.0-beta.1" }
+grin_miner_util = { path = "../util", version = "4.0.0" }
 serde = "1"
 serde_derive = "1"
 slog = { version = "2", features = ["max_level_trace", "release_max_level_trace"] }

diff --git a/cuckoo-miner/Cargo.toml b/cuckoo-miner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cuckoo_miner"
-version = "3.0.0-beta.1"
+version = "4.0.0"
 authors = ["yeastplume"]
 license = "MIT/Apache-2.0/BSD-3-Clause"
 description = "Rust bindings to John Tromp's Cuckoo Cycle Implementations"
@@ -21,8 +21,8 @@ build-cuda-plugins = []
 byteorder = "1"
 blake2-rfc = "0.2"
 glob = "0.3"
-grin_miner_util = { path = "../util", version = "3.0.0-beta.1" }
-grin_miner_plugin = { path = "../plugin", version = "3.0.0-beta.1" }
+grin_miner_util = { path = "../util", version = "4.0.0" }
+grin_miner_plugin = { path = "../plugin", version = "4.0.0" }
 libc = "0.2"
 libloading = "0.6"
 serde = "1"

diff --git a/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt b/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt
@@ -17,7 +17,9 @@ set (SKIP_CUCKATOO_GPU $ENV{SKIP_CUCKATOO_GPU})
 set (SKIP_CUCKAROO_GPU $ENV{SKIP_CUCKAROO_GPU})
 set (SKIP_CUCKAROOD_GPU $ENV{SKIP_CUCKAROOD_GPU})
 set (SKIP_CUCKAROOM_CPU "1")
-set (SKIP_CUCKAROOM_GPU $ENV{SKIP_CUCKAROOD_GPU})
+set (SKIP_CUCKAROOM_GPU $ENV{SKIP_CUCKAROOM_GPU})
+set (SKIP_CUCKAROOZ_CPU "1")
+set (SKIP_CUCKAROOZ_GPU $ENV{SKIP_CUCKAROOZ_GPU})
 
 #blake2b prerequisite
 set (BLAKE_2B "cuckoo/src/crypto/blake2b-ref.c")
@@ -207,3 +209,37 @@ if (NOT SKIP_CUCKAROOM_GPU)
   build_cuda_target("${AR2_CUDA_SRC2}" cuckaroom_old_cuda_29 "-DEDGEBITS=29")
   build_cuda_target("${AR2_CUDA_SRC2}" cuckaroom_cuda_19 "-DXBITS=1 -DEPS_A=4 -DEPS_B=3 -DIDXSHIFT=8 -DEDGEBITS=19")
 endif()
+
+##################################################################################
+### CUCKAROOZ (Asic Resistant)  ##################################################
+##################################################################################
+
+### AR CPU BUILDING  #########################################
+
+set (AR2_CPU_SRC
+			cuckoo/src/cuckarooz/cuckarooz.hpp
+			cuckoo/src/cuckarooz/bitmap.hpp
+			cuckoo/src/cuckarooz/graph.hpp
+			cuckoo/src/threads/barrier.hpp
+			cuckoo/src/crypto/siphash.hpp
+			cuckoo/src/crypto/siphashxN.h
+			cuckoo/src/cuckarooz/mean.hpp
+			cuckoo/src/cuckarooz/mean.cpp
+			${BLAKE_2B})
+
+### AR CPU TARGETS #########################################
+
+if (NOT SKIP_CUCKAROOZ_CPU)
+  build_cpu_target("${AR2_CPU_SRC}" cuckarooz_cpu_compat_19 "-mno-avx2 -DXBITS=2 -DNSIPHASH=4 -DEDGEBITS=19 -DSAVEEDGES")
+  build_cpu_target("${AR2_CPU_SRC}" cuckarooz_cpu_avx2_19 "-mavx2 -DXBITS=2 -DNSIPHASH=8 -DEDGEBITS=19 -DSAVEEDGES")
+  build_cpu_target("${AR2_CPU_SRC}" cuckarooz_cpu_compat_29 "-mno-avx2 -DNSIPHASH=4 -DEDGEBITS=29 -DSAVEEDGES")
+  build_cpu_target("${AR2_CPU_SRC}" cuckarooz_cpu_avx2_29 "-mavx2 -DNSIPHASH=8 -DEDGEBITS=29 -DSAVEEDGES")
+endif()
+
+### AR CUDA TARGETS #########################################
+
+set (AR2_CUDA_SRC cuckoo/src/cuckarooz/mean.cu ${BLAKE_2B} )
+
+if (NOT SKIP_CUCKAROOZ_GPU)
+  build_cuda_target("${AR2_CUDA_SRC}" cuckarooz_cuda_29 "-DEDGEBITS=29")
+endif()
diff --git a/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo b/cuckoo-miner/src/cuckoo_sys/plugins/cuckoo
diff --git a/grin-miner.toml b/grin-miner.toml
@@ -76,10 +76,10 @@ stratum_server_tls_enabled = false
 
 # cpu mean algorithm for processors supporting sse2
 
-[[mining.miner_plugin_config]]
-plugin_name = "cuckarood_cpu_compat_29"
-[mining.miner_plugin_config.parameters]
-nthreads = 4
+#[[mining.miner_plugin_config]]
+#plugin_name = "cuckarood_cpu_compat_29"
+#[mining.miner_plugin_config.parameters]
+#nthreads = 4
 
 # As above, but for processors supporting avx2
 
@@ -102,10 +102,10 @@ nthreads = 4
 #
 
 # currently requires 6GB GPU memory
-#[[mining.miner_plugin_config]]
-#plugin_name = "cuckaroom_cuda_29"
-#[mining.miner_plugin_config.parameters]
-#device = 0
+[[mining.miner_plugin_config]]
+plugin_name = "cuckarooz_cuda_29"
+[mining.miner_plugin_config.parameters]
+device = 0
 #cpuload = 1
 #ntrims = 15
 #genablocks = 1024
@@ -115,7 +115,7 @@ nthreads = 4
 # e.g. To enable multiple devices (copy params from above as needed)
 
 #[[mining.miner_plugin_config]]
-#plugin_name = "cuckarood_cuda_29"
+#plugin_name = "cuckarooz_cuda_29"
 #[mining.miner_plugin_config.parameters]
 #device = 1
 

diff --git a/ocl_cuckaroo/Cargo.toml b/ocl_cuckaroo/Cargo.toml
@@ -11,7 +11,7 @@ profile = []
 [dependencies]
 blake2-rfc = "0.2"
 byteorder = "1"
-grin_miner_plugin = { path = "../plugin", version = "3.0.0-beta.1" }
+grin_miner_plugin = { path = "../plugin", version = "4.0.0" }
 libc = "0.2"
 hashbrown = "0.7"
 ocl = "0.19"

diff --git a/ocl_cuckatoo/Cargo.toml b/ocl_cuckatoo/Cargo.toml
@@ -6,7 +6,7 @@ workspace = ".."
 [dependencies]
 blake2-rfc = "0.2"
 byteorder = "1"
-grin_miner_plugin = { path = "../plugin", version = "3.0.0-beta.1" }
+grin_miner_plugin = { path = "../plugin", version = "4.0.0" }
 libc = "0.2"
 ocl = "0.19"
 hashbrown = "0.7"

diff --git a/plugin/Cargo.toml b/plugin/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_miner_plugin"
-version = "3.0.0-beta.1"
+version = "4.0.0"
 authors = ["Grin Developers <[email protected]>"]
 repository = "https://github.com/mimblewimble/grin-miner"
 description = "Device specific plugins for the grin miner"

diff --git a/util/Cargo.toml b/util/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "grin_miner_util"
-version = "3.0.0-beta.1"
+version = "4.0.0"
 authors = ["Grin Developers <[email protected]>"]
 description = "Utilities for the grin miner"
 repository = "https://github.com/mimblewimble/grin-miner"
+1 −2		README.md
+12 −0		src/cuckaroom/Makefile
+62 −0		src/cuckarooz/Makefile
+67 −0		src/cuckarooz/bitmap.hpp
+75 −0		src/cuckarooz/compress.hpp
+59 −0		src/cuckarooz/cuckarooz.c
+211 −0		src/cuckarooz/cuckarooz.hpp
+136 −0		src/cuckarooz/graph.hpp
+577 −0		src/cuckarooz/kernel.cuh
+175 −0		src/cuckarooz/mean.cpp
+1,540 −0		src/cuckarooz/mean.cu
+935 −0		src/cuckarooz/mean.hpp
+124 −0		src/cuckarooz/simple.cpp