From 84c74b67f88bd9c7782fcb14e46f94fa958931cb Mon Sep 17 00:00:00 2001
From: Jan Tattermusch <jtattermusch@google.com>
Date: Mon, 22 Oct 2018 15:52:49 +0200
Subject: build C++ in benchmarks with cmake

---
 tools/run_tests/performance/build_performance.sh | 14 ++++++++++----
 tools/run_tests/performance/run_qps_driver.sh    |  2 +-
 tools/run_tests/performance/scenario_config.py   |  2 +-
 3 files changed, 12 insertions(+), 6 deletions(-)

(limited to 'tools/run_tests/performance')

diff --git a/tools/run_tests/performance/build_performance.sh b/tools/run_tests/performance/build_performance.sh
index 9e6e72d97b..ab6bffdc34 100755
--- a/tools/run_tests/performance/build_performance.sh
+++ b/tools/run_tests/performance/build_performance.sh
@@ -25,10 +25,16 @@ CONFIG=${CONFIG:-opt}
 # TODO(jtattermusch): C++ worker and driver are not buildable on Windows yet
 if [ "$OSTYPE" != "msys" ]
 then
-  # TODO(jtattermusch): not embedding OpenSSL breaks the C# build because
-  # grpc_csharp_ext needs OpenSSL embedded and some intermediate files from
-  # this build will be reused.
-  make CONFIG="${CONFIG}" EMBED_OPENSSL=true EMBED_ZLIB=true qps_worker qps_json_driver -j8
+  # build C++ with cmake as building with "make" disables boringssl assembly
+  # optimizations that can have huge impact on secure channel throughput.
+  mkdir -p cmake/build
+  cd cmake/build
+  cmake -DgRPC_BUILD_TESTS=ON -DCMAKE_BUILD_TYPE=Release ../..
+  make qps_worker qps_json_driver -j8
+  cd ../..
+  # unbreak subsequent make builds by restoring zconf.h (previously renamed by cmake build)
+  # See https://github.com/grpc/grpc/issues/11581
+  (cd third_party/zlib; git checkout zconf.h)
 fi
 
 PHP_ALREADY_BUILT=""
diff --git a/tools/run_tests/performance/run_qps_driver.sh b/tools/run_tests/performance/run_qps_driver.sh
index 2d9e310dec..47a03db026 100755
--- a/tools/run_tests/performance/run_qps_driver.sh
+++ b/tools/run_tests/performance/run_qps_driver.sh
@@ -17,7 +17,7 @@ set -ex
 
 cd "$(dirname "$0")/../../.."
 
-bins/opt/qps_json_driver "$@"
+cmake/build/qps_json_driver "$@"
 
 if [ "$BQ_RESULT_TABLE" != "" ]
 then
diff --git a/tools/run_tests/performance/scenario_config.py b/tools/run_tests/performance/scenario_config.py
index 83b555f766..481918c52e 100644
--- a/tools/run_tests/performance/scenario_config.py
+++ b/tools/run_tests/performance/scenario_config.py
@@ -231,7 +231,7 @@ class CXXLanguage:
         self.safename = 'cxx'
 
     def worker_cmdline(self):
-        return ['bins/opt/qps_worker']
+        return ['cmake/build/qps_worker']
 
     def worker_port_offset(self):
         return 0
-- 
cgit v1.2.3