benches: fewer, perhaps the more meaningful, sysbenches to reduce clutter

Signed-off-by: Burt P <pburt0@gmail.com>

3 files changed, 10 insertions, 10 deletions

diff --git a/data/benchmark.conf b/data/benchmark.conf
index 701f51c7..f25b6ecb 100644
--- a/data/benchmark.conf
+++ b/data/benchmark.conf
@@ -420,6 +420,6 @@ HP_18E7_(HP_ProDesk_600_G1_SFF);Intel_Core_i5_4570;14400_00 = 6161.209961; 7.000
 Raspberry_Pi_4_Model_B_Rev_1_1;Broadcom_BCM2838;7000_00 = 715.630005; 4.270300; 2; 4012; --time=7 --memory-block-size=1K --memory-total-size=3056M --memory-scope=global --memory-hugetlb=off --memory-oper=write --memory-access-mode=seq; overclock: overvoltage=4 arm_freq=1750 gpu_freq=600|2|Raspberry Pi 4 Model B Rev 1.1|Broadcom BCM2838|4x ARM Cortex-A72 r0p3 (AArch32)|4x 1750.00 MHz|3999788|1|4|4||Broadcom VideoCore IV|0
 HP_18E7_(HP_ProDesk_600_G1_SFF);Intel_Core_i5_4570;14400_00 = 8750.669922; 7.000100; 2; 1000015; --threads=2 --time=7 --memory-block-size=1K --memory-total-size=100G --memory-scope=global --memory-hugetlb=off --memory-oper=write --memory-access-mode=seq|2|HP 18E7 (HP ProDesk 600 G1 SFF)|Intel Core i5-4570|1 physical processor; 4 cores; 4 threads|4x 3600.00 MHz|24568776|1|4|4||Intel Xeon E3-1200 v3/4th Gen Core Integrated Graphics
 
-[SysBench Memory (Four threads)]
+[SysBench Memory]
 Raspberry_Pi_4_Model_B_Rev_1_1;Broadcom_BCM2838;7000_00 = 1374.790039; 2.222900; 4; 4012; --time=7 --memory-block-size=1K --memory-total-size=3056M --memory-scope=global --memory-hugetlb=off --memory-oper=write --memory-access-mode=seq; overclock: overvoltage=4 arm_freq=1750 gpu_freq=600|4|Raspberry Pi 4 Model B Rev 1.1|Broadcom BCM2838|4x ARM Cortex-A72 r0p3 (AArch32)|4x 1750.00 MHz|3999788|1|4|4||Broadcom VideoCore IV|0
 HP_18E7_(HP_ProDesk_600_G1_SFF);Intel_Core_i5_4570;14400_00 = 11383.990234; 7.000000; 4; 1000015; --threads=4 --time=7 --memory-block-size=1K --memory-total-size=100G --memory-scope=global --memory-hugetlb=off --memory-oper=write --memory-access-mode=seq|4|HP 18E7 (HP ProDesk 600 G1 SFF)|Intel Core i5-4570|1 physical processor; 4 cores; 4 threads|4x 3600.00 MHz|24568776|1|4|4||Intel Xeon E3-1200 v3/4th Gen Core Integrated Graphics
