mirror of
https://github.com/dart-lang/sdk
synced 2024-09-16 02:47:36 +00:00
[vm/fuzzer] Several tweaks to reduce timeouts
Rationale: Disable non-flat types, reduce number of iterations, decrease limit for emitsmallpositiveint. [vm/fuzzer] Disable *= in loops for string types Change-Id: I9b406a1e3d34fce0cec65083aa7b24dfc80967cc Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/119980 Reviewed-by: Aart Bik <ajcbik@google.com> Commit-Queue: Felicitas Hetzelt <felih@google.com>
This commit is contained in:
parent
27cd15585b
commit
7a7dcd1ed9
|
@ -14,11 +14,12 @@ import 'dartfuzz_type_table.dart';
|
|||
// Version of DartFuzz. Increase this each time changes are made
|
||||
// to preserve the property that a given version of DartFuzz yields
|
||||
// the same fuzzed program for a deterministic random seed.
|
||||
const String version = '1.57';
|
||||
const String version = '1.58';
|
||||
|
||||
// Restriction on statements and expressions.
|
||||
const int stmtDepth = 1;
|
||||
const int exprDepth = 2;
|
||||
const int nestDepth = 1;
|
||||
const int numStatements = 2;
|
||||
const int numGlobalVars = 4;
|
||||
const int numLocalVars = 4;
|
||||
|
@ -622,18 +623,24 @@ class DartFuzz {
|
|||
bool emitAssign() {
|
||||
// Select a type at random.
|
||||
final tp = oneOfSet(dartType.allTypes);
|
||||
String assignOp;
|
||||
if (DartType.isGrowableType(tp)) {
|
||||
// Assignments like *= and += on growable types (String, List, ...)
|
||||
// may lead to OOM, especially within loops.
|
||||
// TODO: Implement a more specific heuristic that selectively allows
|
||||
// modifying assignment operators (like += *=) for growable types.
|
||||
assignOp = '=';
|
||||
} else {
|
||||
// Select one of the assign operations for the given type.
|
||||
final assignOp = oneOfSet(dartType.assignOps(tp));
|
||||
assignOp = oneOfSet(dartType.assignOps(tp));
|
||||
if (assignOp == null) {
|
||||
throw 'No assign operation for ${tp.name}';
|
||||
}
|
||||
}
|
||||
emitLn('', newline: false);
|
||||
// Emit a variable of the lhs type.
|
||||
final emittedVar = emitVar(0, tp, isLhs: true);
|
||||
RhsFilter rhsFilter = RhsFilter.fromDartType(tp, emittedVar);
|
||||
if ({'*=', '+='}.contains(assignOp)) {
|
||||
rhsFilter?.consume();
|
||||
}
|
||||
emit(" $assignOp ");
|
||||
// Select one of the possible rhs types for the given lhs type and assign
|
||||
// operation.
|
||||
|
@ -642,13 +649,7 @@ class DartFuzz {
|
|||
throw 'No rhs type for assign ${tp.name} $assignOp';
|
||||
}
|
||||
|
||||
// We need to avoid cases of "abcde" *= large number in loops.
|
||||
if (assignOp == "*=" && tp == DartType.STRING && rhsType == DartType.INT) {
|
||||
emitSmallPositiveInt();
|
||||
} else {
|
||||
// Emit an expression for the right hand side.
|
||||
emitExpr(0, rhsType, rhsFilter: rhsFilter);
|
||||
}
|
||||
emit(';', newline: true);
|
||||
return true;
|
||||
}
|
||||
|
@ -714,6 +715,10 @@ class DartFuzz {
|
|||
|
||||
// Emit a simple increasing for-loop.
|
||||
bool emitFor(int depth) {
|
||||
// Make deep nesting of loops increasingly unlikely.
|
||||
if (rand.nextInt(nest + 1) > nestDepth) {
|
||||
return emitAssign();
|
||||
}
|
||||
final int i = localVars.length;
|
||||
emitLn('for (int $localName$i = 0; $localName$i < ', newline: false);
|
||||
emitSmallPositiveInt();
|
||||
|
@ -733,6 +738,10 @@ class DartFuzz {
|
|||
|
||||
// Emit a simple membership for-in-loop.
|
||||
bool emitForIn(int depth) {
|
||||
// Make deep nesting of loops increasingly unlikely.
|
||||
if (rand.nextInt(nest + 1) > nestDepth) {
|
||||
return emitAssign();
|
||||
}
|
||||
final int i = localVars.length;
|
||||
// Select one iterable type to be used in 'for in' statement.
|
||||
final iterType = oneOfSet(dartType.iterableTypes1);
|
||||
|
@ -759,6 +768,10 @@ class DartFuzz {
|
|||
|
||||
// Emit a simple membership forEach loop.
|
||||
bool emitForEach(int depth) {
|
||||
// Make deep nesting of loops increasingly unlikely.
|
||||
if (rand.nextInt(nest + 1) > nestDepth) {
|
||||
return emitAssign();
|
||||
}
|
||||
final int i = localVars.length;
|
||||
final int j = i + 1;
|
||||
emitLn("", newline: false);
|
||||
|
@ -786,6 +799,10 @@ class DartFuzz {
|
|||
|
||||
// Emit a while-loop.
|
||||
bool emitWhile(int depth) {
|
||||
// Make deep nesting of loops increasingly unlikely.
|
||||
if (rand.nextInt(nest + 1) > nestDepth) {
|
||||
return emitAssign();
|
||||
}
|
||||
final int i = localVars.length;
|
||||
emitLn('{ int $localName$i = ', newline: false);
|
||||
emitSmallPositiveInt();
|
||||
|
@ -809,6 +826,10 @@ class DartFuzz {
|
|||
|
||||
// Emit a do-while-loop.
|
||||
bool emitDoWhile(int depth) {
|
||||
// Make deep nesting of loops increasingly unlikely.
|
||||
if (rand.nextInt(nest + 1) > nestDepth) {
|
||||
return emitAssign();
|
||||
}
|
||||
final int i = localVars.length;
|
||||
emitLn('{ int $localName$i = 0;');
|
||||
indent += 2;
|
||||
|
@ -983,7 +1004,7 @@ class DartFuzz {
|
|||
emit(rand.nextInt(2) == 0 ? 'true' : 'false');
|
||||
}
|
||||
|
||||
void emitSmallPositiveInt({int limit = 100}) {
|
||||
void emitSmallPositiveInt({int limit = 50}) {
|
||||
emit('${rand.nextInt(limit)}');
|
||||
}
|
||||
|
||||
|
|
|
@ -345,7 +345,10 @@ class DartFuzzTest {
|
|||
fp = samePrecision(mode1, mode2);
|
||||
// Occasionally test FFI.
|
||||
ffi = ffiCapable(mode1, mode2) && (rand.nextInt(5) == 0);
|
||||
flatTp = !nestedTypesAllowed(mode1, mode2) || (rand.nextInt(5) == 0);
|
||||
// TODO (https://github.com/dart-lang/sdk/issues/38710):
|
||||
// re-enable non-flat types once hash issue is fixed.
|
||||
// flatTp = !nestedTypesAllowed(mode1, mode2) || (rand.nextInt(5) == 0);
|
||||
flatTp = true;
|
||||
runner1 =
|
||||
TestRunner.getTestRunner(mode1, top, tmpDir.path, env, fileName, rand);
|
||||
runner2 =
|
||||
|
|
Loading…
Reference in a new issue