df966cd287
Reason for revert: [Sheriff] Breaks fuzzer and msan: http://build.chromium.org/p/client.v8/builders/V8%20Fuzzer/builds/4773 Repro with: tools/fuzz-harness.sh out/Debug/d8 (in a ninja Debug build) Msan: http://build.chromium.org/p/client.v8/builders/V8%20Linux%20-%20arm64%20-%20sim%20-%20MSAN/builds/4097 Original issue's description: > Speedup stringsearch for two byte strings > > Uses the lower byte with memchr which is > significantly faster than a naive compare > > Performance difference with bench (http://hastebin.com/xuxexataso.js): > > old new > > single character single character > Κ found at 922 Κ found at 922 > 3324 616 > ㎡ found at 13217 ㎡ found at 13217 > 42366 4931 > က found at 4096 က found at 4096 > 13369 9836 > found at 65280 found at 65280 > 207472 36149 > ᆬ found at 65445 ᆬ found at 65445 > 209344 36666 > found at 8197 found at 8197 > 26731 11757 > 倂 found at 20482 倂 found at 20482 > 66071 17193 > > linear search linear search > ΚΛ found at 922 ΚΛ found at 922 > 4112 504 > ㎡㎢ found at 13217 ㎡㎢ found at 13217 > 55105 5119 > ᆬᆭ found at 65445 ᆬᆭ found at 65445 > 268016 35496 > > linear + bmh search linear + bmh search > ΚΛΜΝΞΟΠΡ found at 922 ΚΛΜΝΞΟΠΡ found at 922 > 2897 522 > ᆬᆭᄃᄄᄅᆰᆱᆲ found at 65445 ᆬᆭᄃᄄᄅᆰᆱᆲ found at 65445 > 167687 158465 > > Committed: https://crrev.com/fced280f37588f8a232a414201276e053117e9ea > Cr-Commit-Position: refs/heads/master@{#30587} TBR=danno@chromium.org,mstarzinger@chromium.org,jkummerow@chromium.org,karl@skomski.com NOPRESUBMIT=true NOTREECHECKS=true NOTRY=true Review URL: https://codereview.chromium.org/1331433002 Cr-Commit-Position: refs/heads/master@{#30588}
126 lines
5.1 KiB
JavaScript
126 lines
5.1 KiB
JavaScript
// Copyright 2008 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:
|
|
//
|
|
// * Redistributions of source code must retain the above copyright
|
|
// notice, this list of conditions and the following disclaimer.
|
|
// * Redistributions in binary form must reproduce the above
|
|
// copyright notice, this list of conditions and the following
|
|
// disclaimer in the documentation and/or other materials provided
|
|
// with the distribution.
|
|
// * Neither the name of Google Inc. nor the names of its
|
|
// contributors may be used to endorse or promote products derived
|
|
// from this software without specific prior written permission.
|
|
//
|
|
// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
|
|
// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
|
|
// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
|
|
// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
|
|
// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
|
|
// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
|
|
// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
|
|
// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
|
|
// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
|
|
// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
|
|
// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
|
|
|
|
var s = "test test test";
|
|
|
|
assertEquals(0, s.indexOf("t"));
|
|
assertEquals(3, s.indexOf("t", 1));
|
|
assertEquals(5, s.indexOf("t", 4));
|
|
assertEquals(1, s.indexOf("e"));
|
|
assertEquals(2, s.indexOf("s"));
|
|
|
|
assertEquals(5, s.indexOf("test", 4));
|
|
assertEquals(5, s.indexOf("test", 5));
|
|
assertEquals(10, s.indexOf("test", 6));
|
|
assertEquals(0, s.indexOf("test", 0));
|
|
assertEquals(0, s.indexOf("test", -1));
|
|
assertEquals(0, s.indexOf("test"));
|
|
assertEquals(-1, s.indexOf("notpresent"));
|
|
assertEquals(-1, s.indexOf());
|
|
|
|
for (var i = 0; i < s.length+10; i++) {
|
|
var expected = i < s.length ? i : s.length;
|
|
assertEquals(expected, s.indexOf("", i));
|
|
}
|
|
|
|
var reString = "asdf[a-z]+(asdf)?";
|
|
|
|
assertEquals(4, reString.indexOf("[a-z]+"));
|
|
assertEquals(10, reString.indexOf("(asdf)?"));
|
|
|
|
assertEquals(1, String.prototype.indexOf.length);
|
|
|
|
// Random greek letters
|
|
var twoByteString = "\u039a\u0391\u03a3\u03a3\u0395";
|
|
|
|
// Test single char pattern
|
|
assertEquals(0, twoByteString.indexOf("\u039a"), "Lamda");
|
|
assertEquals(1, twoByteString.indexOf("\u0391"), "Alpha");
|
|
assertEquals(2, twoByteString.indexOf("\u03a3"), "First Sigma");
|
|
assertEquals(3, twoByteString.indexOf("\u03a3",3), "Second Sigma");
|
|
assertEquals(4, twoByteString.indexOf("\u0395"), "Epsilon");
|
|
assertEquals(-1, twoByteString.indexOf("\u0392"), "Not beta");
|
|
|
|
// Test multi-char pattern
|
|
assertEquals(0, twoByteString.indexOf("\u039a\u0391"), "lambda Alpha");
|
|
assertEquals(1, twoByteString.indexOf("\u0391\u03a3"), "Alpha Sigma");
|
|
assertEquals(2, twoByteString.indexOf("\u03a3\u03a3"), "Sigma Sigma");
|
|
assertEquals(3, twoByteString.indexOf("\u03a3\u0395"), "Sigma Epsilon");
|
|
|
|
assertEquals(-1, twoByteString.indexOf("\u0391\u03a3\u0395"),
|
|
"Not Alpha Sigma Epsilon");
|
|
|
|
//single char pattern
|
|
assertEquals(4, twoByteString.indexOf("\u0395"));
|
|
|
|
// Test complex string indexOf algorithms. Only trigger for long strings.
|
|
|
|
// Long string that isn't a simple repeat of a shorter string.
|
|
var long = "A";
|
|
for(var i = 66; i < 76; i++) { // from 'B' to 'K'
|
|
long = long + String.fromCharCode(i) + long;
|
|
}
|
|
|
|
// pattern of 15 chars, repeated every 16 chars in long
|
|
var pattern = "ABACABADABACABA";
|
|
for(var i = 0; i < long.length - pattern.length; i+= 7) {
|
|
var index = long.indexOf(pattern, i);
|
|
assertEquals((i + 15) & ~0xf, index, "Long ABACABA...-string at index " + i);
|
|
}
|
|
assertEquals(510, long.indexOf("AJABACA"), "Long AJABACA, First J");
|
|
assertEquals(1534, long.indexOf("AJABACA", 511), "Long AJABACA, Second J");
|
|
|
|
pattern = "JABACABADABACABA";
|
|
assertEquals(511, long.indexOf(pattern), "Long JABACABA..., First J");
|
|
assertEquals(1535, long.indexOf(pattern, 512), "Long JABACABA..., Second J");
|
|
|
|
|
|
// Search for a non-ASCII string in a pure ASCII string.
|
|
var asciiString = "arglebargleglopglyfarglebargleglopglyfarglebargleglopglyf";
|
|
assertEquals(-1, asciiString.indexOf("\x2061"));
|
|
|
|
|
|
// Search in string containing many non-ASCII chars.
|
|
var allCodePoints = [];
|
|
for (var i = 0; i < 65536; i++) allCodePoints[i] = i;
|
|
var allCharsString = String.fromCharCode.apply(String, allCodePoints);
|
|
// Search for string long enough to trigger complex search with ASCII pattern
|
|
// and UC16 subject.
|
|
assertEquals(-1, allCharsString.indexOf("notfound"));
|
|
|
|
// Find substrings.
|
|
var lengths = [1, 4, 15]; // Single char, simple and complex.
|
|
var indices = [0x5, 0x65, 0x85, 0x105, 0x205, 0x285, 0x2005, 0x2085, 0xfff0];
|
|
for (var lengthIndex = 0; lengthIndex < lengths.length; lengthIndex++) {
|
|
var length = lengths[lengthIndex];
|
|
for (var i = 0; i < indices.length; i++) {
|
|
var index = indices[i];
|
|
var pattern = allCharsString.substring(index, index + length);
|
|
assertEquals(index, allCharsString.indexOf(pattern));
|
|
}
|
|
}
|