Adaptations to run v8-bench.js in qmlbench

We need to prevent writes to global properties. We also stub out the
BenchmarkSuite running stuff, as we will be doing that ourselves.

Change-Id: I647556f3d7a4e044db68754ce1f0eb0e35874536
Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>

2 files changed, 84 insertions, 13 deletions

diff --git a/src/3rdparty/0001-Adaptations-to-run-v8-bench.js-in-qmlbench.patch b/src/3rdparty/0001-Adaptations-to-run-v8-bench.js-in-qmlbench.patch
new file mode 100644
index 0000000..c32a2e3
--- /dev/null
+++ b/src/3rdparty/0001-Adaptations-to-run-v8-bench.js-in-qmlbench.patch
@@ -0,0 +1,71 @@
+From fcfc0c166bbb410ebf59bcb28238450c24ece5a2 Mon Sep 17 00:00:00 2001
+From: Robin Burchell <robin.burchell@crimson.no>
+Date: Thu, 4 May 2017 21:07:10 +0200
+Subject: [PATCH] Adaptations to run v8-bench.js in qmlbench
+
+We need to prevent writes to global properties. We also stub out the
+BenchmarkSuite running stuff, as we will be doing that ourselves.
+
+Change-Id: I647556f3d7a4e044db68754ce1f0eb0e35874536
+---
+ src/3rdparty/v8-bench.js | 26 +++++++++++++-------------
+ 1 file changed, 13 insertions(+), 13 deletions(-)
+
+diff --git a/src/3rdparty/v8-bench.js b/src/3rdparty/v8-bench.js
+index 41a04fa..406c3cc 100644
+--- a/src/3rdparty/v8-bench.js
++++ b/src/3rdparty/v8-bench.js
+@@ -1850,7 +1850,7 @@ function am4(i,x,w,j,c,n) {
+ // IE7 does 9% better with am3/28 than with am4/26.
+ // Firefox (SM) gets 10% faster with am3/28 than with am4/26.
+ 
+-setupEngine = function(fn, bits) {
++function setupEngine(fn, bits) {
+   BigInteger.prototype.am = fn;
+   dbits = bits;
+ 
+@@ -3371,14 +3371,14 @@ RSAKey.prototype.decrypt = RSADecrypt;
+ //RSAKey.prototype.b64_decrypt = RSAB64Decrypt;
+ 
+ 
+-nValue="a5261939975948bb7a58dffe5ff54e65f0498f9175f5a09288810b8975871e99af3b5dd94057b0fc07535f5f97444504fa35169d461d0d30cf0192e307727c065168c788771c561a9400fb49175e9e6aa4e23fe11af69e9412dd23b0cb6684c4c2429bce139e848ab26d0829073351f4acd36074eafd036a5eb83359d2a698d3";
+-eValue="10001";
+-dValue="8e9912f6d3645894e8d38cb58c0db81ff516cf4c7e5a14c7f1eddb1459d2cded4d8d293fc97aee6aefb861859c8b6a3d1dfe710463e1f9ddc72048c09751971c4a580aa51eb523357a3cc48d31cfad1d4a165066ed92d4748fb6571211da5cb14bc11b6e2df7c1a559e6d5ac1cd5c94703a22891464fba23d0d965086277a161";
+-pValue="d090ce58a92c75233a6486cb0a9209bf3583b64f540c76f5294bb97d285eed33aec220bde14b2417951178ac152ceab6da7090905b478195498b352048f15e7d";
+-qValue="cab575dc652bb66df15a0359609d51d1db184750c00c6698b90ef3465c99655103edbf0d54c56aec0ce3c4d22592338092a126a0cc49f65a4a30d222b411e58f";
+-dmp1Value="1a24bca8e273df2f0e47c199bbf678604e7df7215480c77c8db39f49b000ce2cf7500038acfff5433b7d582a01f1826e6f4d42e1c57f5e1fef7b12aabc59fd25";
+-dmq1Value="3d06982efbbe47339e1f6d36b1216b8a741d410b0c662f54f7118b27b9a4ec9d914337eb39841d8666f3034408cf94f5b62f11c402fc994fe15a05493150d9fd";
+-coeffValue="3a3e731acd8960b7ff9eb81a7ff93bd1cfa74cbd56987db58b4594fb09c09084db1734c8143f98b602b981aaa9243ca28deb69b5b280ee8dcee0fd2625e53250";
++var nValue="a5261939975948bb7a58dffe5ff54e65f0498f9175f5a09288810b8975871e99af3b5dd94057b0fc07535f5f97444504fa35169d461d0d30cf0192e307727c065168c788771c561a9400fb49175e9e6aa4e23fe11af69e9412dd23b0cb6684c4c2429bce139e848ab26d0829073351f4acd36074eafd036a5eb83359d2a698d3";
++var eValue="10001";
++var dValue="8e9912f6d3645894e8d38cb58c0db81ff516cf4c7e5a14c7f1eddb1459d2cded4d8d293fc97aee6aefb861859c8b6a3d1dfe710463e1f9ddc72048c09751971c4a580aa51eb523357a3cc48d31cfad1d4a165066ed92d4748fb6571211da5cb14bc11b6e2df7c1a559e6d5ac1cd5c94703a22891464fba23d0d965086277a161";
++var pValue="d090ce58a92c75233a6486cb0a9209bf3583b64f540c76f5294bb97d285eed33aec220bde14b2417951178ac152ceab6da7090905b478195498b352048f15e7d";
++var qValue="cab575dc652bb66df15a0359609d51d1db184750c00c6698b90ef3465c99655103edbf0d54c56aec0ce3c4d22592338092a126a0cc49f65a4a30d222b411e58f";
++var dmp1Value="1a24bca8e273df2f0e47c199bbf678604e7df7215480c77c8db39f49b000ce2cf7500038acfff5433b7d582a01f1826e6f4d42e1c57f5e1fef7b12aabc59fd25";
++var dmq1Value="3d06982efbbe47339e1f6d36b1216b8a741d410b0c662f54f7118b27b9a4ec9d914337eb39841d8666f3034408cf94f5b62f11c402fc994fe15a05493150d9fd";
++var coeffValue="3a3e731acd8960b7ff9eb81a7ff93bd1cfa74cbd56987db58b4594fb09c09084db1734c8143f98b602b981aaa9243ca28deb69b5b280ee8dcee0fd2625e53250";
+ 
+ setupEngine(am3, 28);
+ 
+@@ -8984,7 +8984,7 @@ SC_ERROR_OUT = SC_DEFAULT_OUT;
+ 
+ function RunBenchmark(name, count, run, warn) {
+   for (var n = 0; n < count; ++n) {
+-    result = run();
++    var result = run();
+     if (!warn(result)) {
+       throw new Error("Earley or Boyer did incorrect number of rewrites");
+     }
+@@ -11586,6 +11586,6 @@ function PrintScore(score) {
+ }
+ 
+ 
+-BenchmarkSuite.RunSuites({ NotifyResult: PrintResult,
+-                           NotifyError: PrintError,
+-                           NotifyScore: PrintScore });
++//BenchmarkSuite.RunSuites({ NotifyResult: PrintResult,
++//                           NotifyError: PrintError,
++//                           NotifyScore: PrintScore });
+-- 
+2.11.0
+
diff --git a/src/3rdparty/v8-bench.js b/src/3rdparty/v8-bench.js
index 41a04fa..406c3cc 100644
--- a/src/3rdparty/v8-bench.js
+++ b/src/3rdparty/v8-bench.js
@@ -1850,7 +1850,7 @@ function am4(i,x,w,j,c,n) {
 // IE7 does 9% better with am3/28 than with am4/26.
 // Firefox (SM) gets 10% faster with am3/28 than with am4/26.
 
-setupEngine = function(fn, bits) {
+function setupEngine(fn, bits) {
   BigInteger.prototype.am = fn;
   dbits = bits;
 
@@ -3371,14 +3371,14 @@ RSAKey.prototype.decrypt = RSADecrypt;
 //RSAKey.prototype.b64_decrypt = RSAB64Decrypt;
 
 
-nValue="a5261939975948bb7a58dffe5ff54e65f0498f9175f5a09288810b8975871e99af3b5dd94057b0fc07535f5f97444504fa35169d461d0d30cf0192e307727c065168c788771c561a9400fb49175e9e6aa4e23fe11af69e9412dd23b0cb6684c4c2429bce139e848ab26d0829073351f4acd36074eafd036a5eb83359d2a698d3";
-eValue="10001";
-dValue="8e9912f6d3645894e8d38cb58c0db81ff516cf4c7e5a14c7f1eddb1459d2cded4d8d293fc97aee6aefb861859c8b6a3d1dfe710463e1f9ddc72048c09751971c4a580aa51eb523357a3cc48d31cfad1d4a165066ed92d4748fb6571211da5cb14bc11b6e2df7c1a559e6d5ac1cd5c94703a22891464fba23d0d965086277a161";
-pValue="d090ce58a92c75233a6486cb0a9209bf3583b64f540c76f5294bb97d285eed33aec220bde14b2417951178ac152ceab6da7090905b478195498b352048f15e7d";
-qValue="cab575dc652bb66df15a0359609d51d1db184750c00c6698b90ef3465c99655103edbf0d54c56aec0ce3c4d22592338092a126a0cc49f65a4a30d222b411e58f";
-dmp1Value="1a24bca8e273df2f0e47c199bbf678604e7df7215480c77c8db39f49b000ce2cf7500038acfff5433b7d582a01f1826e6f4d42e1c57f5e1fef7b12aabc59fd25";
-dmq1Value="3d06982efbbe47339e1f6d36b1216b8a741d410b0c662f54f7118b27b9a4ec9d914337eb39841d8666f3034408cf94f5b62f11c402fc994fe15a05493150d9fd";
-coeffValue="3a3e731acd8960b7ff9eb81a7ff93bd1cfa74cbd56987db58b4594fb09c09084db1734c8143f98b602b981aaa9243ca28deb69b5b280ee8dcee0fd2625e53250";
+var nValue="a5261939975948bb7a58dffe5ff54e65f0498f9175f5a09288810b8975871e99af3b5dd94057b0fc07535f5f97444504fa35169d461d0d30cf0192e307727c065168c788771c561a9400fb49175e9e6aa4e23fe11af69e9412dd23b0cb6684c4c2429bce139e848ab26d0829073351f4acd36074eafd036a5eb83359d2a698d3";
+var eValue="10001";
+var dValue="8e9912f6d3645894e8d38cb58c0db81ff516cf4c7e5a14c7f1eddb1459d2cded4d8d293fc97aee6aefb861859c8b6a3d1dfe710463e1f9ddc72048c09751971c4a580aa51eb523357a3cc48d31cfad1d4a165066ed92d4748fb6571211da5cb14bc11b6e2df7c1a559e6d5ac1cd5c94703a22891464fba23d0d965086277a161";
+var pValue="d090ce58a92c75233a6486cb0a9209bf3583b64f540c76f5294bb97d285eed33aec220bde14b2417951178ac152ceab6da7090905b478195498b352048f15e7d";
+var qValue="cab575dc652bb66df15a0359609d51d1db184750c00c6698b90ef3465c99655103edbf0d54c56aec0ce3c4d22592338092a126a0cc49f65a4a30d222b411e58f";
+var dmp1Value="1a24bca8e273df2f0e47c199bbf678604e7df7215480c77c8db39f49b000ce2cf7500038acfff5433b7d582a01f1826e6f4d42e1c57f5e1fef7b12aabc59fd25";
+var dmq1Value="3d06982efbbe47339e1f6d36b1216b8a741d410b0c662f54f7118b27b9a4ec9d914337eb39841d8666f3034408cf94f5b62f11c402fc994fe15a05493150d9fd";
+var coeffValue="3a3e731acd8960b7ff9eb81a7ff93bd1cfa74cbd56987db58b4594fb09c09084db1734c8143f98b602b981aaa9243ca28deb69b5b280ee8dcee0fd2625e53250";
 
 setupEngine(am3, 28);
 
@@ -8984,7 +8984,7 @@ SC_ERROR_OUT = SC_DEFAULT_OUT;
 
 function RunBenchmark(name, count, run, warn) {
   for (var n = 0; n < count; ++n) {
-    result = run();
+    var result = run();
     if (!warn(result)) {
       throw new Error("Earley or Boyer did incorrect number of rewrites");
     }
@@ -11586,6 +11586,6 @@ function PrintScore(score) {
 }
 
 
-BenchmarkSuite.RunSuites({ NotifyResult: PrintResult,
-                           NotifyError: PrintError,
-                           NotifyScore: PrintScore });
+//BenchmarkSuite.RunSuites({ NotifyResult: PrintResult,
+//                           NotifyError: PrintError,
+//                           NotifyScore: PrintScore });