From 741ffb4b46891cf59d9868e79fdf82c4a8345477 Mon Sep 17 00:00:00 2001 From: ncteisen <ncteisen@gmail.com> Date: Tue, 20 Jun 2017 14:33:15 -0700 Subject: [PATCH] Rename files --- tools/jenkins/run_performance.sh | 7 +++++-- tools/jenkins/{run_performance_old.sh => run_qps_diff.sh} | 7 ++----- tools/profiling/qps/qps_diff.py | 2 +- tools/profiling/qps/qps_scenarios.py | 2 -- 4 files changed, 8 insertions(+), 10 deletions(-) rename tools/jenkins/{run_performance_old.sh => run_qps_diff.sh} (58%) diff --git a/tools/jenkins/run_performance.sh b/tools/jenkins/run_performance.sh index 9529b0126f..3ce05cc7f1 100755 --- a/tools/jenkins/run_performance.sh +++ b/tools/jenkins/run_performance.sh @@ -13,11 +13,14 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# This script is invoked by Jenkins and runs a diff on the qps drivers +# This script is invoked by Jenkins and runs a diff on the microbenchmarks set -ex +# List of benchmarks that provide good signal for analyzing performance changes in pull requests +BENCHMARKS_TO_RUN="bm_fullstack_unary_ping_pong bm_fullstack_streaming_ping_pong bm_fullstack_streaming_pump bm_closure bm_cq bm_call_create bm_error bm_chttp2_hpack bm_chttp2_transport bm_pollset bm_metadata" + # Enter the gRPC repo root cd $(dirname $0)/../.. tools/run_tests/start_port_server.py -tools/profiling/qps/qps_diff.py -d origin/$ghprbTargetBranch +tools/profiling/microbenchmarks/bm_diff/bm_main.py -d origin/$ghprbTargetBranch -b $BENCHMARKS_TO_RUN diff --git a/tools/jenkins/run_performance_old.sh b/tools/jenkins/run_qps_diff.sh similarity index 58% rename from tools/jenkins/run_performance_old.sh rename to tools/jenkins/run_qps_diff.sh index 3ce05cc7f1..9529b0126f 100755 --- a/tools/jenkins/run_performance_old.sh +++ b/tools/jenkins/run_qps_diff.sh @@ -13,14 +13,11 @@ # See the License for the specific language governing permissions and # limitations under the License. # -# This script is invoked by Jenkins and runs a diff on the microbenchmarks +# This script is invoked by Jenkins and runs a diff on the qps drivers set -ex -# List of benchmarks that provide good signal for analyzing performance changes in pull requests -BENCHMARKS_TO_RUN="bm_fullstack_unary_ping_pong bm_fullstack_streaming_ping_pong bm_fullstack_streaming_pump bm_closure bm_cq bm_call_create bm_error bm_chttp2_hpack bm_chttp2_transport bm_pollset bm_metadata" - # Enter the gRPC repo root cd $(dirname $0)/../.. tools/run_tests/start_port_server.py -tools/profiling/microbenchmarks/bm_diff/bm_main.py -d origin/$ghprbTargetBranch -b $BENCHMARKS_TO_RUN +tools/profiling/qps/qps_diff.py -d origin/$ghprbTargetBranch diff --git a/tools/profiling/qps/qps_diff.py b/tools/profiling/qps/qps_diff.py index 65c845caa1..0654f45666 100755 --- a/tools/profiling/qps/qps_diff.py +++ b/tools/profiling/qps/qps_diff.py @@ -118,7 +118,7 @@ def diff(scenarios, loops, old, new): for sn in scenarios: old_data[sn] = [] new_data[sn] = [] - for i in range(0, loops): + for i in range(loops): old_data[sn].append(_load_qps("%s.%s.%d.json" % (sn, old, i))) new_data[sn].append(_load_qps("%s.%s.%d.json" % (sn, new, i))) diff --git a/tools/profiling/qps/qps_scenarios.py b/tools/profiling/qps/qps_scenarios.py index d473d7cd24..4fbbdefc4d 100644 --- a/tools/profiling/qps/qps_scenarios.py +++ b/tools/profiling/qps/qps_scenarios.py @@ -1,5 +1,3 @@ -#!/usr/bin/env python2.7 -# # Copyright 2017 gRPC authors. # # Licensed under the Apache License, Version 2.0 (the "License"); -- GitLab