[test] Fix simdjs perf tests.

- Missing resource on android
- Higher timeout on arm
- Fewer runs on arm
- Drop total

BUG=v8:4124
LOG=N
NOTRY=true
TBR=bradnelson@chromium.org

Review URL: https://codereview.chromium.org/1149723002

Cr-Commit-Position: refs/heads/master@{#28528}

diff --git a/test/simdjs/SimdJs.json b/test/simdjs/SimdJs.json
index e6686b90a0f241a839628c79c2bed0b02700b15e..62f53666002ef60c44ca61ea7299302263ea24b4 100644 (file)
--- a/test/simdjs/SimdJs.json
+++ b/test/simdjs/SimdJs.json
@@ -10,6 +10,8 @@
   "resources": [
     "test/simdjs/data/src/benchmarks/base.js",
     "test/simdjs/data/src/ecmascript_simd.js",
+    "test/simdjs/harness-adapt.js",
+    "test/simdjs/harness-finish.js",
     "test/simdjs/data/src/benchmarks/kernel-template.js",
     "test/simdjs/data/src/benchmarks/averageFloat32x4.js",
     "test/simdjs/data/src/benchmarks/averageFloat32x4LoadFromInt8Array.js",
@@ -29,6 +31,9 @@
     "test/simdjs/data/src/benchmarks/memcpy.js"
   ],
   "run_count": 5,
+  "run_count_android_arm": 3,
+  "run_count_android_arm64": 3,
+  "run_count_arm": 3,
   "tests": [
     {
       "flags": [
@@ -439,6 +444,8 @@
       ]
     }
   ],
-  "total": true,
+  "timeout_android_arm": 120,
+  "timeout_android_arm64": 120,
+  "timeout_arm": 120,
   "units": "ms"
 }
\ No newline at end of file

diff --git a/test/simdjs/generate.py b/test/simdjs/generate.py
index 9dc41cff57016e3b8182dd63828c1c606129c9e0..f2e55d98507f773fb0c8762537bffca9b7d1eb26 100755 (executable)
--- a/test/simdjs/generate.py
+++ b/test/simdjs/generate.py
@@ -28,11 +28,18 @@ tests = [t for t in tests if t not in SKIP_FILES]
 output = {
   'name': 'SIMDJS',
   'run_count': 5,
+  'run_count_arm': 3,
+  'run_count_android_arm': 3,
+  'run_count_android_arm64': 3,
+  'timeout_arm': 120,
+  'timeout_android_arm': 120,
+  'timeout_android_arm64': 120,
   'units': 'ms',
-  'total': True,
   'resources': [
     'test/simdjs/data/src/benchmarks/base.js',
-    'test/simdjs/data/src/ecmascript_simd.js'
+    'test/simdjs/data/src/ecmascript_simd.js',
+    'test/simdjs/harness-adapt.js',
+    'test/simdjs/harness-finish.js'
   ] + ['test/simdjs/data/src/benchmarks/%s.js' % t for t in tests],
   'flags': ['--harmony-object', 'test/simdjs/harness-adapt.js'],
   'path': ['../../'],
@@ -52,5 +59,5 @@ output = {
   for test in tests],
 }
 
-with open(os.path.join(SCRIPT_DIR, 'SimdJS.json'), 'w') as fh:
+with open(os.path.join(SCRIPT_DIR, 'SimdJs.json'), 'w') as fh:
   fh.write(json.dumps(output, separators=(',',': '), indent=2, sort_keys=True))