Merge branch 'master' into cb-try-raw-pointer

Author: thomasvl

Performance/generators/cpp.sh

@@ -21,6 +21,11 @@ function print_cpp_set_field() {
   type=$2
 
   case "$type" in
+    repeated\ message)
+      echo "  for (auto i = 0; i < repeated_count; i++) {"
+      echo "    message.add_field$num()->set_optional_int32($((200+num)));"
+      echo "  }"
+      ;;
     repeated\ string)
       echo "  for (auto i = 0; i < repeated_count; i++) {"
       echo "    message.add_field$num(\"$((200+num))\");"
@@ -51,6 +56,9 @@ function print_cpp_set_field() {
       echo "    message.add_field$num($((200+num)));"
       echo "  }"
       ;;
+    message)
+      echo "  message.mutable_field$num()->set_optional_int32($((200+num)));"
+      ;;
     string)
       echo "  message.set_field$num(\"$((200+num))\");"
       ;;

Performance/generators/proto.sh

@@ -37,7 +37,31 @@ function print_proto_field() {
 function generate_homogeneous_test_proto() {
   cat >"$gen_message_path" <<EOF
 syntax = "proto$proto_syntax";
+EOF
+
+  case "$field_type" in
+      *message)
+	  case "$field_type" in
+	      repeated\ message)
+		  out_field_type="repeated SubMessage"
+		  ;;
+	      message)
+		  out_field_type="SubMessage"
+		  ;;
+	      *)
+		  echo "XXX Invalid field type ``$field_type''"
+		  ;;
+	  esac
+	  echo "message SubMessage {" >>"$gen_message_path"
+	  echo "  int32 optional_int32 = 1;" >>"$gen_message_path"
+	  echo "}" >>"$gen_message_path"
+	  ;;
+      *)
+	  out_field_type="$field_type"
+	  ;;
+  esac
 
+  cat >>"$gen_message_path" <<EOF
 message PerfMessage {
   enum PerfEnum {
     ZERO = 0;
@@ -49,7 +73,7 @@ message PerfMessage {
 EOF
 
   for field_number in $(seq 1 "$field_count"); do
-    print_proto_field "$field_number" "$field_type" >>"$gen_message_path"
+    print_proto_field "$field_number" "$out_field_type" >>"$gen_message_path"
   done
 
   cat >>"$gen_message_path" <<EOF

Performance/generators/swift.sh

@@ -21,6 +21,11 @@ function print_swift_set_field() {
   type=$2
 
   case "$type" in
+    repeated\ message)
+      echo "    for _ in 0..<repeatedCount {"
+      echo "      message.field$num.append(SubMessage.with { \$0.optionalInt32 = $((200+num)) })"
+      echo "    }"
+      ;;
     repeated\ bytes)
       echo "    for _ in 0..<repeatedCount {"
       echo "      message.field$num.append(Data(repeating:$((num)), count: 20))"
@@ -56,6 +61,9 @@ function print_swift_set_field() {
       echo "      message.field$num.append($((200+num)))"
       echo "    }"
       ;;
+    message)
+      echo "    message.field$num = SubMessage.with { \$0.optionalInt32 = $((200+num)) }"
+      ;;
     bytes)
       echo "    message.field$num = Data(repeating:$((num)), count: 20)"
       ;;
@@ -98,6 +106,10 @@ extension Harness {
         populateFields(of: &message)
       }
 
+      message = measureSubtask("Populate fields with with") {
+        return populateFieldsWithWith()
+      }
+
       // Exercise binary serialization.
       let data = try measureSubtask("Encode binary") {
         return try message.serializedData()
@@ -140,6 +152,20 @@ EOF
 
   cat >> "$gen_harness_path" <<EOF
   }
+
+  private func populateFieldsWithWith() -> PerfMessage {
+    return PerfMessage.with { message in
+EOF
+
+  if [[ "$proto_type" == "homogeneous" ]]; then
+    generate_swift_homogenerous_populate_fields_body
+  else
+    generate_swift_heterogenerous_populate_fields_body
+  fi
+
+  cat >> "$gen_harness_path" <<EOF
+    }
+  }
 }
 EOF
 }

Performance/js/harness-visualization.js

@@ -3,6 +3,7 @@
   // on the plot axis.
   var benchmarks = [
     'New message', 'Populate fields',
+    'Populate fields with with',
     'Encode binary', 'Decode binary',
     'Encode JSON', 'Decode JSON',
     'Encode text', 'Decode text',