Merge pull request protocolbuffers#4510 from BSBandme/fix_kokoro_benc…

…hmark_build fix java benchmark, fix dashboard build
mbabinski-at-google · Apr 16, 2018 · a9d9326 · a9d9326
2 parents 320d56c + 0921345
commit a9d9326
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 117 deletions.
diff --git a/benchmarks/Makefile.am b/benchmarks/Makefile.am
@@ -123,7 +123,6 @@ cpp: protoc_middleman protoc_middleman2 cpp-benchmark initialize_submodule
 ############# JAVA RULES ##############
 
 java_benchmark_testing_files =                                      \
-	java/src/main/java/com/google/protobuf/ProtoBench.java            \
 	java/src/main/java/com/google/protobuf/ProtoCaliperBenchmark.java
 
 javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middleman2
@@ -134,7 +133,14 @@ javac_middleman: $(java_benchmark_testing_files) protoc_middleman protoc_middlem
 java-benchmark: javac_middleman
 	@echo "Writing shortcut script java-benchmark..."
 	@echo '#! /bin/sh' > java-benchmark
-	@echo 'java -cp '"tmp/java/target/*.jar"' com.google.protobuf.ProtoBench $$@' >> java-benchmark
+	@echo 'all_data=""' >> java-benchmark
+	@echo 'conf=()' >> java-benchmark
+	@echo 'data_files=""' >> java-benchmark
+	@echo 'for arg in $$@; do if [[ $${arg:0:1} == "-" ]]; then conf+=($$arg); else data_files+="$$arg,"; fi; done' >> java-benchmark
+	@echo 'java -cp '"tmp/java/target/*.jar"' com.google.caliper.runner.CaliperMain com.google.protobuf.ProtoCaliperBenchmark -i runtime '"\\"  >> java-benchmark
+	@echo '-b serializeToByteString,serializeToByteArray,serializeToMemoryStream,'"\\"  >> java-benchmark
+	@echo 'deserializeFromByteString,deserializeFromByteArray,deserializeFromMemoryStream '"\\" >> java-benchmark
+	@echo '-DdataFile=$${data_files:0:-1} $${conf[*]}' >> java-benchmark
 	@chmod +x java-benchmark
 
 java: protoc_middleman protoc_middleman2 java-benchmark

diff --git a/benchmarks/java/src/main/java/com/google/protobuf/ProtoBench.java b/benchmarks/java/src/main/java/com/google/protobuf/ProtoBench.java
diff --git a/kokoro/linux/benchmark/build.sh b/kokoro/linux/benchmark/build.sh
@@ -24,12 +24,13 @@ cd $oldpwd
 
 # build Python protobuf
 ./autogen.sh
-./configure CXXFLAGS="-fPIC -O2 -fno-semantic-interposition"
+./configure CXXFLAGS="-fPIC -O2"
 make -j8
 cd python
 python setup.py build --cpp_implementation
 pip install .
 
+
 # build and run Python benchmark
 cd ../benchmarks
 make python-pure-python-benchmark