Merge pull request #4158 from BSBandme/FixBenchmarks

Fix java benchmark to use parser, fix cpp benchmark new arena to use …

benchmarks/README.md

@@ -38,14 +38,15 @@ And you also need to make sure `pkg-config` is installed.
 
 ### Big data
 
-There's some optional big testing data which is not included in the directory initially, you need to 
+There's some optional big testing data which is not included in the directory
-run the following command to download the testing data:
+initially, you need to run the following command to download the testing data:
 
 ```
 $ ./download_data.sh
 ```
 
-After doing this the big data file will automaticly generated in the benchmark directory.  
+After doing this the big data file will automaticly generated in the
+benchmark directory.
 
 ## Run instructions
 
@@ -65,8 +66,8 @@ $ make cpp
 
 ### Python:
 
-We have three versions of python protobuf implementation: pure python, cpp reflection and 
+We have three versions of python protobuf implementation: pure python, cpp
-cpp generated code. To run these version benchmark, you need to:
+reflection and cpp generated code. To run these version benchmark, you need to:
 
 #### Pure Python:
 

benchmarks/cpp_benchmark.cc

@@ -121,9 +121,10 @@ class ParseNewArenaFixture : public Fixture {
   virtual void BenchmarkCase(benchmark::State& state) {
     WrappingCounter i(payloads_.size());
     size_t total = 0;
+    Arena arena;
 
     while (state.KeepRunning()) {
-      Arena arena;
+      arena.Reset();
       Message* m = Arena::CreateMessage<T>(&arena);
       const std::string& payload = payloads_[i.Next()];
       total += payload.size();

benchmarks/java/src/main/java/com/google/protobuf/ProtoBenchCaliper.java

@@ -153,10 +153,8 @@ public class ProtoBenchCaliper {
   @Benchmark
   void deserializeFromByteString(int reps) throws IOException {
     for (int i = 0; i < reps; i++) {
-      defaultMessage
+      benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom(
-        .newBuilderForType()
+          inputStringList.get((int) (counter % inputStringList.size())), extensions);
-        .mergeFrom(inputStringList.get((int) (counter % inputStringList.size())), extensions)
-        .build();
       counter++;
     }
   }
@@ -164,10 +162,8 @@ public class ProtoBenchCaliper {
   @Benchmark
   void deserializeFromByteArray(int reps) throws IOException {
     for (int i = 0; i < reps; i++) {
-      defaultMessage
+      benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom(
-        .newBuilderForType()
+          inputDataList.get((int) (counter % inputDataList.size())), extensions);
-        .mergeFrom(inputDataList.get((int) (counter % inputDataList.size())), extensions)
-        .build();
       counter++;
     }
   }
@@ -175,10 +171,8 @@ public class ProtoBenchCaliper {
   @Benchmark
   void deserializeFromMemoryStream(int reps) throws IOException {
     for (int i = 0; i < reps; i++) {
-      defaultMessage
+      benchmarkMessageType.getDefaultInstance().getParserForType().parseFrom(
-        .newBuilderForType()
+          inputStreamList.get((int) (counter % inputStreamList.size())), extensions);
-        .mergeFrom(inputStreamList.get((int) (counter % inputStreamList.size())), extensions)
-        .build();
       inputStreamList.get((int) (counter % inputStreamList.size())).reset();
       counter++;
     }

benchmarks/py_benchmark.py

@@ -4,6 +4,7 @@ import timeit
 import math
 import fnmatch
 
+# BEGIN CPP GENERATED MESSAGE
 # CPP generated code must be linked before importing the generated Python code
 # for the descriptor can be found in the pool
 if len(sys.argv) < 2:
@@ -14,13 +15,14 @@ if sys.argv[1] == "true":
   sys.path.append( os.path.dirname( os.path.dirname( os.path.abspath(__file__) ) ) + "/tmp" )
 elif sys.argv[1] != "false":
   raise IOError("Need string argument \"true\" or \"false\" for whether to use cpp generated code")
+# END CPP GENERATED MESSAGE
 
 import datasets.google_message1.benchmark_message1_proto2_pb2 as benchmark_message1_proto2_pb2
 import datasets.google_message1.benchmark_message1_proto3_pb2 as benchmark_message1_proto3_pb2
 import datasets.google_message2.benchmark_message2_pb2 as benchmark_message2_pb2
 import datasets.google_message3.benchmark_message3_pb2 as benchmark_message3_pb2
 import datasets.google_message4.benchmark_message4_pb2 as benchmark_message4_pb2
-import benchmarks_pb2
+import benchmarks_pb2 as benchmarks_pb2
 
 
 def run_one_test(filename):