OpenJDK / code-tools / jmh
changeset 1459:a180846b4cb2
7902359: @Param values with braces and quotes should be handled specially
line wrap: on
line diff
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jmh-core-ct/src/test/java/org/openjdk/jmh/ct/params/ParamQuotesTest.java Tue Jan 15 16:27:09 2019 +0100 @@ -0,0 +1,62 @@ +/* + * Copyright (c) 2019, Red Hat, Inc. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package org.openjdk.jmh.ct.params; + +import org.junit.Test; +import org.openjdk.jmh.annotations.Benchmark; +import org.openjdk.jmh.annotations.Param; +import org.openjdk.jmh.annotations.Scope; +import org.openjdk.jmh.annotations.State; +import org.openjdk.jmh.ct.CompileTest; + +@State(Scope.Benchmark) +public class ParamQuotesTest { + + @Param("value") + public String param_plain; + + @Param("[value]") + public String param_square; + + @Param("{value}") + public String param_curly; + + @Param("'value'") + public String param_squote; + + @Param("\"value\"") + public String param_dquote; + + @Benchmark + public void test() { + + } + + @Test + public void compileTest() { + CompileTest.assertOK(this.getClass()); + } + +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/jmh-core-it/src/test/java/org/openjdk/jmh/it/params/QuotedParamsTest.java Tue Jan 15 16:27:09 2019 +0100 @@ -0,0 +1,79 @@ +/* + * Copyright (c) 2019, Red Hat, Inc. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it + * under the terms of the GNU General Public License version 2 only, as + * published by the Free Software Foundation. Oracle designates this + * particular file as subject to the "Classpath" exception as provided + * by Oracle in the LICENSE file that accompanied this code. + * + * This code is distributed in the hope that it will be useful, but WITHOUT + * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or + * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License + * version 2 for more details (a copy is included in the LICENSE file that + * accompanied this code). + * + * You should have received a copy of the GNU General Public License version + * 2 along with this work; if not, write to the Free Software Foundation, + * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. + * + * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA + * or visit www.oracle.com if you need additional information or have any + * questions. + */ +package org.openjdk.jmh.it.params; + +import junit.framework.Assert; +import org.junit.Test; +import org.openjdk.jmh.annotations.*; +import org.openjdk.jmh.it.Fixtures; +import org.openjdk.jmh.runner.Runner; +import org.openjdk.jmh.runner.RunnerException; +import org.openjdk.jmh.runner.options.Options; +import org.openjdk.jmh.runner.options.OptionsBuilder; + +import java.util.concurrent.TimeUnit; + +@State(Scope.Benchmark) +public class QuotedParamsTest { + + @Param("value") + public String param_plain; + + @Param("[value]") + public String param_square; + + @Param("{value}") + public String param_curly; + + @Param("'value'") + public String param_squote; + + @Param("\"value\"") + public String param_dquote; + + @Benchmark + @Warmup(iterations = 0) + @Measurement(iterations = 1, time = 100, timeUnit = TimeUnit.MILLISECONDS) + @Fork(1) + public void test() { + Fixtures.work(); + Assert.assertEquals("value", param_plain); + Assert.assertEquals("[value]", param_square); + Assert.assertEquals("{value}", param_curly); + Assert.assertEquals("'value'", param_squote); + Assert.assertEquals("\"value\"", param_dquote); + } + + @Test + public void vals() throws RunnerException { + Options opts = new OptionsBuilder() + .include(Fixtures.getTestMask(this.getClass())) + .shouldFailOnError(true) + .build(); + + new Runner(opts).run(); + } + +}
--- a/jmh-core/src/main/java/org/openjdk/jmh/results/format/JSONResultFormat.java Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/main/java/org/openjdk/jmh/results/format/JSONResultFormat.java Tue Jan 15 16:27:09 2019 +0100 @@ -192,7 +192,7 @@ sb.append(", "); } sb.append("\"").append(k).append("\" : "); - sb.append("\"").append(params.getParam(k)).append("\""); + sb.append(toJsonString(params.getParam(k))); } return sb.toString(); }
--- a/jmh-core/src/main/java/org/openjdk/jmh/results/format/LaTeXResultFormat.java Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/main/java/org/openjdk/jmh/results/format/LaTeXResultFormat.java Tue Jan 15 16:27:09 2019 +0100 @@ -127,7 +127,9 @@ private static String escape(String s) { return s.replaceAll("_", "\\\\_") - .replaceAll("#", "\\\\#"); + .replaceAll("#", "\\\\#") + .replaceAll("\\{", "\\\\{") + .replaceAll("\\}", "\\\\}"); } }
--- a/jmh-core/src/test/java/org/openjdk/jmh/results/format/ResultFormatTest.java Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/java/org/openjdk/jmh/results/format/ResultFormatTest.java Tue Jan 15 16:27:09 2019 +0100 @@ -69,9 +69,11 @@ Random ar = new Random(12345); for (int b = 0; b < r.nextInt(10); b++) { WorkloadParams ps = new WorkloadParams(); - for (int p = 0; p < 5; p++) { - ps.put("param" + p, "value" + p, p); - } + ps.put("param0", "value0", 0); + ps.put("param1", "[value1]", 1); + ps.put("param2", "{value2}", 2); + ps.put("param3", "'value3'", 3); + ps.put("param4", "\"value4\"", 4); BenchmarkParams params = new BenchmarkParams( "benchmark_" + b, JSONResultFormat.class.getName() + ".benchmark_" + b + "_" + Mode.Throughput,
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.csv.root Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.csv.root Tue Jan 15 16:27:09 2019 +0100 @@ -1,20 +1,20 @@ -"Benchmark","Mode","Threads","Samples","Score","Score Error (99.9%)","Unit","Param: param0","Param: param1","Param: param2","Param: param3","Param: param4" -"benchmark_0","thrpt",80,14,528.857143,278.141953,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_0:secondary1","thrpt",80,14,549.714286,320.227488,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_0:secondary2","thrpt",80,14,615.500000,319.209585,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_0:secondary3","thrpt",80,5,246.000000,847.566004,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_1","thrpt",900,1,439.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_1:secondary1","thrpt",900,1,953.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_1:secondary2","thrpt",900,1,367.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_2","thrpt",466,9,545.000000,553.336699,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_2:secondary1","thrpt",466,9,434.444444,465.182504,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_2:secondary2","thrpt",466,9,470.333333,502.273041,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_2:secondary3","thrpt",466,5,574.400000,969.535252,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_3","thrpt",968,14,417.571429,362.813967,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_3:secondary1","thrpt",968,14,672.214286,287.982211,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_3:secondary2","thrpt",968,14,560.142857,289.799961,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_3:secondary3","thrpt",968,6,432.833333,1036.758184,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4","thrpt",739,1,956.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4:secondary1","thrpt",739,1,688.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4:secondary2","thrpt",739,1,237.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4:secondary3","thrpt",739,1,599.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 +"Benchmark","Mode","Threads","Samples","Score","Score Error (99.9%)","Unit","Param: param0","Param: param1","Param: param2","Param: param3","Param: param4" +"benchmark_0","thrpt",80,14,528.857143,278.141953,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_0:secondary1","thrpt",80,14,549.714286,320.227488,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_0:secondary2","thrpt",80,14,615.500000,319.209585,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_0:secondary3","thrpt",80,5,246.000000,847.566004,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_1","thrpt",900,1,439.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_1:secondary1","thrpt",900,1,953.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_1:secondary2","thrpt",900,1,367.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2","thrpt",466,9,545.000000,553.336699,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2:secondary1","thrpt",466,9,434.444444,465.182504,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2:secondary2","thrpt",466,9,470.333333,502.273041,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2:secondary3","thrpt",466,5,574.400000,969.535252,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3","thrpt",968,14,417.571429,362.813967,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3:secondary1","thrpt",968,14,672.214286,287.982211,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3:secondary2","thrpt",968,14,560.142857,289.799961,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3:secondary3","thrpt",968,6,432.833333,1036.758184,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4","thrpt",739,1,956.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4:secondary1","thrpt",739,1,688.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4:secondary2","thrpt",739,1,237.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4:secondary3","thrpt",739,1,599.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.csv.ru Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.csv.ru Tue Jan 15 16:27:09 2019 +0100 @@ -1,20 +1,20 @@ -"Benchmark","Mode","Threads","Samples","Score","Score Error (99,9%)","Unit","Param: param0","Param: param1","Param: param2","Param: param3","Param: param4" -"benchmark_0","thrpt",80,14,"528,857143","278,141953","ops/ms",value0,value1,value2,value3,value4 -"benchmark_0:secondary1","thrpt",80,14,"549,714286","320,227488","ops/ms",value0,value1,value2,value3,value4 -"benchmark_0:secondary2","thrpt",80,14,"615,500000","319,209585","ops/ms",value0,value1,value2,value3,value4 -"benchmark_0:secondary3","thrpt",80,5,"246,000000","847,566004","ops/ms",value0,value1,value2,value3,value4 -"benchmark_1","thrpt",900,1,"439,000000",NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_1:secondary1","thrpt",900,1,"953,000000",NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_1:secondary2","thrpt",900,1,"367,000000",NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_2","thrpt",466,9,"545,000000","553,336699","ops/ms",value0,value1,value2,value3,value4 -"benchmark_2:secondary1","thrpt",466,9,"434,444444","465,182504","ops/ms",value0,value1,value2,value3,value4 -"benchmark_2:secondary2","thrpt",466,9,"470,333333","502,273041","ops/ms",value0,value1,value2,value3,value4 -"benchmark_2:secondary3","thrpt",466,5,"574,400000","969,535252","ops/ms",value0,value1,value2,value3,value4 -"benchmark_3","thrpt",968,14,"417,571429","362,813967","ops/ms",value0,value1,value2,value3,value4 -"benchmark_3:secondary1","thrpt",968,14,"672,214286","287,982211","ops/ms",value0,value1,value2,value3,value4 -"benchmark_3:secondary2","thrpt",968,14,"560,142857","289,799961","ops/ms",value0,value1,value2,value3,value4 -"benchmark_3:secondary3","thrpt",968,6,"432,833333","1036,758184","ops/ms",value0,value1,value2,value3,value4 -"benchmark_4","thrpt",739,1,"956,000000",NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4:secondary1","thrpt",739,1,"688,000000",NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4:secondary2","thrpt",739,1,"237,000000",NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4:secondary3","thrpt",739,1,"599,000000",NaN,"ops/ms",value0,value1,value2,value3,value4 +"Benchmark","Mode","Threads","Samples","Score","Score Error (99,9%)","Unit","Param: param0","Param: param1","Param: param2","Param: param3","Param: param4" +"benchmark_0","thrpt",80,14,"528,857143","278,141953","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_0:secondary1","thrpt",80,14,"549,714286","320,227488","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_0:secondary2","thrpt",80,14,"615,500000","319,209585","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_0:secondary3","thrpt",80,5,"246,000000","847,566004","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_1","thrpt",900,1,"439,000000",NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_1:secondary1","thrpt",900,1,"953,000000",NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_1:secondary2","thrpt",900,1,"367,000000",NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2","thrpt",466,9,"545,000000","553,336699","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2:secondary1","thrpt",466,9,"434,444444","465,182504","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2:secondary2","thrpt",466,9,"470,333333","502,273041","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2:secondary3","thrpt",466,5,"574,400000","969,535252","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3","thrpt",968,14,"417,571429","362,813967","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3:secondary1","thrpt",968,14,"672,214286","287,982211","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3:secondary2","thrpt",968,14,"560,142857","289,799961","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3:secondary3","thrpt",968,6,"432,833333","1036,758184","ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4","thrpt",739,1,"956,000000",NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4:secondary1","thrpt",739,1,"688,000000",NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4:secondary2","thrpt",739,1,"237,000000",NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4:secondary3","thrpt",739,1,"599,000000",NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.csv.us Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.csv.us Tue Jan 15 16:27:09 2019 +0100 @@ -1,20 +1,20 @@ -"Benchmark","Mode","Threads","Samples","Score","Score Error (99.9%)","Unit","Param: param0","Param: param1","Param: param2","Param: param3","Param: param4" -"benchmark_0","thrpt",80,14,528.857143,278.141953,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_0:secondary1","thrpt",80,14,549.714286,320.227488,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_0:secondary2","thrpt",80,14,615.500000,319.209585,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_0:secondary3","thrpt",80,5,246.000000,847.566004,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_1","thrpt",900,1,439.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_1:secondary1","thrpt",900,1,953.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_1:secondary2","thrpt",900,1,367.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_2","thrpt",466,9,545.000000,553.336699,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_2:secondary1","thrpt",466,9,434.444444,465.182504,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_2:secondary2","thrpt",466,9,470.333333,502.273041,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_2:secondary3","thrpt",466,5,574.400000,969.535252,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_3","thrpt",968,14,417.571429,362.813967,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_3:secondary1","thrpt",968,14,672.214286,287.982211,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_3:secondary2","thrpt",968,14,560.142857,289.799961,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_3:secondary3","thrpt",968,6,432.833333,1036.758184,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4","thrpt",739,1,956.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4:secondary1","thrpt",739,1,688.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4:secondary2","thrpt",739,1,237.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 -"benchmark_4:secondary3","thrpt",739,1,599.000000,NaN,"ops/ms",value0,value1,value2,value3,value4 +"Benchmark","Mode","Threads","Samples","Score","Score Error (99.9%)","Unit","Param: param0","Param: param1","Param: param2","Param: param3","Param: param4" +"benchmark_0","thrpt",80,14,528.857143,278.141953,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_0:secondary1","thrpt",80,14,549.714286,320.227488,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_0:secondary2","thrpt",80,14,615.500000,319.209585,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_0:secondary3","thrpt",80,5,246.000000,847.566004,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_1","thrpt",900,1,439.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_1:secondary1","thrpt",900,1,953.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_1:secondary2","thrpt",900,1,367.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2","thrpt",466,9,545.000000,553.336699,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2:secondary1","thrpt",466,9,434.444444,465.182504,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2:secondary2","thrpt",466,9,470.333333,502.273041,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_2:secondary3","thrpt",466,5,574.400000,969.535252,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3","thrpt",968,14,417.571429,362.813967,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3:secondary1","thrpt",968,14,672.214286,287.982211,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3:secondary2","thrpt",968,14,560.142857,289.799961,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_3:secondary3","thrpt",968,6,432.833333,1036.758184,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4","thrpt",739,1,956.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4:secondary1","thrpt",739,1,688.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4:secondary2","thrpt",739,1,237.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" +"benchmark_4:secondary3","thrpt",739,1,599.000000,NaN,"ops/ms",value0,[value1],{value2},'value3',"""value4""" \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.json Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.json Tue Jan 15 16:27:09 2019 +0100 @@ -19,10 +19,10 @@ "measurementBatchSize" : 1, "params" : { "param0" : "value0", - "param1" : "value1", - "param2" : "value2", - "param3" : "value3", - "param4" : "value4" + "param1" : "[value1]", + "param2" : "{value2}", + "param3" : "'value3'", + "param4" : "\"value4\"" }, "primaryMetric" : { "score" : 528.8571428571429, @@ -242,10 +242,10 @@ "measurementBatchSize" : 1, "params" : { "param0" : "value0", - "param1" : "value1", - "param2" : "value2", - "param3" : "value3", - "param4" : "value4" + "param1" : "[value1]", + "param2" : "{value2}", + "param3" : "'value3'", + "param4" : "\"value4\"" }, "primaryMetric" : { "score" : 439.0, @@ -348,10 +348,10 @@ "measurementBatchSize" : 1, "params" : { "param0" : "value0", - "param1" : "value1", - "param2" : "value2", - "param3" : "value3", - "param4" : "value4" + "param1" : "[value1]", + "param2" : "{value2}", + "param3" : "'value3'", + "param4" : "\"value4\"" }, "primaryMetric" : { "score" : 545.0, @@ -516,10 +516,10 @@ "measurementBatchSize" : 1, "params" : { "param0" : "value0", - "param1" : "value1", - "param2" : "value2", - "param3" : "value3", - "param4" : "value4" + "param1" : "[value1]", + "param2" : "{value2}", + "param3" : "'value3'", + "param4" : "\"value4\"" }, "primaryMetric" : { "score" : 417.57142857142856, @@ -716,10 +716,10 @@ "measurementBatchSize" : 1, "params" : { "param0" : "value0", - "param1" : "value1", - "param2" : "value2", - "param3" : "value3", - "param4" : "value4" + "param1" : "[value1]", + "param2" : "{value2}", + "param3" : "'value3'", + "param4" : "\"value4\"" }, "primaryMetric" : { "score" : 956.0,
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.latex.root Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.latex.root Tue Jan 15 16:27:09 2019 +0100 @@ -1,23 +1,23 @@ \begin{tabular}{r|l|l|l|l|l|rl} \multicolumn{1}{c|}{\texttt{Benchmark}} & \texttt{param0} & \texttt{param1} & \texttt{param2} & \texttt{param3} & \texttt{param4} & \multicolumn{2}{c}{\texttt{Score, ops/ms}} \\ \hline -\texttt{benchmark\_0} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{528.857} & \scriptsize $\pm$ \texttt{278.142} \\ -\texttt{benchmark\_0:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{549.714} & \scriptsize $\pm$ \texttt{320.227} \\ -\texttt{benchmark\_0:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{615.500} & \scriptsize $\pm$ \texttt{319.210} \\ -\texttt{benchmark\_0:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{246.000} & \scriptsize $\pm$ \texttt{847.566} \\ -\texttt{benchmark\_1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{439.000} & \\ -\texttt{benchmark\_1:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{953.000} & \\ -\texttt{benchmark\_1:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{367.000} & \\ -\texttt{benchmark\_2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{545.000} & \scriptsize $\pm$ \texttt{553.337} \\ -\texttt{benchmark\_2:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{434.444} & \scriptsize $\pm$ \texttt{465.183} \\ -\texttt{benchmark\_2:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{470.333} & \scriptsize $\pm$ \texttt{502.273} \\ -\texttt{benchmark\_2:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{574.400} & \scriptsize $\pm$ \texttt{969.535} \\ -\texttt{benchmark\_3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{417.571} & \scriptsize $\pm$ \texttt{362.814} \\ -\texttt{benchmark\_3:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{672.214} & \scriptsize $\pm$ \texttt{287.982} \\ -\texttt{benchmark\_3:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{560.143} & \scriptsize $\pm$ \texttt{289.800} \\ -\texttt{benchmark\_3:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{432.833} & \scriptsize $\pm$ \texttt{1036.758} \\ -\texttt{benchmark\_4} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{956.000} & \\ -\texttt{benchmark\_4:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{688.000} & \\ -\texttt{benchmark\_4:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{237.000} & \\ -\texttt{benchmark\_4:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{599.000} & \\ +\texttt{benchmark\_0} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{528.857} & \scriptsize $\pm$ \texttt{278.142} \\ +\texttt{benchmark\_0:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{549.714} & \scriptsize $\pm$ \texttt{320.227} \\ +\texttt{benchmark\_0:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{615.500} & \scriptsize $\pm$ \texttt{319.210} \\ +\texttt{benchmark\_0:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{246.000} & \scriptsize $\pm$ \texttt{847.566} \\ +\texttt{benchmark\_1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{439.000} & \\ +\texttt{benchmark\_1:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{953.000} & \\ +\texttt{benchmark\_1:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{367.000} & \\ +\texttt{benchmark\_2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{545.000} & \scriptsize $\pm$ \texttt{553.337} \\ +\texttt{benchmark\_2:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{434.444} & \scriptsize $\pm$ \texttt{465.183} \\ +\texttt{benchmark\_2:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{470.333} & \scriptsize $\pm$ \texttt{502.273} \\ +\texttt{benchmark\_2:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{574.400} & \scriptsize $\pm$ \texttt{969.535} \\ +\texttt{benchmark\_3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{417.571} & \scriptsize $\pm$ \texttt{362.814} \\ +\texttt{benchmark\_3:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{672.214} & \scriptsize $\pm$ \texttt{287.982} \\ +\texttt{benchmark\_3:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{560.143} & \scriptsize $\pm$ \texttt{289.800} \\ +\texttt{benchmark\_3:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{432.833} & \scriptsize $\pm$ \texttt{1036.758} \\ +\texttt{benchmark\_4} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{956.000} & \\ +\texttt{benchmark\_4:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{688.000} & \\ +\texttt{benchmark\_4:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{237.000} & \\ +\texttt{benchmark\_4:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{599.000} & \\ \end{tabular} \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.latex.ru Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.latex.ru Tue Jan 15 16:27:09 2019 +0100 @@ -1,23 +1,23 @@ \begin{tabular}{r|l|l|l|l|l|rl} \multicolumn{1}{c|}{\texttt{Benchmark}} & \texttt{param0} & \texttt{param1} & \texttt{param2} & \texttt{param3} & \texttt{param4} & \multicolumn{2}{c}{\texttt{Score, ops/ms}} \\ \hline -\texttt{benchmark\_0} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{528,857} & \scriptsize $\pm$ \texttt{278,142} \\ -\texttt{benchmark\_0:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{549,714} & \scriptsize $\pm$ \texttt{320,227} \\ -\texttt{benchmark\_0:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{615,500} & \scriptsize $\pm$ \texttt{319,210} \\ -\texttt{benchmark\_0:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{246,000} & \scriptsize $\pm$ \texttt{847,566} \\ -\texttt{benchmark\_1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{439,000} & \\ -\texttt{benchmark\_1:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{953,000} & \\ -\texttt{benchmark\_1:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{367,000} & \\ -\texttt{benchmark\_2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{545,000} & \scriptsize $\pm$ \texttt{553,337} \\ -\texttt{benchmark\_2:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{434,444} & \scriptsize $\pm$ \texttt{465,183} \\ -\texttt{benchmark\_2:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{470,333} & \scriptsize $\pm$ \texttt{502,273} \\ -\texttt{benchmark\_2:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{574,400} & \scriptsize $\pm$ \texttt{969,535} \\ -\texttt{benchmark\_3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{417,571} & \scriptsize $\pm$ \texttt{362,814} \\ -\texttt{benchmark\_3:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{672,214} & \scriptsize $\pm$ \texttt{287,982} \\ -\texttt{benchmark\_3:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{560,143} & \scriptsize $\pm$ \texttt{289,800} \\ -\texttt{benchmark\_3:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{432,833} & \scriptsize $\pm$ \texttt{1036,758} \\ -\texttt{benchmark\_4} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{956,000} & \\ -\texttt{benchmark\_4:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{688,000} & \\ -\texttt{benchmark\_4:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{237,000} & \\ -\texttt{benchmark\_4:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{599,000} & \\ +\texttt{benchmark\_0} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{528,857} & \scriptsize $\pm$ \texttt{278,142} \\ +\texttt{benchmark\_0:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{549,714} & \scriptsize $\pm$ \texttt{320,227} \\ +\texttt{benchmark\_0:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{615,500} & \scriptsize $\pm$ \texttt{319,210} \\ +\texttt{benchmark\_0:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{246,000} & \scriptsize $\pm$ \texttt{847,566} \\ +\texttt{benchmark\_1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{439,000} & \\ +\texttt{benchmark\_1:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{953,000} & \\ +\texttt{benchmark\_1:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{367,000} & \\ +\texttt{benchmark\_2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{545,000} & \scriptsize $\pm$ \texttt{553,337} \\ +\texttt{benchmark\_2:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{434,444} & \scriptsize $\pm$ \texttt{465,183} \\ +\texttt{benchmark\_2:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{470,333} & \scriptsize $\pm$ \texttt{502,273} \\ +\texttt{benchmark\_2:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{574,400} & \scriptsize $\pm$ \texttt{969,535} \\ +\texttt{benchmark\_3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{417,571} & \scriptsize $\pm$ \texttt{362,814} \\ +\texttt{benchmark\_3:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{672,214} & \scriptsize $\pm$ \texttt{287,982} \\ +\texttt{benchmark\_3:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{560,143} & \scriptsize $\pm$ \texttt{289,800} \\ +\texttt{benchmark\_3:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{432,833} & \scriptsize $\pm$ \texttt{1036,758} \\ +\texttt{benchmark\_4} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{956,000} & \\ +\texttt{benchmark\_4:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{688,000} & \\ +\texttt{benchmark\_4:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{237,000} & \\ +\texttt{benchmark\_4:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{599,000} & \\ \end{tabular} \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.latex.us Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.latex.us Tue Jan 15 16:27:09 2019 +0100 @@ -1,23 +1,23 @@ \begin{tabular}{r|l|l|l|l|l|rl} \multicolumn{1}{c|}{\texttt{Benchmark}} & \texttt{param0} & \texttt{param1} & \texttt{param2} & \texttt{param3} & \texttt{param4} & \multicolumn{2}{c}{\texttt{Score, ops/ms}} \\ \hline -\texttt{benchmark\_0} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{528.857} & \scriptsize $\pm$ \texttt{278.142} \\ -\texttt{benchmark\_0:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{549.714} & \scriptsize $\pm$ \texttt{320.227} \\ -\texttt{benchmark\_0:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{615.500} & \scriptsize $\pm$ \texttt{319.210} \\ -\texttt{benchmark\_0:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{246.000} & \scriptsize $\pm$ \texttt{847.566} \\ -\texttt{benchmark\_1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{439.000} & \\ -\texttt{benchmark\_1:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{953.000} & \\ -\texttt{benchmark\_1:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{367.000} & \\ -\texttt{benchmark\_2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{545.000} & \scriptsize $\pm$ \texttt{553.337} \\ -\texttt{benchmark\_2:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{434.444} & \scriptsize $\pm$ \texttt{465.183} \\ -\texttt{benchmark\_2:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{470.333} & \scriptsize $\pm$ \texttt{502.273} \\ -\texttt{benchmark\_2:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{574.400} & \scriptsize $\pm$ \texttt{969.535} \\ -\texttt{benchmark\_3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{417.571} & \scriptsize $\pm$ \texttt{362.814} \\ -\texttt{benchmark\_3:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{672.214} & \scriptsize $\pm$ \texttt{287.982} \\ -\texttt{benchmark\_3:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{560.143} & \scriptsize $\pm$ \texttt{289.800} \\ -\texttt{benchmark\_3:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{432.833} & \scriptsize $\pm$ \texttt{1036.758} \\ -\texttt{benchmark\_4} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{956.000} & \\ -\texttt{benchmark\_4:secondary1} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{688.000} & \\ -\texttt{benchmark\_4:secondary2} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{237.000} & \\ -\texttt{benchmark\_4:secondary3} & \texttt{value0} & \texttt{value1} & \texttt{value2} & \texttt{value3} & \texttt{value4} & \texttt{599.000} & \\ +\texttt{benchmark\_0} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{528.857} & \scriptsize $\pm$ \texttt{278.142} \\ +\texttt{benchmark\_0:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{549.714} & \scriptsize $\pm$ \texttt{320.227} \\ +\texttt{benchmark\_0:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{615.500} & \scriptsize $\pm$ \texttt{319.210} \\ +\texttt{benchmark\_0:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{246.000} & \scriptsize $\pm$ \texttt{847.566} \\ +\texttt{benchmark\_1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{439.000} & \\ +\texttt{benchmark\_1:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{953.000} & \\ +\texttt{benchmark\_1:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{367.000} & \\ +\texttt{benchmark\_2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{545.000} & \scriptsize $\pm$ \texttt{553.337} \\ +\texttt{benchmark\_2:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{434.444} & \scriptsize $\pm$ \texttt{465.183} \\ +\texttt{benchmark\_2:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{470.333} & \scriptsize $\pm$ \texttt{502.273} \\ +\texttt{benchmark\_2:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{574.400} & \scriptsize $\pm$ \texttt{969.535} \\ +\texttt{benchmark\_3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{417.571} & \scriptsize $\pm$ \texttt{362.814} \\ +\texttt{benchmark\_3:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{672.214} & \scriptsize $\pm$ \texttt{287.982} \\ +\texttt{benchmark\_3:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{560.143} & \scriptsize $\pm$ \texttt{289.800} \\ +\texttt{benchmark\_3:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{432.833} & \scriptsize $\pm$ \texttt{1036.758} \\ +\texttt{benchmark\_4} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{956.000} & \\ +\texttt{benchmark\_4:secondary1} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{688.000} & \\ +\texttt{benchmark\_4:secondary2} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{237.000} & \\ +\texttt{benchmark\_4:secondary3} & \texttt{value0} & \texttt{[value1]} & \texttt{\{value2\}} & \texttt{'value3'} & \texttt{"value4"} & \texttt{599.000} & \\ \end{tabular} \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.scsv.root Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.scsv.root Tue Jan 15 16:27:09 2019 +0100 @@ -1,20 +1,20 @@ -"Benchmark";"Mode";"Threads";"Samples";"Score";"Score Error (99.9%)";"Unit";"Param: param0";"Param: param1";"Param: param2";"Param: param3";"Param: param4" -"benchmark_0";"thrpt";80;14;528.857143;278.141953;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_0:secondary1";"thrpt";80;14;549.714286;320.227488;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_0:secondary2";"thrpt";80;14;615.500000;319.209585;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_0:secondary3";"thrpt";80;5;246.000000;847.566004;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_1";"thrpt";900;1;439.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_1:secondary1";"thrpt";900;1;953.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_1:secondary2";"thrpt";900;1;367.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2";"thrpt";466;9;545.000000;553.336699;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2:secondary1";"thrpt";466;9;434.444444;465.182504;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2:secondary2";"thrpt";466;9;470.333333;502.273041;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2:secondary3";"thrpt";466;5;574.400000;969.535252;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3";"thrpt";968;14;417.571429;362.813967;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3:secondary1";"thrpt";968;14;672.214286;287.982211;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3:secondary2";"thrpt";968;14;560.142857;289.799961;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3:secondary3";"thrpt";968;6;432.833333;1036.758184;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4";"thrpt";739;1;956.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4:secondary1";"thrpt";739;1;688.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4:secondary2";"thrpt";739;1;237.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4:secondary3";"thrpt";739;1;599.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 +"Benchmark";"Mode";"Threads";"Samples";"Score";"Score Error (99.9%)";"Unit";"Param: param0";"Param: param1";"Param: param2";"Param: param3";"Param: param4" +"benchmark_0";"thrpt";80;14;528.857143;278.141953;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_0:secondary1";"thrpt";80;14;549.714286;320.227488;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_0:secondary2";"thrpt";80;14;615.500000;319.209585;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_0:secondary3";"thrpt";80;5;246.000000;847.566004;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_1";"thrpt";900;1;439.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_1:secondary1";"thrpt";900;1;953.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_1:secondary2";"thrpt";900;1;367.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2";"thrpt";466;9;545.000000;553.336699;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2:secondary1";"thrpt";466;9;434.444444;465.182504;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2:secondary2";"thrpt";466;9;470.333333;502.273041;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2:secondary3";"thrpt";466;5;574.400000;969.535252;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3";"thrpt";968;14;417.571429;362.813967;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3:secondary1";"thrpt";968;14;672.214286;287.982211;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3:secondary2";"thrpt";968;14;560.142857;289.799961;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3:secondary3";"thrpt";968;6;432.833333;1036.758184;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4";"thrpt";739;1;956.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4:secondary1";"thrpt";739;1;688.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4:secondary2";"thrpt";739;1;237.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4:secondary3";"thrpt";739;1;599.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.scsv.ru Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.scsv.ru Tue Jan 15 16:27:09 2019 +0100 @@ -1,20 +1,20 @@ -"Benchmark";"Mode";"Threads";"Samples";"Score";"Score Error (99,9%)";"Unit";"Param: param0";"Param: param1";"Param: param2";"Param: param3";"Param: param4" -"benchmark_0";"thrpt";80;14;528,857143;278,141953;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_0:secondary1";"thrpt";80;14;549,714286;320,227488;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_0:secondary2";"thrpt";80;14;615,500000;319,209585;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_0:secondary3";"thrpt";80;5;246,000000;847,566004;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_1";"thrpt";900;1;439,000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_1:secondary1";"thrpt";900;1;953,000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_1:secondary2";"thrpt";900;1;367,000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2";"thrpt";466;9;545,000000;553,336699;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2:secondary1";"thrpt";466;9;434,444444;465,182504;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2:secondary2";"thrpt";466;9;470,333333;502,273041;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2:secondary3";"thrpt";466;5;574,400000;969,535252;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3";"thrpt";968;14;417,571429;362,813967;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3:secondary1";"thrpt";968;14;672,214286;287,982211;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3:secondary2";"thrpt";968;14;560,142857;289,799961;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3:secondary3";"thrpt";968;6;432,833333;1036,758184;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4";"thrpt";739;1;956,000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4:secondary1";"thrpt";739;1;688,000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4:secondary2";"thrpt";739;1;237,000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4:secondary3";"thrpt";739;1;599,000000;NaN;"ops/ms";value0;value1;value2;value3;value4 +"Benchmark";"Mode";"Threads";"Samples";"Score";"Score Error (99,9%)";"Unit";"Param: param0";"Param: param1";"Param: param2";"Param: param3";"Param: param4" +"benchmark_0";"thrpt";80;14;528,857143;278,141953;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_0:secondary1";"thrpt";80;14;549,714286;320,227488;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_0:secondary2";"thrpt";80;14;615,500000;319,209585;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_0:secondary3";"thrpt";80;5;246,000000;847,566004;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_1";"thrpt";900;1;439,000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_1:secondary1";"thrpt";900;1;953,000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_1:secondary2";"thrpt";900;1;367,000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2";"thrpt";466;9;545,000000;553,336699;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2:secondary1";"thrpt";466;9;434,444444;465,182504;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2:secondary2";"thrpt";466;9;470,333333;502,273041;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2:secondary3";"thrpt";466;5;574,400000;969,535252;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3";"thrpt";968;14;417,571429;362,813967;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3:secondary1";"thrpt";968;14;672,214286;287,982211;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3:secondary2";"thrpt";968;14;560,142857;289,799961;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3:secondary3";"thrpt";968;6;432,833333;1036,758184;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4";"thrpt";739;1;956,000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4:secondary1";"thrpt";739;1;688,000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4:secondary2";"thrpt";739;1;237,000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4:secondary3";"thrpt";739;1;599,000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.scsv.us Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.scsv.us Tue Jan 15 16:27:09 2019 +0100 @@ -1,20 +1,20 @@ -"Benchmark";"Mode";"Threads";"Samples";"Score";"Score Error (99.9%)";"Unit";"Param: param0";"Param: param1";"Param: param2";"Param: param3";"Param: param4" -"benchmark_0";"thrpt";80;14;528.857143;278.141953;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_0:secondary1";"thrpt";80;14;549.714286;320.227488;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_0:secondary2";"thrpt";80;14;615.500000;319.209585;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_0:secondary3";"thrpt";80;5;246.000000;847.566004;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_1";"thrpt";900;1;439.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_1:secondary1";"thrpt";900;1;953.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_1:secondary2";"thrpt";900;1;367.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2";"thrpt";466;9;545.000000;553.336699;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2:secondary1";"thrpt";466;9;434.444444;465.182504;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2:secondary2";"thrpt";466;9;470.333333;502.273041;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_2:secondary3";"thrpt";466;5;574.400000;969.535252;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3";"thrpt";968;14;417.571429;362.813967;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3:secondary1";"thrpt";968;14;672.214286;287.982211;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3:secondary2";"thrpt";968;14;560.142857;289.799961;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_3:secondary3";"thrpt";968;6;432.833333;1036.758184;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4";"thrpt";739;1;956.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4:secondary1";"thrpt";739;1;688.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4:secondary2";"thrpt";739;1;237.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 -"benchmark_4:secondary3";"thrpt";739;1;599.000000;NaN;"ops/ms";value0;value1;value2;value3;value4 +"Benchmark";"Mode";"Threads";"Samples";"Score";"Score Error (99.9%)";"Unit";"Param: param0";"Param: param1";"Param: param2";"Param: param3";"Param: param4" +"benchmark_0";"thrpt";80;14;528.857143;278.141953;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_0:secondary1";"thrpt";80;14;549.714286;320.227488;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_0:secondary2";"thrpt";80;14;615.500000;319.209585;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_0:secondary3";"thrpt";80;5;246.000000;847.566004;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_1";"thrpt";900;1;439.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_1:secondary1";"thrpt";900;1;953.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_1:secondary2";"thrpt";900;1;367.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2";"thrpt";466;9;545.000000;553.336699;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2:secondary1";"thrpt";466;9;434.444444;465.182504;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2:secondary2";"thrpt";466;9;470.333333;502.273041;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_2:secondary3";"thrpt";466;5;574.400000;969.535252;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3";"thrpt";968;14;417.571429;362.813967;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3:secondary1";"thrpt";968;14;672.214286;287.982211;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3:secondary2";"thrpt";968;14;560.142857;289.799961;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_3:secondary3";"thrpt";968;6;432.833333;1036.758184;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4";"thrpt";739;1;956.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4:secondary1";"thrpt";739;1;688.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4:secondary2";"thrpt";739;1;237.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" +"benchmark_4:secondary3";"thrpt";739;1;599.000000;NaN;"ops/ms";value0;[value1];{value2};'value3';"""value4""" \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.text.root Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.text.root Tue Jan 15 16:27:09 2019 +0100 @@ -1,20 +1,20 @@ Benchmark (param0) (param1) (param2) (param3) (param4) Mode Cnt Score Error Units -benchmark_0 value0 value1 value2 value3 value4 thrpt 14 528.857 ± 278.142 ops/ms -benchmark_0:secondary1 value0 value1 value2 value3 value4 thrpt 14 549.714 ± 320.227 ops/ms -benchmark_0:secondary2 value0 value1 value2 value3 value4 thrpt 14 615.500 ± 319.210 ops/ms -benchmark_0:secondary3 value0 value1 value2 value3 value4 thrpt 5 246.000 ± 847.566 ops/ms -benchmark_1 value0 value1 value2 value3 value4 thrpt 439.000 ops/ms -benchmark_1:secondary1 value0 value1 value2 value3 value4 thrpt 953.000 ops/ms -benchmark_1:secondary2 value0 value1 value2 value3 value4 thrpt 367.000 ops/ms -benchmark_2 value0 value1 value2 value3 value4 thrpt 9 545.000 ± 553.337 ops/ms -benchmark_2:secondary1 value0 value1 value2 value3 value4 thrpt 9 434.444 ± 465.183 ops/ms -benchmark_2:secondary2 value0 value1 value2 value3 value4 thrpt 9 470.333 ± 502.273 ops/ms -benchmark_2:secondary3 value0 value1 value2 value3 value4 thrpt 5 574.400 ± 969.535 ops/ms -benchmark_3 value0 value1 value2 value3 value4 thrpt 14 417.571 ± 362.814 ops/ms -benchmark_3:secondary1 value0 value1 value2 value3 value4 thrpt 14 672.214 ± 287.982 ops/ms -benchmark_3:secondary2 value0 value1 value2 value3 value4 thrpt 14 560.143 ± 289.800 ops/ms -benchmark_3:secondary3 value0 value1 value2 value3 value4 thrpt 6 432.833 ± 1036.758 ops/ms -benchmark_4 value0 value1 value2 value3 value4 thrpt 956.000 ops/ms -benchmark_4:secondary1 value0 value1 value2 value3 value4 thrpt 688.000 ops/ms -benchmark_4:secondary2 value0 value1 value2 value3 value4 thrpt 237.000 ops/ms -benchmark_4:secondary3 value0 value1 value2 value3 value4 thrpt 599.000 ops/ms +benchmark_0 value0 [value1] {value2} 'value3' "value4" thrpt 14 528.857 ± 278.142 ops/ms +benchmark_0:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 14 549.714 ± 320.227 ops/ms +benchmark_0:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 14 615.500 ± 319.210 ops/ms +benchmark_0:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 5 246.000 ± 847.566 ops/ms +benchmark_1 value0 [value1] {value2} 'value3' "value4" thrpt 439.000 ops/ms +benchmark_1:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 953.000 ops/ms +benchmark_1:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 367.000 ops/ms +benchmark_2 value0 [value1] {value2} 'value3' "value4" thrpt 9 545.000 ± 553.337 ops/ms +benchmark_2:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 9 434.444 ± 465.183 ops/ms +benchmark_2:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 9 470.333 ± 502.273 ops/ms +benchmark_2:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 5 574.400 ± 969.535 ops/ms +benchmark_3 value0 [value1] {value2} 'value3' "value4" thrpt 14 417.571 ± 362.814 ops/ms +benchmark_3:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 14 672.214 ± 287.982 ops/ms +benchmark_3:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 14 560.143 ± 289.800 ops/ms +benchmark_3:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 6 432.833 ± 1036.758 ops/ms +benchmark_4 value0 [value1] {value2} 'value3' "value4" thrpt 956.000 ops/ms +benchmark_4:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 688.000 ops/ms +benchmark_4:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 237.000 ops/ms +benchmark_4:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 599.000 ops/ms \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.text.ru Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.text.ru Tue Jan 15 16:27:09 2019 +0100 @@ -1,20 +1,20 @@ Benchmark (param0) (param1) (param2) (param3) (param4) Mode Cnt Score Error Units -benchmark_0 value0 value1 value2 value3 value4 thrpt 14 528,857 ± 278,142 ops/ms -benchmark_0:secondary1 value0 value1 value2 value3 value4 thrpt 14 549,714 ± 320,227 ops/ms -benchmark_0:secondary2 value0 value1 value2 value3 value4 thrpt 14 615,500 ± 319,210 ops/ms -benchmark_0:secondary3 value0 value1 value2 value3 value4 thrpt 5 246,000 ± 847,566 ops/ms -benchmark_1 value0 value1 value2 value3 value4 thrpt 439,000 ops/ms -benchmark_1:secondary1 value0 value1 value2 value3 value4 thrpt 953,000 ops/ms -benchmark_1:secondary2 value0 value1 value2 value3 value4 thrpt 367,000 ops/ms -benchmark_2 value0 value1 value2 value3 value4 thrpt 9 545,000 ± 553,337 ops/ms -benchmark_2:secondary1 value0 value1 value2 value3 value4 thrpt 9 434,444 ± 465,183 ops/ms -benchmark_2:secondary2 value0 value1 value2 value3 value4 thrpt 9 470,333 ± 502,273 ops/ms -benchmark_2:secondary3 value0 value1 value2 value3 value4 thrpt 5 574,400 ± 969,535 ops/ms -benchmark_3 value0 value1 value2 value3 value4 thrpt 14 417,571 ± 362,814 ops/ms -benchmark_3:secondary1 value0 value1 value2 value3 value4 thrpt 14 672,214 ± 287,982 ops/ms -benchmark_3:secondary2 value0 value1 value2 value3 value4 thrpt 14 560,143 ± 289,800 ops/ms -benchmark_3:secondary3 value0 value1 value2 value3 value4 thrpt 6 432,833 ± 1036,758 ops/ms -benchmark_4 value0 value1 value2 value3 value4 thrpt 956,000 ops/ms -benchmark_4:secondary1 value0 value1 value2 value3 value4 thrpt 688,000 ops/ms -benchmark_4:secondary2 value0 value1 value2 value3 value4 thrpt 237,000 ops/ms -benchmark_4:secondary3 value0 value1 value2 value3 value4 thrpt 599,000 ops/ms +benchmark_0 value0 [value1] {value2} 'value3' "value4" thrpt 14 528,857 ± 278,142 ops/ms +benchmark_0:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 14 549,714 ± 320,227 ops/ms +benchmark_0:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 14 615,500 ± 319,210 ops/ms +benchmark_0:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 5 246,000 ± 847,566 ops/ms +benchmark_1 value0 [value1] {value2} 'value3' "value4" thrpt 439,000 ops/ms +benchmark_1:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 953,000 ops/ms +benchmark_1:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 367,000 ops/ms +benchmark_2 value0 [value1] {value2} 'value3' "value4" thrpt 9 545,000 ± 553,337 ops/ms +benchmark_2:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 9 434,444 ± 465,183 ops/ms +benchmark_2:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 9 470,333 ± 502,273 ops/ms +benchmark_2:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 5 574,400 ± 969,535 ops/ms +benchmark_3 value0 [value1] {value2} 'value3' "value4" thrpt 14 417,571 ± 362,814 ops/ms +benchmark_3:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 14 672,214 ± 287,982 ops/ms +benchmark_3:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 14 560,143 ± 289,800 ops/ms +benchmark_3:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 6 432,833 ± 1036,758 ops/ms +benchmark_4 value0 [value1] {value2} 'value3' "value4" thrpt 956,000 ops/ms +benchmark_4:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 688,000 ops/ms +benchmark_4:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 237,000 ops/ms +benchmark_4:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 599,000 ops/ms \ No newline at end of file
--- a/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.text.us Wed Sep 26 16:57:35 2018 +0200 +++ b/jmh-core/src/test/resources/org/openjdk/jmh/results/format/output-golden.text.us Tue Jan 15 16:27:09 2019 +0100 @@ -1,20 +1,20 @@ Benchmark (param0) (param1) (param2) (param3) (param4) Mode Cnt Score Error Units -benchmark_0 value0 value1 value2 value3 value4 thrpt 14 528.857 ± 278.142 ops/ms -benchmark_0:secondary1 value0 value1 value2 value3 value4 thrpt 14 549.714 ± 320.227 ops/ms -benchmark_0:secondary2 value0 value1 value2 value3 value4 thrpt 14 615.500 ± 319.210 ops/ms -benchmark_0:secondary3 value0 value1 value2 value3 value4 thrpt 5 246.000 ± 847.566 ops/ms -benchmark_1 value0 value1 value2 value3 value4 thrpt 439.000 ops/ms -benchmark_1:secondary1 value0 value1 value2 value3 value4 thrpt 953.000 ops/ms -benchmark_1:secondary2 value0 value1 value2 value3 value4 thrpt 367.000 ops/ms -benchmark_2 value0 value1 value2 value3 value4 thrpt 9 545.000 ± 553.337 ops/ms -benchmark_2:secondary1 value0 value1 value2 value3 value4 thrpt 9 434.444 ± 465.183 ops/ms -benchmark_2:secondary2 value0 value1 value2 value3 value4 thrpt 9 470.333 ± 502.273 ops/ms -benchmark_2:secondary3 value0 value1 value2 value3 value4 thrpt 5 574.400 ± 969.535 ops/ms -benchmark_3 value0 value1 value2 value3 value4 thrpt 14 417.571 ± 362.814 ops/ms -benchmark_3:secondary1 value0 value1 value2 value3 value4 thrpt 14 672.214 ± 287.982 ops/ms -benchmark_3:secondary2 value0 value1 value2 value3 value4 thrpt 14 560.143 ± 289.800 ops/ms -benchmark_3:secondary3 value0 value1 value2 value3 value4 thrpt 6 432.833 ± 1036.758 ops/ms -benchmark_4 value0 value1 value2 value3 value4 thrpt 956.000 ops/ms -benchmark_4:secondary1 value0 value1 value2 value3 value4 thrpt 688.000 ops/ms -benchmark_4:secondary2 value0 value1 value2 value3 value4 thrpt 237.000 ops/ms -benchmark_4:secondary3 value0 value1 value2 value3 value4 thrpt 599.000 ops/ms +benchmark_0 value0 [value1] {value2} 'value3' "value4" thrpt 14 528.857 ± 278.142 ops/ms +benchmark_0:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 14 549.714 ± 320.227 ops/ms +benchmark_0:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 14 615.500 ± 319.210 ops/ms +benchmark_0:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 5 246.000 ± 847.566 ops/ms +benchmark_1 value0 [value1] {value2} 'value3' "value4" thrpt 439.000 ops/ms +benchmark_1:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 953.000 ops/ms +benchmark_1:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 367.000 ops/ms +benchmark_2 value0 [value1] {value2} 'value3' "value4" thrpt 9 545.000 ± 553.337 ops/ms +benchmark_2:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 9 434.444 ± 465.183 ops/ms +benchmark_2:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 9 470.333 ± 502.273 ops/ms +benchmark_2:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 5 574.400 ± 969.535 ops/ms +benchmark_3 value0 [value1] {value2} 'value3' "value4" thrpt 14 417.571 ± 362.814 ops/ms +benchmark_3:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 14 672.214 ± 287.982 ops/ms +benchmark_3:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 14 560.143 ± 289.800 ops/ms +benchmark_3:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 6 432.833 ± 1036.758 ops/ms +benchmark_4 value0 [value1] {value2} 'value3' "value4" thrpt 956.000 ops/ms +benchmark_4:secondary1 value0 [value1] {value2} 'value3' "value4" thrpt 688.000 ops/ms +benchmark_4:secondary2 value0 [value1] {value2} 'value3' "value4" thrpt 237.000 ops/ms +benchmark_4:secondary3 value0 [value1] {value2} 'value3' "value4" thrpt 599.000 ops/ms \ No newline at end of file