diff --git a/test/benchmark/README.md b/test/benchmark/README.md index 30ebde32d..22a28a3c4 100644 --- a/test/benchmark/README.md +++ b/test/benchmark/README.md @@ -164,7 +164,7 @@ Below are the contents of these files for the sample benchmark: // sqlite/ext2_benchmarks/bench_results/ext2_deletes_between.json { "result_extraction": { - "search_pattern": "10000 DELETEs, numeric BETWEEN, indexed....", + "search_pattern": "[0-9]+ DELETEs, numeric BETWEEN, indexed....", "result_index": 8 }, "chart": { @@ -174,7 +174,7 @@ Below are the contents of these files for the sample benchmark: // sqlite/ext2_benchmarks/bench_results/ext2_updates_between.json { "result_extraction": { - "search_pattern": "10000 UPDATES, numeric BETWEEN, indexed....", + "search_pattern": "[0-9]+ UPDATES, numeric BETWEEN, indexed....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/fio/ext2_iommu_seq_read_bw/bench_result.json b/test/benchmark/fio/ext2_iommu_seq_read_bw/bench_result.json index cd7abfa79..ff529e8f7 100644 --- a/test/benchmark/fio/ext2_iommu_seq_read_bw/bench_result.json +++ b/test/benchmark/fio/ext2_iommu_seq_read_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "bw=", + "search_pattern": "bw=[0-9]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/fio/ext2_iommu_seq_write_bw/bench_result.json b/test/benchmark/fio/ext2_iommu_seq_write_bw/bench_result.json index 8ab9aa61b..14a3480e4 100644 --- a/test/benchmark/fio/ext2_iommu_seq_write_bw/bench_result.json +++ b/test/benchmark/fio/ext2_iommu_seq_write_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "bw=", + "search_pattern": "bw=[0-9]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/fio/ext2_seq_read_bw/bench_result.json b/test/benchmark/fio/ext2_seq_read_bw/bench_result.json index c86c9bff0..c82e952d6 100644 --- a/test/benchmark/fio/ext2_seq_read_bw/bench_result.json +++ b/test/benchmark/fio/ext2_seq_read_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "bw=", + "search_pattern": "bw=[0-9]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/fio/ext2_seq_write_bw/bench_result.json b/test/benchmark/fio/ext2_seq_write_bw/bench_result.json index a4ec8c3a7..6d6fcef3a 100644 --- a/test/benchmark/fio/ext2_seq_write_bw/bench_result.json +++ b/test/benchmark/fio/ext2_seq_write_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "bw=", + "search_pattern": "bw=[0-9]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/ext2_copy_files_bw/bench_result.json b/test/benchmark/lmbench/ext2_copy_files_bw/bench_result.json index 331ad0615..3f95219d5 100644 --- a/test/benchmark/lmbench/ext2_copy_files_bw/bench_result.json +++ b/test/benchmark/lmbench/ext2_copy_files_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "lmdd result:", + "search_pattern": "lmdd result: +[0-9.]+", "result_index": 8 }, "chart": { diff --git a/test/benchmark/lmbench/fifo_lat/bench_result.json b/test/benchmark/lmbench/fifo_lat/bench_result.json index 501704e38..8f9dd75da 100644 --- a/test/benchmark/lmbench/fifo_lat/bench_result.json +++ b/test/benchmark/lmbench/fifo_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Fifo latency", + "search_pattern": "Fifo latency: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/mem_copy_bw/bench_result.json b/test/benchmark/lmbench/mem_copy_bw/bench_result.json index e297f3398..14d3b8b50 100644 --- a/test/benchmark/lmbench/mem_copy_bw/bench_result.json +++ b/test/benchmark/lmbench/mem_copy_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "536.87", + "search_pattern": "536.87 +[0-9.]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/mem_mmap_bw/bench_result.json b/test/benchmark/lmbench/mem_mmap_bw/bench_result.json index 5618f220f..66c5f5106 100644 --- a/test/benchmark/lmbench/mem_mmap_bw/bench_result.json +++ b/test/benchmark/lmbench/mem_mmap_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "268.44", + "search_pattern": "268.44 +[0-9.]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/mem_mmap_lat/bench_result.json b/test/benchmark/lmbench/mem_mmap_lat/bench_result.json index 65d43821d..4181e4d97 100644 --- a/test/benchmark/lmbench/mem_mmap_lat/bench_result.json +++ b/test/benchmark/lmbench/mem_mmap_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "4.194304", + "search_pattern": "4.194304 +[0-9.]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/mem_pagefault_lat/bench_result.json b/test/benchmark/lmbench/mem_pagefault_lat/bench_result.json index 8a3bae31c..456d45bf2 100644 --- a/test/benchmark/lmbench/mem_pagefault_lat/bench_result.json +++ b/test/benchmark/lmbench/mem_pagefault_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Pagefaults on ", + "search_pattern": "Pagefaults on [^:]+: +[0-9.]+", "result_index": 4 }, "chart": { diff --git a/test/benchmark/lmbench/mem_read_bw/bench_result.json b/test/benchmark/lmbench/mem_read_bw/bench_result.json index 2ffc718d7..c5968678e 100644 --- a/test/benchmark/lmbench/mem_read_bw/bench_result.json +++ b/test/benchmark/lmbench/mem_read_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "536.87", + "search_pattern": "536.87 +[0-9.]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/mem_write_bw/bench_result.json b/test/benchmark/lmbench/mem_write_bw/bench_result.json index 64c6c7f5c..5c31b5232 100644 --- a/test/benchmark/lmbench/mem_write_bw/bench_result.json +++ b/test/benchmark/lmbench/mem_write_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "536.87", + "search_pattern": "536.87 +[0-9.]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/pipe_bw/bench_result.json b/test/benchmark/lmbench/pipe_bw/bench_result.json index bb2e26ee9..5c2196116 100644 --- a/test/benchmark/lmbench/pipe_bw/bench_result.json +++ b/test/benchmark/lmbench/pipe_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "Pipe bandwidth", + "search_pattern": "Pipe bandwidth: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/pipe_lat/bench_result.json b/test/benchmark/lmbench/pipe_lat/bench_result.json index 494545130..172e9a03c 100644 --- a/test/benchmark/lmbench/pipe_lat/bench_result.json +++ b/test/benchmark/lmbench/pipe_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Pipe latency", + "search_pattern": "Pipe latency: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/process_ctx_lat/bench_result.json b/test/benchmark/lmbench/process_ctx_lat/bench_result.json index 2a3fc582c..b83cef6ac 100644 --- a/test/benchmark/lmbench/process_ctx_lat/bench_result.json +++ b/test/benchmark/lmbench/process_ctx_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "18 ", + "search_pattern": "18 +[0-9.]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/process_exec_lat/bench_result.json b/test/benchmark/lmbench/process_exec_lat/bench_result.json index 0bf72c7ce..9015ccfaf 100644 --- a/test/benchmark/lmbench/process_exec_lat/bench_result.json +++ b/test/benchmark/lmbench/process_exec_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Process fork\\+execve", + "search_pattern": "Process fork\\+execve: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/process_fork_lat/bench_result.json b/test/benchmark/lmbench/process_fork_lat/bench_result.json index c55c98370..fa69c0d9b 100644 --- a/test/benchmark/lmbench/process_fork_lat/bench_result.json +++ b/test/benchmark/lmbench/process_fork_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Process fork", + "search_pattern": "Process fork\\+exit: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/process_getppid_lat/bench_result.json b/test/benchmark/lmbench/process_getppid_lat/bench_result.json index f8e3d265e..254fabbbe 100644 --- a/test/benchmark/lmbench/process_getppid_lat/bench_result.json +++ b/test/benchmark/lmbench/process_getppid_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Simple syscall:", + "search_pattern": "Simple syscall: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/semaphore_lat/bench_result.json b/test/benchmark/lmbench/semaphore_lat/bench_result.json index 3caa1c881..47800203c 100644 --- a/test/benchmark/lmbench/semaphore_lat/bench_result.json +++ b/test/benchmark/lmbench/semaphore_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Semaphore latency:", + "search_pattern": "Semaphore latency: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/signal_catch_lat/bench_result.json b/test/benchmark/lmbench/signal_catch_lat/bench_result.json index 4aa10bf43..ff9ea207a 100644 --- a/test/benchmark/lmbench/signal_catch_lat/bench_result.json +++ b/test/benchmark/lmbench/signal_catch_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Signal handler overhead:", + "search_pattern": "Signal handler overhead: +[0-9.]+", "result_index": 4 }, "chart": { diff --git a/test/benchmark/lmbench/signal_install_lat/bench_result.json b/test/benchmark/lmbench/signal_install_lat/bench_result.json index b67047e6e..a926bd986 100644 --- a/test/benchmark/lmbench/signal_install_lat/bench_result.json +++ b/test/benchmark/lmbench/signal_install_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Signal handler installation:", + "search_pattern": "Signal handler installation: +[0-9.]+", "result_index": 4 }, "chart": { diff --git a/test/benchmark/lmbench/signal_prot_lat/bench_result.json b/test/benchmark/lmbench/signal_prot_lat/bench_result.json index 0fc499d3d..448681225 100644 --- a/test/benchmark/lmbench/signal_prot_lat/bench_result.json +++ b/test/benchmark/lmbench/signal_prot_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Protection fault:", + "search_pattern": "Protection fault: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/tcp_loopback_bw_4k/bench_result.json b/test/benchmark/lmbench/tcp_loopback_bw_4k/bench_result.json index 254c9915d..c1459a12c 100644 --- a/test/benchmark/lmbench/tcp_loopback_bw_4k/bench_result.json +++ b/test/benchmark/lmbench/tcp_loopback_bw_4k/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "0.004096 ", + "search_pattern": "0.004096 +[0-9.]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/tcp_loopback_bw_64k/bench_result.json b/test/benchmark/lmbench/tcp_loopback_bw_64k/bench_result.json index adb6c494e..85f2eee3d 100644 --- a/test/benchmark/lmbench/tcp_loopback_bw_64k/bench_result.json +++ b/test/benchmark/lmbench/tcp_loopback_bw_64k/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "0.065536 ", + "search_pattern": "0.065536 +[0-9.]+ +MB", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/tcp_loopback_connect_lat/bench_result.json b/test/benchmark/lmbench/tcp_loopback_connect_lat/bench_result.json index 43abe9b28..bb0a2e3c7 100644 --- a/test/benchmark/lmbench/tcp_loopback_connect_lat/bench_result.json +++ b/test/benchmark/lmbench/tcp_loopback_connect_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "TCP\\/IP connection cost to 127.0.0.1:", + "search_pattern": "TCP\\/IP connection cost to [0-9.]+: +[0-9.]+", "result_index": 6 }, "chart": { diff --git a/test/benchmark/lmbench/tcp_loopback_http_bw/bench_result.json b/test/benchmark/lmbench/tcp_loopback_http_bw/bench_result.json index 521a8acdc..052558cb6 100644 --- a/test/benchmark/lmbench/tcp_loopback_http_bw/bench_result.json +++ b/test/benchmark/lmbench/tcp_loopback_http_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "Avg xfer: ", + "search_pattern": "Avg xfer: +([0-9.]+|inf)", "result_index": 8 }, "chart": { diff --git a/test/benchmark/lmbench/tcp_loopback_lat/bench_result.json b/test/benchmark/lmbench/tcp_loopback_lat/bench_result.json index 727846ca6..50cb6eb3e 100644 --- a/test/benchmark/lmbench/tcp_loopback_lat/bench_result.json +++ b/test/benchmark/lmbench/tcp_loopback_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "TCP latency using 127.0.0.1:", + "search_pattern": "TCP latency using [0-9.]+: +[0-9.]+", "result_index": 5 }, "chart": { diff --git a/test/benchmark/lmbench/tcp_loopback_select_lat/bench_result.json b/test/benchmark/lmbench/tcp_loopback_select_lat/bench_result.json index 8ce31a4ba..12e0b6b96 100644 --- a/test/benchmark/lmbench/tcp_loopback_select_lat/bench_result.json +++ b/test/benchmark/lmbench/tcp_loopback_select_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Select on 200 tcp fd's:", + "search_pattern": "Select on [0-9.]+ tcp fd's: +[0-9.]+", "result_index": 6 }, "chart": { diff --git a/test/benchmark/lmbench/tcp_virtio_bw_64k/bench_result.json b/test/benchmark/lmbench/tcp_virtio_bw_64k/bench_result.json index ba40021e3..42a2f6419 100644 --- a/test/benchmark/lmbench/tcp_virtio_bw_64k/bench_result.json +++ b/test/benchmark/lmbench/tcp_virtio_bw_64k/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "0.065536 ", + "search_pattern": "0.065536 +[0-9.]+ +MB", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/tcp_virtio_lat/bench_result.json b/test/benchmark/lmbench/tcp_virtio_lat/bench_result.json index f422c705d..0a806fa13 100644 --- a/test/benchmark/lmbench/tcp_virtio_lat/bench_result.json +++ b/test/benchmark/lmbench/tcp_virtio_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "TCP latency using 10.0.2.15:", + "search_pattern": "TCP latency using [0-9.]+: +[0-9.]+", "result_index": 5 }, "chart": { diff --git a/test/benchmark/lmbench/udp_loopback_lat/bench_result.json b/test/benchmark/lmbench/udp_loopback_lat/bench_result.json index 8123537b1..4fe8a466e 100644 --- a/test/benchmark/lmbench/udp_loopback_lat/bench_result.json +++ b/test/benchmark/lmbench/udp_loopback_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "UDP latency using 127.0.0.1:", + "search_pattern": "UDP latency using [0-9.]+: +[0-9.]+", "result_index": 5 }, "chart": { diff --git a/test/benchmark/lmbench/unix_bw/bench_result.json b/test/benchmark/lmbench/unix_bw/bench_result.json index ddccf1c95..c43665686 100644 --- a/test/benchmark/lmbench/unix_bw/bench_result.json +++ b/test/benchmark/lmbench/unix_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "sock stream bandwidth", + "search_pattern": "sock stream bandwidth: +[0-9.]+", "result_index": 5 }, "chart": { diff --git a/test/benchmark/lmbench/unix_connect_lat/bench_result.json b/test/benchmark/lmbench/unix_connect_lat/bench_result.json index f31544afe..24aa65988 100644 --- a/test/benchmark/lmbench/unix_connect_lat/bench_result.json +++ b/test/benchmark/lmbench/unix_connect_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "UNIX connection cost:", + "search_pattern": "UNIX connection cost: +[0-9.]+", "result_index": 4 }, "chart": { diff --git a/test/benchmark/lmbench/unix_lat/bench_result.json b/test/benchmark/lmbench/unix_lat/bench_result.json index 40aa743b3..b1e3132f8 100644 --- a/test/benchmark/lmbench/unix_lat/bench_result.json +++ b/test/benchmark/lmbench/unix_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "sock stream latency", + "search_pattern": "sock stream latency: +[0-9.]+", "result_index": 5 }, "chart": { diff --git a/test/benchmark/lmbench/vfs_fcntl_lat/bench_result.json b/test/benchmark/lmbench/vfs_fcntl_lat/bench_result.json index 03a11fa2e..40c3eefab 100644 --- a/test/benchmark/lmbench/vfs_fcntl_lat/bench_result.json +++ b/test/benchmark/lmbench/vfs_fcntl_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Fcntl lock latency:", + "search_pattern": "Fcntl lock latency: +[0-9.]+", "result_index": 4 }, "chart": { diff --git a/test/benchmark/lmbench/vfs_fstat_lat/bench_result.json b/test/benchmark/lmbench/vfs_fstat_lat/bench_result.json index 44275b426..b3d13dd54 100644 --- a/test/benchmark/lmbench/vfs_fstat_lat/bench_result.json +++ b/test/benchmark/lmbench/vfs_fstat_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Simple fstat", + "search_pattern": "Simple fstat: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/vfs_open_lat/bench_result.json b/test/benchmark/lmbench/vfs_open_lat/bench_result.json index a46ad2c27..c0fd0b5d3 100644 --- a/test/benchmark/lmbench/vfs_open_lat/bench_result.json +++ b/test/benchmark/lmbench/vfs_open_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Simple open\\/close", + "search_pattern": "Simple open\\/close: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/vfs_read_lat/bench_result.json b/test/benchmark/lmbench/vfs_read_lat/bench_result.json index ad5dc4d6a..2daab4d72 100644 --- a/test/benchmark/lmbench/vfs_read_lat/bench_result.json +++ b/test/benchmark/lmbench/vfs_read_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Simple read:", + "search_pattern": "Simple read: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/vfs_read_pagecache_bw/bench_result.json b/test/benchmark/lmbench/vfs_read_pagecache_bw/bench_result.json index 7400f6a83..69ede0611 100644 --- a/test/benchmark/lmbench/vfs_read_pagecache_bw/bench_result.json +++ b/test/benchmark/lmbench/vfs_read_pagecache_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "536.87", + "search_pattern": "536.87 +[0-9.]+", "result_index": 2 }, "chart": { diff --git a/test/benchmark/lmbench/vfs_select_lat/bench_result.json b/test/benchmark/lmbench/vfs_select_lat/bench_result.json index 17b0b92b2..ea0263566 100644 --- a/test/benchmark/lmbench/vfs_select_lat/bench_result.json +++ b/test/benchmark/lmbench/vfs_select_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Select on ", + "search_pattern": "Select on [0-9]+ fd's: +[0-9.]+", "result_index": 5 }, "chart": { diff --git a/test/benchmark/lmbench/vfs_stat_lat/bench_result.json b/test/benchmark/lmbench/vfs_stat_lat/bench_result.json index 850740c58..1404772d9 100644 --- a/test/benchmark/lmbench/vfs_stat_lat/bench_result.json +++ b/test/benchmark/lmbench/vfs_stat_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Simple stat", + "search_pattern": "Simple stat: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/lmbench/vfs_write_lat/bench_result.json b/test/benchmark/lmbench/vfs_write_lat/bench_result.json index bb8d45943..760b93b85 100644 --- a/test/benchmark/lmbench/vfs_write_lat/bench_result.json +++ b/test/benchmark/lmbench/vfs_write_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Simple write:", + "search_pattern": "Simple write: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/nginx/http_req10k_conc1_bw/bench_result.json b/test/benchmark/nginx/http_req10k_conc1_bw/bench_result.json index 894447c70..3730f5186 100644 --- a/test/benchmark/nginx/http_req10k_conc1_bw/bench_result.json +++ b/test/benchmark/nginx/http_req10k_conc1_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "Transfer rate:", + "search_pattern": "Transfer rate: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/nginx/http_req10k_conc20_bw/bench_result.json b/test/benchmark/nginx/http_req10k_conc20_bw/bench_result.json index f3473bf9a..45310d16f 100644 --- a/test/benchmark/nginx/http_req10k_conc20_bw/bench_result.json +++ b/test/benchmark/nginx/http_req10k_conc20_bw/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "Transfer rate:", + "search_pattern": "Transfer rate: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/redis/get_100k_conc20_rps/bench_result.json b/test/benchmark/redis/get_100k_conc20_rps/bench_result.json index 11ab78537..d10d229cd 100644 --- a/test/benchmark/redis/get_100k_conc20_rps/bench_result.json +++ b/test/benchmark/redis/get_100k_conc20_rps/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "throughput summary:", + "search_pattern": "throughput summary: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/redis/ping_inline_100k_conc20_rps/bench_result.json b/test/benchmark/redis/ping_inline_100k_conc20_rps/bench_result.json index f296b10b5..a98359a1f 100644 --- a/test/benchmark/redis/ping_inline_100k_conc20_rps/bench_result.json +++ b/test/benchmark/redis/ping_inline_100k_conc20_rps/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "throughput summary:", + "search_pattern": "throughput summary: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/redis/ping_mbulk_100k_conc20_rps/bench_result.json b/test/benchmark/redis/ping_mbulk_100k_conc20_rps/bench_result.json index ada7bc339..627ab7325 100644 --- a/test/benchmark/redis/ping_mbulk_100k_conc20_rps/bench_result.json +++ b/test/benchmark/redis/ping_mbulk_100k_conc20_rps/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "throughput summary:", + "search_pattern": "throughput summary: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/redis/set_100k_conc20_rps/bench_result.json b/test/benchmark/redis/set_100k_conc20_rps/bench_result.json index 668861039..35198ce27 100644 --- a/test/benchmark/redis/set_100k_conc20_rps/bench_result.json +++ b/test/benchmark/redis/set_100k_conc20_rps/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": true }, "result_extraction": { - "search_pattern": "throughput summary:", + "search_pattern": "throughput summary: +[0-9.]+", "result_index": 3 }, "chart": { diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_between.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_between.json index f5930ef13..6022fafc9 100644 --- a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_between.json +++ b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_between.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "100000 DELETEs, numeric BETWEEN, indexed....", + "search_pattern": "[0-9]+ DELETEs, numeric BETWEEN, indexed....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_individual.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_individual.json index 67aaecb75..6b35841cc 100644 --- a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_individual.json +++ b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_deletes_individual.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "500000 DELETEs of individual rows....", + "search_pattern": "[0-9]+ DELETEs of individual rows....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_refill_replace.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_refill_replace.json index db74a7cff..cf97b260b 100644 --- a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_refill_replace.json +++ b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_refill_replace.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Refill two 500000-row tables using REPLACE....", + "search_pattern": "Refill two [0-9]+-row tables using REPLACE....", "result_index": 9 }, "chart": { diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_ipk.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_ipk.json index b9a374355..02b759c15 100644 --- a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_ipk.json +++ b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_ipk.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "700000 SELECTS on an IPK....", + "search_pattern": "[0-9]+ SELECTS on an IPK....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_text_pk.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_text_pk.json index 93818699f..6f26bc0ac 100644 --- a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_text_pk.json +++ b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_selects_text_pk.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "700000 SELECTS on a TEXT PK....", + "search_pattern": "[0-9]+ SELECTS on a TEXT PK....", "result_index": 9 }, "chart": { diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_between.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_between.json index d142e7f15..0355fc6ab 100644 --- a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_between.json +++ b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_between.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "100000 UPDATES, numeric BETWEEN, indexed....", + "search_pattern": "[0-9]+ UPDATES, numeric BETWEEN, indexed....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_big_one.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_big_one.json index 55c0f1f7f..a56c66468 100644 --- a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_big_one.json +++ b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_big_one.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "One big UPDATE of the whole 500000-row table....", + "search_pattern": "One big UPDATE of the whole [0-9]+-row table....", "result_index": 11 }, "chart": { diff --git a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_individual.json b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_individual.json index c94511faa..9f6976bd7 100644 --- a/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_individual.json +++ b/test/benchmark/sqlite/ext2_benchmarks/bench_results/ext2_updates_individual.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "500000 UPDATES of individual rows....", + "search_pattern": "[0-9]+ UPDATES of individual rows....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_between.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_between.json index fd3f441a4..9c6bf2b6d 100644 --- a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_between.json +++ b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_between.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "100000 DELETEs, numeric BETWEEN, indexed....", + "search_pattern": "[0-9]+ DELETEs, numeric BETWEEN, indexed....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_individual.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_individual.json index 8e89b1227..628b48b80 100644 --- a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_individual.json +++ b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_deletes_individual.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "500000 DELETEs of individual rows....", + "search_pattern": "[0-9]+ DELETEs of individual rows....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_refill_replace.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_refill_replace.json index ca0733244..77d159f87 100644 --- a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_refill_replace.json +++ b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_refill_replace.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "Refill two 500000-row tables using REPLACE....", + "search_pattern": "Refill two [0-9]+-row tables using REPLACE....", "result_index": 9 }, "chart": { diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_ipk.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_ipk.json index 5fbf9ef17..fbd871dd7 100644 --- a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_ipk.json +++ b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_ipk.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "700000 SELECTS on an IPK....", + "search_pattern": "[0-9]+ SELECTS on an IPK....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_text_pk.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_text_pk.json index 9b364c192..397115a8a 100644 --- a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_text_pk.json +++ b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_selects_text_pk.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "700000 SELECTS on a TEXT PK....", + "search_pattern": "[0-9]+ SELECTS on a TEXT PK....", "result_index": 9 }, "chart": { diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_between.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_between.json index d8c971a3f..2a410113e 100644 --- a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_between.json +++ b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_between.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "100000 UPDATES, numeric BETWEEN, indexed....", + "search_pattern": "[0-9]+ UPDATES, numeric BETWEEN, indexed....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_big_one.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_big_one.json index b7b2eeab7..4e3f6d512 100644 --- a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_big_one.json +++ b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_big_one.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "One big UPDATE of the whole 500000-row table....", + "search_pattern": "One big UPDATE of the whole [0-9]+-row table....", "result_index": 11 }, "chart": { diff --git a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_individual.json b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_individual.json index e0e2d2857..6a2d9b3ea 100644 --- a/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_individual.json +++ b/test/benchmark/sqlite/ramfs_benchmarks/bench_results/ramfs_updates_individual.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "500000 UPDATES of individual rows....", + "search_pattern": "[0-9]+ UPDATES of individual rows....", "result_index": 8 }, "chart": { diff --git a/test/benchmark/sysbench/cpu_lat/bench_result.json b/test/benchmark/sysbench/cpu_lat/bench_result.json index 5ff04d38e..8baacaa90 100644 --- a/test/benchmark/sysbench/cpu_lat/bench_result.json +++ b/test/benchmark/sysbench/cpu_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "avg:", + "search_pattern": "avg: +[0-9.]+", "result_index": "NF" }, "chart": { diff --git a/test/benchmark/sysbench/thread_lat/bench_result.json b/test/benchmark/sysbench/thread_lat/bench_result.json index 85de2a952..dfb7b09c9 100644 --- a/test/benchmark/sysbench/thread_lat/bench_result.json +++ b/test/benchmark/sysbench/thread_lat/bench_result.json @@ -4,7 +4,7 @@ "bigger_is_better": false }, "result_extraction": { - "search_pattern": "avg:", + "search_pattern": "avg: +[0-9.]+", "result_index": "NF" }, "chart": {