Index: test/simdjs/harness-adapt.js |
diff --git a/test/mjsunit/regress/regress-crbug-150545.js b/test/simdjs/harness-adapt.js |
similarity index 67% |
copy from test/mjsunit/regress/regress-crbug-150545.js |
copy to test/simdjs/harness-adapt.js |
index cfee0618ecfea8d022903fee41acdffcbc9dda66..eb529bc124bdf83363b9e8d21f633dd9993cdf9d 100644 |
--- a/test/mjsunit/regress/regress-crbug-150545.js |
+++ b/test/simdjs/harness-adapt.js |
@@ -1,4 +1,4 @@ |
-// Copyright 2012 the V8 project authors. All rights reserved. |
+// Copyright 2015 the V8 project authors. All rights reserved. |
// Redistribution and use in source and binary forms, with or without |
// modification, are permitted provided that the following conditions are |
// met: |
@@ -25,28 +25,27 @@ |
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE |
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. |
-// Flags: --allow-natives-syntax |
- |
-// Test that we do not generate OSR entry points that have an arguments |
-// stack height different from zero. The OSR machinery cannot generate |
-// frames for that. |
- |
(function() { |
- "use strict"; |
bbudge
2015/05/19 08:36:01
"use strict"; ?
bradn
2015/05/19 09:37:53
Done.
|
- var instantReturn = false; |
- function inner() { |
- if (instantReturn) return; |
- assertSame(3, arguments.length); |
- assertSame(1, arguments[0]); |
- assertSame(2, arguments[1]); |
- assertSame(3, arguments[2]); |
- } |
+var _oldLoad = load; |
- function outer() { |
- inner(1,2,3); |
- for (var i = 0; i < 3; i++) %OptimizeOsr(); |
+// Filter load paths in the ecmascript_simd tests that |
+// assume the test is run with a current working directory |
+// set to the directory containing the test. |
+load = function(filename) { |
+ // TODO(bradnelson): Drop when run.js is fixed upstream. |
+ if (filename === 'averageFloat32x4Load.js' || |
+ filename === 'matrix-multiplication-load.js' || |
+ filename === 'aobench.js') { |
+ return; |
+ } |
+ // Decide if this is the compliance test or the benchmarks. |
+ if (filename === 'ecmascript_simd.js' || |
+ filename === 'ecmascript_simd_tests.js') { |
+ _oldLoad('test/simdjs/data/src/' + filename); |
+ } else { |
+ _oldLoad('test/simdjs/data/src/benchmarks/' + filename); |
Michael Achenbach
2015/05/19 07:17:48
Did you test that? Not sure if it'll work as the w
Michael Achenbach
2015/05/19 09:34:47
Just ignore this. I was confused. I assume when ru
bradn
2015/05/19 09:37:53
So the benchmarks or these tests run ok if you cha
|
} |
+}; |
- outer(); |
})(); |