Fix cbor and xml benchmarks

Author: mtdowling

benchmarks/serde-benchmarks/build.gradle.kts

@@ -158,7 +158,7 @@ jmh {
     // are absent.
     warmupIterations = 5
     iterations = 10
-    fork = 0
+    fork = 1
     // Select the native smithy-java JSON provider (rather than the default
     // Jackson-backed provider, which has higher ServiceLoader priority).
     // The system property is read once during static initialization of

benchmarks/serde-benchmarks/model/operations/CopyObject.smithy

@@ -256,6 +256,7 @@ structure CopyObjectRequest {
     ExpectedSourceBucketOwner: String
 }
 
+@xmlName("CopyObjectResult")
 structure CopyObjectOutput {
     @httpHeader("x-amz-expiration")
     Expiration: String

benchmarks/serde-benchmarks/model/operations/GetItem.smithy

@@ -34,7 +34,7 @@
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Warmup(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 10, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(0)
+@Fork(1)
 public class AwsJson1_0DeserializeBenchmark {
 
     private static final String GENERATED_PACKAGE =

benchmarks/serde-benchmarks/src/jmh/java/software/amazon/smithy/java/benchmarks/serde/AwsJson1_0DeserializeBenchmark.java

@@ -35,7 +35,7 @@
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Warmup(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 10, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(0)
+@Fork(1)
 public class AwsJson1_0SerializeBenchmark {
 
     private static final String GENERATED_PACKAGE =

benchmarks/serde-benchmarks/src/jmh/java/software/amazon/smithy/java/benchmarks/serde/AwsJson1_0SerializeBenchmark.java

@@ -33,7 +33,7 @@
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Warmup(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 10, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(0)
+@Fork(1)
 public class AwsQueryDeserializeBenchmark {
 
     private static final String GENERATED_PACKAGE =

benchmarks/serde-benchmarks/src/jmh/java/software/amazon/smithy/java/benchmarks/serde/AwsQueryDeserializeBenchmark.java

@@ -33,7 +33,7 @@
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Warmup(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 10, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(0)
+@Fork(1)
 public class AwsQuerySerializeBenchmark {
 
     private static final String GENERATED_PACKAGE =

benchmarks/serde-benchmarks/src/jmh/java/software/amazon/smithy/java/benchmarks/serde/AwsQuerySerializeBenchmark.java

@@ -12,6 +12,7 @@
 import software.amazon.smithy.java.context.Context;
 import software.amazon.smithy.java.core.schema.ApiOperation;
 import software.amazon.smithy.java.core.schema.SerializableStruct;
+import software.amazon.smithy.java.core.schema.TraitKey;
 import software.amazon.smithy.java.core.serde.TypeRegistry;
 import software.amazon.smithy.java.http.api.HeaderName;
 import software.amazon.smithy.java.http.api.HttpRequest;
@@ -95,11 +96,15 @@ static DeserializeState forTestCase(
 
         byte[] resolvedEmpty = emptyBody;
         if (resolvedEmpty == null) {
-            // Default empty XML body uses the output shape's simple name as
+            // Default empty XML body uses the output shape's wire name as
             // the root element. This matches what an XML protocol response
-            // with header-only bindings looks like on the wire.
-            String outputShapeName = operation.outputSchema().id().getName();
-            resolvedEmpty = ("<" + outputShapeName + "/>").getBytes(StandardCharsets.UTF_8);
+            // with header-only bindings looks like on the wire. The wire
+            // name comes from @xmlName if present, otherwise the shape's
+            // simple name.
+            var schema = operation.outputSchema();
+            var xmlName = schema.getTrait(TraitKey.XML_NAME_TRAIT);
+            String rootName = xmlName != null ? xmlName.getValue() : schema.id().getName();
+            resolvedEmpty = ("<" + rootName + "/>").getBytes(StandardCharsets.UTF_8);
         }
         byte[] body = entry.testCase.getBody()
                 .map(s -> base64DecodeBody

benchmarks/serde-benchmarks/src/jmh/java/software/amazon/smithy/java/benchmarks/serde/DeserializeState.java

@@ -34,7 +34,7 @@
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Warmup(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 10, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(0)
+@Fork(1)
 public class RestJson1DeserializeBenchmark {
 
     private static final String GENERATED_PACKAGE =

benchmarks/serde-benchmarks/src/jmh/java/software/amazon/smithy/java/benchmarks/serde/RestJson1DeserializeBenchmark.java

@@ -33,7 +33,7 @@
 @OutputTimeUnit(TimeUnit.NANOSECONDS)
 @Warmup(iterations = 5, time = 2, timeUnit = TimeUnit.SECONDS)
 @Measurement(iterations = 10, time = 5, timeUnit = TimeUnit.SECONDS)
-@Fork(0)
+@Fork(1)
 public class RestJson1SerializeBenchmark {
 
     private static final String GENERATED_PACKAGE =