make all compat miners use sse2, bump version to 2.1.0 (#224)

* update cuckoo submodule to latest * add cuckarood cpu mean miner * make all compat miners use sse2, bump version to 2.1.0 * resolve conflicts
mimblewimble · Sep 2, 2019 · 17185f4 · 17185f4
1 parent 1c1e163
commit 17185f4
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 15 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 = "2.0.0"
+version = "2.1.0"
 authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
 description = "Mining software for Grin, supports CPU and CUDA GPUs."
 build = "src/build/build.rs"
@@ -35,9 +35,9 @@ time = "0.1"
 grin_miner_util = { path = "./util", version = "2.0.0" }
 grin_miner_plugin = { path = "./plugin", version = "2.0.0" }
 grin_miner_config = { path = "./config", version = "2.0.0" }
-cuckoo_miner = { path = "./cuckoo-miner", version = "2.0.0" }
+cuckoo_miner = { path = "./cuckoo-miner", version = "2.1.0" }
 #use this alternative inclusion below to build cuda plugins
-#cuckoo_miner = { path = "./cuckoo-miner", version = "2.0.0", features = ["build-cuda-plugins"]}
+#cuckoo_miner = { path = "./cuckoo-miner", version = "2.1.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/cuckoo-miner/Cargo.toml b/cuckoo-miner/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "cuckoo_miner"
-version = "2.0.0"
+version = "2.1.0"
 authors = ["yeastplume"]
 license = "MIT/Apache-2.0/BSD-3-Clause"
 description = "Rust bindings to John Tromp's Cuckoo Cycle Implementations"

diff --git a/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt b/cuckoo-miner/src/cuckoo_sys/plugins/CMakeLists.txt
@@ -57,7 +57,7 @@ set (AT_LEAN_CPU_SRC
 			cuckoo/src/cuckatoo/lean.cpp
 			${BLAKE_2B})
 
-build_cpu_target("${AT_LEAN_CPU_SRC}" cuckatoo_lean_cpu_compat_19 "-DNSIPHASH=1 -DATOMIC -DEDGEBITS=19")
+build_cpu_target("${AT_LEAN_CPU_SRC}" cuckatoo_lean_cpu_compat_19 "-mno-avx2 -DNSIPHASH=4 -DATOMIC -DEDGEBITS=19")
 build_cpu_target("${AT_LEAN_CPU_SRC}" cuckatoo_lean_cpu_compat_31 "-mno-avx2 -DNSIPHASH=4 -DATOMIC -DEDGEBITS=31")
 build_cpu_target("${AT_LEAN_CPU_SRC}" cuckatoo_lean_cpu_avx2_31 "-mavx2 -DNSIPHASH=8 -DATOMIC -DEDGEBITS=31")
 
@@ -74,7 +74,7 @@ set (AT_MEAN_CPU_SRC
 			cuckoo/src/cuckatoo/mean.cpp
 			${BLAKE_2B})
 
-build_cpu_target("${AT_MEAN_CPU_SRC}" cuckatoo_mean_cpu_compat_19 "-DXBITS=2 -DNSIPHASH=1 -DSAVEEDGES -DEDGEBITS=19")
+build_cpu_target("${AT_MEAN_CPU_SRC}" cuckatoo_mean_cpu_compat_19 "-mno-avx2 -DXBITS=2 -DNSIPHASH=4 -DSAVEEDGES -DEDGEBITS=19")
 build_cpu_target("${AT_MEAN_CPU_SRC}" cuckatoo_mean_cpu_avx2_19 "-mavx2 -DXBITS=2 -DNSIPHASH=8 -DSAVEEDGES -DEDGEBITS=19")
 build_cpu_target("${AT_MEAN_CPU_SRC}" cuckatoo_mean_cpu_compat_31 "-mno-avx2 -DXBITS=8 -DNSIPHASH=4 -DEXPANDROUND=8 -DCOMPRESSROUND=22 -DSAVEEDGES -DEDGEBITS=31")
 build_cpu_target("${AT_MEAN_CPU_SRC}" cuckatoo_mean_cpu_avx2_31 "-mavx2 -DXBITS=8 -DNSIPHASH=8 -DEXPANDROUND=8 -DCOMPRESSROUND=22 -DSAVEEDGES -DEDGEBITS=31")
@@ -122,7 +122,7 @@ set (AR_CPU_SRC
 
 ### AR CPU TARGETS #########################################
 
-build_cpu_target("${AR_CPU_SRC}" cuckaroo_cpu_compat_19 "-DXBITS=2 -DNSIPHASH=1 -DEDGEBITS=19 -DSAVEEDGES")
+build_cpu_target("${AR_CPU_SRC}" cuckaroo_cpu_compat_19 "-mno-avx2 -DXBITS=2 -DNSIPHASH=4 -DEDGEBITS=19 -DSAVEEDGES")
 build_cpu_target("${AR_CPU_SRC}" cuckaroo_cpu_avx2_19 "-mavx2 -DXBITS=2 -DNSIPHASH=8 -DEDGEBITS=19 -DSAVEEDGES")
 build_cpu_target("${AR_CPU_SRC}" cuckaroo_cpu_compat_29 "-mno-avx2 -DNSIPHASH=4 -DEDGEBITS=29 -DSAVEEDGES")
 build_cpu_target("${AR_CPU_SRC}" cuckaroo_cpu_avx2_29 "-mavx2 -DNSIPHASH=8 -DEDGEBITS=29 -DSAVEEDGES")
@@ -155,7 +155,7 @@ set (AR2_CPU_SRC
 
 ### AR CPU TARGETS #########################################
 
-build_cpu_target("${AR2_CPU_SRC}" cuckarood_cpu_compat_19 "-DXBITS=2 -DNSIPHASH=1 -DEDGEBITS=19 -DSAVEEDGES")
+build_cpu_target("${AR2_CPU_SRC}" cuckarood_cpu_compat_19 "-mno-avx2 -DXBITS=2 -DNSIPHASH=4 -DEDGEBITS=19 -DSAVEEDGES")
 build_cpu_target("${AR2_CPU_SRC}" cuckarood_cpu_avx2_19 "-mavx2 -DXBITS=2 -DNSIPHASH=8 -DEDGEBITS=19 -DSAVEEDGES")
 build_cpu_target("${AR2_CPU_SRC}" cuckarood_cpu_compat_29 "-mno-avx2 -DNSIPHASH=4 -DEDGEBITS=29 -DSAVEEDGES")
 build_cpu_target("${AR2_CPU_SRC}" cuckarood_cpu_avx2_29 "-mavx2 -DNSIPHASH=8 -DEDGEBITS=29 -DSAVEEDGES")

diff --git a/src/bin/mining.rs b/src/bin/mining.rs
@@ -135,11 +135,12 @@ impl Controller {
 			if !s.has_errored {
 				debug!(
 					LOGGER,
-							"Mining: Plugin {} - Device {} ({}) at Cuck(at)oo{} - Status: {} : Last Graph time: {}s; \
+							"Mining: Plugin {} - Device {} ({}) at Cucka{}{} - Status: {} : Last Graph time: {}s; \
 					 Graphs per second: {:.*} - Total Attempts: {}",
 							i,
 					s.device_id,
 					s.get_device_name(),
+					if s.edge_bits < 30 { "rood" } else { "too" },
 					s.edge_bits,
 					status,
 					last_solution_time_secs,
@@ -164,7 +165,7 @@ impl Controller {
 		}
 		info!(
 			LOGGER,
-			"Mining: Cuck(at)oo at {} gps (graphs per second)", sps_total
+			"Mining: Cucka*oo* at {} gps (graphs per second)", sps_total
 		);
 
 		if sps_total.is_finite() {

diff --git a/src/bin/tui/mining.rs b/src/bin/tui/mining.rs
@@ -183,7 +183,7 @@ impl TUIStatusListener for TUIMiningView {
 							mining_stats.block_height, 4, mining_stats.combined_gps()
 						),
 						format!(
-							"Cuckatoo/Cuckarood - Target Share Difficulty {}",
+							"Cucka*oo* - Target Share Difficulty {}",
 							mining_stats.target_difficulty.to_string()
 						),
 					)