benchmarks: rename cache benchmarks

The default in the world is to have a disk cache; it's exceptional to
_not_. Flip our naming, so that the (exceptional) `nocache` tests are
called out explicitly.

tests/benchmarks/hash-object__text_100kb

@@ -2,6 +2,6 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
-gitbench --prepare "create_text_file text_100kb 102400 &&
-                    flush_disk_cache" \
+gitbench --prepare "create_text_file text_100kb 102400" \
+         --warmup 5 \
          hash-object "text_100kb"

tests/benchmarks/hash-object__text_10mb

@@ -2,6 +2,6 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
-gitbench --prepare "create_text_file text_10mb 10485760 &&
-                    flush_disk_cache" \
+gitbench --prepare "create_text_file text_10mb 10485760" \
+         --warmup 5 \
          hash-object "text_10mb"

tests/benchmarks/hash-object__text_1kb

@@ -2,6 +2,6 @@
 
 . "$(dirname "$0")/benchmark_helpers.sh"
 
-gitbench --prepare "create_text_file text_1kb 1024 &&
-                    flush_disk_cache" \
+gitbench --prepare "create_text_file text_1kb 1024" \
+         --warmup 5 \
          hash-object "text_1kb"

tests/benchmarks/hash-object__text_cached_100kb

@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-. "$(dirname "$0")/benchmark_helpers.sh"
-
-gitbench --prepare "create_text_file text_100kb 102400" \
-         --warmup 5 \
-         hash-object "text_100kb"

tests/benchmarks/hash-object__text_cached_10mb

@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-. "$(dirname "$0")/benchmark_helpers.sh"
-
-gitbench --prepare "create_text_file text_10mb 10485760" \
-         --warmup 5 \
-         hash-object "text_10mb"

tests/benchmarks/hash-object__text_cached_1kb

@@ -1,7 +0,0 @@
-#!/bin/bash -e
-
-. "$(dirname "$0")/benchmark_helpers.sh"
-
-gitbench --prepare "create_text_file text_1kb 1024" \
-         --warmup 5 \
-         hash-object "text_1kb"

tests/benchmarks/hash-object__text_nocache_100kb

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+. "$(dirname "$0")/benchmark_helpers.sh"
+
+gitbench --prepare "create_text_file text_100kb 102400 &&
+                    flush_disk_cache" \
+         hash-object "text_100kb"

tests/benchmarks/hash-object__text_nocache_10mb

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+. "$(dirname "$0")/benchmark_helpers.sh"
+
+gitbench --prepare "create_text_file text_10mb 10485760 &&
+                    flush_disk_cache" \
+         hash-object "text_10mb"

tests/benchmarks/hash-object__text_nocache_1kb

@@ -0,0 +1,7 @@
+#!/bin/bash -e
+
+. "$(dirname "$0")/benchmark_helpers.sh"
+
+gitbench --prepare "create_text_file text_1kb 1024 &&
+                    flush_disk_cache" \
+         hash-object "text_1kb"

tests/benchmarks/hash-object__write_text_100kb

@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_100kb 102400 &&
-                    flush_disk_cache" \
+                    create_text_file text_100kb 102400" \
+         --warmup 5 \
          --chdir "empty_standard_repo" \
-         hash-object -w "../text_100kb"
+         hash-object "../text_100kb"

tests/benchmarks/hash-object__write_text_10mb

@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_10mb 10485760 &&
-                    flush_disk_cache" \
+                    create_text_file text_10mb 10485760" \
+         --warmup 5 \
          --chdir "empty_standard_repo" \
          hash-object "../text_10mb"

tests/benchmarks/hash-object__write_text_1kb

@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_1kb 1024 &&
-                    flush_disk_cache" \
+                    create_text_file text_1kb 1024" \
+         --warmup 5 \
          --chdir "empty_standard_repo" \
          hash-object "../text_1kb"

tests/benchmarks/hash-object__write_text_nocache_100kb

@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_100kb 102400" \
-         --warmup 5 \
+                    create_text_file text_100kb 102400 &&
+                    flush_disk_cache" \
          --chdir "empty_standard_repo" \
-         hash-object "../text_100kb"
+         hash-object -w "../text_100kb"

tests/benchmarks/hash-object__write_text_nocache_10mb

@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_10mb 10485760" \
-         --warmup 5 \
+                    create_text_file text_10mb 10485760 &&
+                    flush_disk_cache" \
          --chdir "empty_standard_repo" \
          hash-object "../text_10mb"

tests/benchmarks/hash-object__write_text_nocache_1kb

@@ -3,7 +3,7 @@
 . "$(dirname "$0")/benchmark_helpers.sh"
 
 gitbench --prepare "sandbox_repo empty_standard_repo &&
-                    create_text_file text_1kb 1024" \
-         --warmup 5 \
+                    create_text_file text_1kb 1024 &&
+                    flush_disk_cache" \
          --chdir "empty_standard_repo" \
          hash-object "../text_1kb"