Sub-categorize bytecode handler benchmarks in test/js-perf-test.

All the bytecode handlers were added a one test, so we would get a
total on all of the bytecode handler benchmarks. It is not a good
indicator when we total unrelated benchmarks. So added more categories
to group only related benchmarks together. This also makes it easier
to look at the results.

Bug: chromium:730628
Change-Id: I1c5858f40c1ce584c4b7bd833a7f3c52a43d07c6
Reviewed-on: https://chromium-review.googlesource.com/527436
Commit-Queue: Mythri Alle <mythria@chromium.org>
Reviewed-by: Ross McIlroy <rmcilroy@chromium.org>
Cr-Commit-Position: refs/heads/master@{#45808}

test/js-perf-test/BytecodeHandlers/run.js

@@ -5,10 +5,7 @@
 
 load('../base.js');
 
-load('compare.js');
-load('string-concat.js');
-load('arithmetic.js');
-load('bitwise.js');
+load(arguments[0] + '.js');
 
 var success = true;
 

test/js-perf-test/JSTests.json

@@ -393,91 +393,124 @@
     {
       "name": "BytecodeHandlers",
       "path": ["BytecodeHandlers"],
-      "main": "run.js",
-      "resources": [ "compare.js", "string-concat.js", "arithmetic.js", "bitwise.js" ],
       "flags": [ "--no-opt" ],
-      "results_regexp": "^%s\\-BytecodeHandler\\(Score\\): (.+)$",
       "tests": [
-        {"name": "Smi-StrictEquals-True"},
-        {"name": "Smi-StrictEquals-False"},
-        {"name": "Number-StrictEquals-True"},
-        {"name": "Number-StrictEquals-False"},
-        {"name": "String-StrictEquals-True"},
-        {"name": "String-StrictEquals-False"},
-        {"name": "SmiString-StrictEquals"},
-        {"name": "Smi-Equals-True"},
-        {"name": "Smi-Equals-False"},
-        {"name": "Number-Equals-True"},
-        {"name": "Number-Equals-False"},
-        {"name": "String-Equals-True"},
-        {"name": "String-Equals-False"},
-        {"name": "ObjectNull-Equals"},
-        {"name": "SmiString-Equals"},
-        {"name": "Smi-RelationalCompare"},
-        {"name": "Number-RelationalCompare"},
-        {"name": "String-RelationalCompare"},
-        {"name": "SmiString-RelationalCompare"},
-        {"name": "ShortString-StringConcat-2"},
-        {"name": "ShortString-StringConcat-3"},
-        {"name": "ShortString-StringConcat-5"},
-        {"name": "ShortString-StringConcat-10"},
-        {"name": "LongString-StringConcat-2"},
-        {"name": "LongString-StringConcat-3"},
-        {"name": "LongString-StringConcat-5"},
-        {"name": "LongString-StringConcat-10"},
-        {"name": "NumberString-StringConcat-2"},
-        {"name": "NumberString-StringConcat-3"},
-        {"name": "NumberString-StringConcat-5"},
-        {"name": "NumberString-StringConcat-10"},
-        {"name": "Smi-Add"},
-        {"name": "Number-Add"},
-        {"name": "Number-Oddball-Add"},
-        {"name": "String-Add"},
-        {"name": "Object-Add"},
-        {"name": "Number-String-Add"},
-        {"name": "Smi-Sub"},
-        {"name": "Number-Sub"},
-        {"name": "Number-Oddball-Sub"},
-        {"name": "Object-Sub"},
-        {"name": "Smi-Mul"},
-        {"name": "Number-Mul"},
-        {"name": "Number-Oddball-Mul"},
-        {"name": "Object-Mul"},
-        {"name": "Smi-Div"},
-        {"name": "Number-Div"},
-        {"name": "Number-Oddball-Div"},
-        {"name": "Object-Div"},
-        {"name": "Smi-Mod"},
-        {"name": "Number-Mod"},
-        {"name": "Number-Oddball-Mod"},
-        {"name": "Object-Mod"},
-        {"name": "Smi-Constant-Add"},
-        {"name": "Smi-Constant-Sub"},
-        {"name": "Smi-Constant-Mul"},
-        {"name": "Smi-Constant-Div"},
-        {"name": "Smi-Constant-Mod"},
-        {"name": "Smi-Increment"},
-        {"name": "Number-Increment"},
-        {"name": "Smi-Decrement"},
-        {"name": "Number-Decrement"},
-        {"name": "Smi-Or"},
-        {"name": "Number-Or"},
-        {"name": "Smi-Xor"},
-        {"name": "Number-Xor"},
-        {"name": "Smi-And"},
-        {"name": "Number-And"},
-        {"name": "Smi-Constant-Or"},
-        {"name": "Smi-Constant-Xor"},
-        {"name": "Smi-Constant-And"},
-        {"name": "Smi-ShiftLeft"},
-        {"name": "Number-ShiftLeft"},
-        {"name": "Smi-ShiftRight"},
-        {"name": "Number-ShiftRight"},
-        {"name": "Smi-ShiftRightLogical"},
-        {"name": "Number-ShiftRightLogical"},
-        {"name": "Smi-Constant-ShiftLeft"},
-        {"name": "Smi-Constant-ShiftRight"},
-        {"name": "Smi-Constant-ShiftRightLogical"}
+        {
+          "name": "Compare",
+          "main": "run.js",
+          "resources": [ "compare.js" ],
+          "test_flags": [ "compare" ],
+          "results_regexp": "^%s\\-BytecodeHandler\\(Score\\): (.+)$",
+          "tests": [
+            {"name": "Smi-StrictEquals-True"},
+            {"name": "Smi-StrictEquals-False"},
+            {"name": "Number-StrictEquals-True"},
+            {"name": "Number-StrictEquals-False"},
+            {"name": "String-StrictEquals-True"},
+            {"name": "String-StrictEquals-False"},
+            {"name": "SmiString-StrictEquals"},
+            {"name": "Smi-Equals-True"},
+            {"name": "Smi-Equals-False"},
+            {"name": "Number-Equals-True"},
+            {"name": "Number-Equals-False"},
+            {"name": "String-Equals-True"},
+            {"name": "String-Equals-False"},
+            {"name": "ObjectNull-Equals"},
+            {"name": "SmiString-Equals"},
+            {"name": "Smi-RelationalCompare"},
+            {"name": "Number-RelationalCompare"},
+            {"name": "String-RelationalCompare"},
+            {"name": "SmiString-RelationalCompare"}
+          ]
+        },
+        {
+          "name": "StringConcat",
+          "main": "run.js",
+          "resources": [ "string-concat.js" ],
+          "test_flags": [ "string-concat" ],
+          "results_regexp": "^%s\\-BytecodeHandler\\(Score\\): (.+)$",
+          "tests": [
+            {"name": "ShortString-StringConcat-2"},
+            {"name": "ShortString-StringConcat-3"},
+            {"name": "ShortString-StringConcat-5"},
+            {"name": "ShortString-StringConcat-10"},
+            {"name": "LongString-StringConcat-2"},
+            {"name": "LongString-StringConcat-3"},
+            {"name": "LongString-StringConcat-5"},
+            {"name": "LongString-StringConcat-10"},
+            {"name": "NumberString-StringConcat-2"},
+            {"name": "NumberString-StringConcat-3"},
+            {"name": "NumberString-StringConcat-5"},
+            {"name": "NumberString-StringConcat-10"}
+          ]
+        },
+        {
+          "name": "Arithmetic",
+          "main": "run.js",
+          "resources": [ "arithmetic.js" ],
+          "test_flags": [ "arithmetic" ],
+          "results_regexp": "^%s\\-BytecodeHandler\\(Score\\): (.+)$",
+          "tests": [
+            {"name": "Smi-Add"},
+            {"name": "Number-Add"},
+            {"name": "Number-Oddball-Add"},
+            {"name": "String-Add"},
+            {"name": "Object-Add"},
+            {"name": "Number-String-Add"},
+            {"name": "Smi-Sub"},
+            {"name": "Number-Sub"},
+            {"name": "Number-Oddball-Sub"},
+            {"name": "Object-Sub"},
+            {"name": "Smi-Mul"},
+            {"name": "Number-Mul"},
+            {"name": "Number-Oddball-Mul"},
+            {"name": "Object-Mul"},
+            {"name": "Smi-Div"},
+            {"name": "Number-Div"},
+            {"name": "Number-Oddball-Div"},
+            {"name": "Object-Div"},
+            {"name": "Smi-Mod"},
+            {"name": "Number-Mod"},
+            {"name": "Number-Oddball-Mod"},
+            {"name": "Object-Mod"},
+            {"name": "Smi-Constant-Add"},
+            {"name": "Smi-Constant-Sub"},
+            {"name": "Smi-Constant-Mul"},
+            {"name": "Smi-Constant-Div"},
+            {"name": "Smi-Constant-Mod"},
+            {"name": "Smi-Increment"},
+            {"name": "Number-Increment"},
+            {"name": "Smi-Decrement"},
+            {"name": "Number-Decrement"}
+          ]
+        },
+        {
+          "name": "Bitwise",
+          "main": "run.js",
+          "resources": [ "bitwise.js" ],
+          "test_flags": [ "bitwise" ],
+          "results_regexp": "^%s\\-BytecodeHandler\\(Score\\): (.+)$",
+          "tests": [
+            {"name": "Smi-Or"},
+            {"name": "Number-Or"},
+            {"name": "Smi-Xor"},
+            {"name": "Number-Xor"},
+            {"name": "Smi-And"},
+            {"name": "Number-And"},
+            {"name": "Smi-Constant-Or"},
+            {"name": "Smi-Constant-Xor"},
+            {"name": "Smi-Constant-And"},
+            {"name": "Smi-ShiftLeft"},
+            {"name": "Number-ShiftLeft"},
+            {"name": "Smi-ShiftRight"},
+            {"name": "Number-ShiftRight"},
+            {"name": "Smi-ShiftRightLogical"},
+            {"name": "Number-ShiftRightLogical"},
+            {"name": "Smi-Constant-ShiftLeft"},
+            {"name": "Smi-Constant-ShiftRight"},
+            {"name": "Smi-Constant-ShiftRightLogical"}
+          ]
+        }
       ]
     }
   ]