Fix base number calculation

Author: jkeiser

README.md

@@ -58,8 +58,8 @@ The v0.7.0 and v0.8.0 benchmarks on skylake were collected by running:
 
 ```
 host=<skylake/skylake-x/ampere/rome/etc.>
-./run_benchmark_official.sh $host v0.8.0 v0.8.0 "clang10 clang11 gcc10.2" "production release native westmere fallback debug" ".*"
-./run_benchmark_official.sh $host v0.7.0 v0.7.0 "clang10 clang11 gcc10.2" "production release native westmere fallback debug" ".*"
+./run_benchmark_official.sh $host v0.8.0 v0.8.0 "clang10 clang11 gcc10.2" "release development native westmere fallback debug" ".*"
+./run_benchmark_official.sh $host v0.7.0 v0.7.0 "clang10 clang11 gcc10.2" "release development native westmere fallback debug" ".*"
 ./run_benchmark_official.sh $host v0.7.0 "v0.8.0~1 v0.8.0~5 v0.8.0~10 v0.8.0~15 v0.8.0~20 v0.8.0~25 v0.8.0~30 v0.8.0~35" "clang11 gcc10.2" "production"
 ```
 

graph_benchmarks.py

@@ -85,8 +85,8 @@ def match_any(regexes, value):
 benchmarks = pd.concat(runs)
 benchmarks = benchmarks[benchmarks['benchmark_name'].apply(lambda benchmark_name: match_any(args.benchmarks, benchmark_name))]
 benchmarks = benchmarks[benchmarks['json_implementation'].apply(lambda json_implementation: match_any(args.implementations, json_implementation))]
-print(f"Generating graphs for {benchmarks.count().count()} matching benchmarks ...")
-for path,fig in google_benchmark_graph.graph_grouped_benchmarks(benchmarks):
+print(f"Generating graphs for {benchmarks.count()} matching benchmarks ...")
+for path,fig in google_benchmark_graph.graph_grouped_benchmarks(benchmarks, "best_instructions", "Instructions", 1):
     png_path = os.path.splitext(path)[0]+'.png'
     print(png_path)
     fig.write_image(png_path)

run_benchmark_official.sh

@@ -84,18 +84,25 @@ function bench_results() {
     #
     base_dir=$SCRIPT_DIR/$base_version
 
-    # Figure out # of commits past version
-    cd $SCRIPT_DIR/simdjson
-    fork_commit=$(git merge-base $base_version $commit)
-    commits_past_version=$(git rev-list --count --first-parent $base_version...$fork_commit)
-    if [ "$commits_past_version" -ne "0" ]; then
-        base_dir="$base_dir/$commits_past_version"
+    # Error if commit is not a child of the base version
+    if ! git merge-base --is-ancestor $base_version $commit; then
+        echo "Commit $commit is not derived from $base_version!"
+        exit 1;
     fi
 
-    # Figure out if commit is unmerged
-    actual_commit=$(git rev-list -n 1 $commit)
-    if [ "$fork_commit" != "$actual_commit" ]; then
-        base_dir="$base_dir/$actual_commit"
+    cd $SCRIPT_DIR/simdjson
+    if git merge-base --is-ancestor $commit master; then
+        # If it's *past* the base version, use the number of commits past the base version for the directory.
+        commits_past_version=$(git rev-list --count --first-parent $base_version...$commit)
+        if [ "$commits_past_version" -ne "0" ]; then
+            echo "Commit $commit is $commits_past_version commits past $base_version."
+            base_dir="$base_dir/$commits_past_version"
+        fi
+    else
+        # If it's not on master, it's a branch ... use the commit id.
+        commit_sha=$(git rev-list -n 1 $commit)
+        echo "$commit ($commit_sha) is not on master. Setting base_dir to commit id $commit_sha..."
+        base_dir="$base_dir/$commit_sha"
     fi
 
     mkdir -p $base_dir