diff --git a/modules/benchmark/benches.c b/modules/benchmark/benches.c
index 8499ef64..de1aa507 100644
--- a/modules/benchmark/benches.c
+++ b/modules/benchmark/benches.c
@@ -52,7 +52,7 @@ BENCH_SIMPLE(BENCHMARK_SBCPU_ALL, "SysBench CPU (Multi-thread)", benchmark_sbcpu
 BENCH_SIMPLE(BENCHMARK_SBCPU_QUAD, "SysBench CPU (Four threads)", benchmark_sbcpu_quad, 1);
 BENCH_SIMPLE(BENCHMARK_MEMORY_SINGLE, "SysBench Memory (Single-thread)", benchmark_memory_single, 1);
 BENCH_SIMPLE(BENCHMARK_MEMORY_DUAL, "SysBench Memory (Two threads)", benchmark_memory_dual, 1);
-BENCH_SIMPLE(BENCHMARK_MEMORY_QUAD, "SysBench Memory (Four threads)", benchmark_memory_quad, 1);
+BENCH_SIMPLE(BENCHMARK_MEMORY_QUAD, "SysBench Memory", benchmark_memory_quad, 1);
 
 #if !GTK_CHECK_VERSION(3,0,0)
 BENCH_CALLBACK(callback_gui, "GPU Drawing", BENCHMARK_GUI, 1);
@@ -101,13 +101,13 @@ static ModuleEntry entries[] = {
     [BENCHMARK_SBCPU_ALL] =
     {N_("SysBench CPU (Multi-thread)"), "processor.png", callback_benchmark_sbcpu_all, scan_benchmark_sbcpu_all, MODULE_FLAG_NONE},
     [BENCHMARK_SBCPU_QUAD] =
-    {N_("SysBench CPU (Four threads)"), "processor.png", callback_benchmark_sbcpu_quad, scan_benchmark_sbcpu_quad, MODULE_FLAG_NONE},
+    {N_("#SysBench CPU (Four threads)"), "processor.png", callback_benchmark_sbcpu_quad, scan_benchmark_sbcpu_quad, MODULE_FLAG_NONE},
     [BENCHMARK_MEMORY_SINGLE] =
-    {N_("SysBench Memory (Single-thread)"), "memory.png", callback_benchmark_memory_single, scan_benchmark_memory_single, MODULE_FLAG_NONE},
+    {N_("#SysBench Memory (Single-thread)"), "memory.png", callback_benchmark_memory_single, scan_benchmark_memory_single, MODULE_FLAG_NONE},
     [BENCHMARK_MEMORY_DUAL] =
-    {N_("SysBench Memory (Two threads)"), "memory.png", callback_benchmark_memory_dual, scan_benchmark_memory_dual, MODULE_FLAG_NONE},
+    {N_("#SysBench Memory (Two threads)"), "memory.png", callback_benchmark_memory_dual, scan_benchmark_memory_dual, MODULE_FLAG_NONE},
     [BENCHMARK_MEMORY_QUAD] =
-    {N_("SysBench Memory (Four threads)"), "memory.png", callback_benchmark_memory_quad, scan_benchmark_memory_quad, MODULE_FLAG_NONE},
+    {N_("SysBench Memory"), "memory.png", callback_benchmark_memory_quad, scan_benchmark_memory_quad, MODULE_FLAG_NONE},
 #if !GTK_CHECK_VERSION(3,0,0)
     [BENCHMARK_GUI] =
     {N_("GPU Drawing"), "module.png", callback_gui, scan_gui, MODULE_FLAG_NO_REMOTE},
diff --git a/test/just_bench.sh b/test/just_bench.sh
index 20d6c01b..dd1d61c8 100644
--- a/test/just_bench.sh
+++ b/test/just_bench.sh
@@ -26,10 +26,10 @@ do_hi_bench() {
 if [ ! -z `which sysbench` ]; then
     do_hi_bench "SysBench CPU (Single-thread)"
     do_hi_bench "SysBench CPU (Multi-thread)"
-    do_hi_bench "SysBench CPU (Four threads)"
-    do_hi_bench "SysBench Memory (Single-thread)"
-    do_hi_bench "SysBench Memory (Two threads)"
-    do_hi_bench "SysBench Memory (Four threads)"
+    #do_hi_bench "SysBench CPU (Four threads)"
+    #do_hi_bench "SysBench Memory (Single-thread)"
+    #do_hi_bench "SysBench Memory (Two threads)"
+    do_hi_bench "SysBench Memory"
 fi
 
 do_hi_bench "CPU Blowfish (Single-thread)"