[test] Remove --deopt-stress from d8

mi-ac · Commit Bot · commit f99be4f42dc6 · 2019-11-05T14:09:20.000Z
The deopt-stress mode is unused. This prepares for deprecating corresponding api methods. The same kind of testing can be done by using --stress-opt and setting --deopt-every-n-times. Bug: v8:9941 Change-Id: I6796fcfa43d0efad51ec9d9a9adc949c26805a81 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/1899617 Reviewed-by: Jakob Gruber <jgruber@chromium.org> Reviewed-by: Ulan Degenbaev <ulan@chromium.org> Reviewed-by: Clemens Backes <clemensb@chromium.org> Commit-Queue: Michael Achenbach <machenbach@chromium.org> Cr-Commit-Position: refs/heads/master@{#64772}
diff --git a/src/api/api.cc b/src/api/api.cc
@@ -10604,13 +10604,6 @@ void Testing::PrepareStressRun(int run) {
       "--noalways-opt";
   static const char* kForcedOptimizations = "--always-opt";
 
-  // In deopt-stress mode turn on frequent deoptimization. If no value
-  // is specified through --deopt-every-n-times use a default value.
-  static const char* kDeoptEvery13Times = "--deopt-every-n-times=13";
-  if (internal::Testing::stress_type() == Testing::kStressTypeDeopt &&
-      internal::FLAG_deopt_every_n_times == 0) {
-    V8::SetFlagsFromString(kDeoptEvery13Times);
-  }
   if (run == GetStressRuns() - 1) {
     V8::SetFlagsFromString(kForcedOptimizations);
   } else {
diff --git a/src/d8/d8.cc b/src/d8/d8.cc
@@ -2924,9 +2924,6 @@ bool Shell::SetOptions(int argc, char* argv[]) {
                strcmp(argv[i], "--no-stress-opt") == 0) {
       options.stress_opt = false;
       argv[i] = nullptr;
-    } else if (strcmp(argv[i], "--stress-deopt") == 0) {
-      options.stress_deopt = true;
-      argv[i] = nullptr;
     } else if (strcmp(argv[i], "--stress-background-compile") == 0) {
       options.stress_background_compile = true;
       argv[i] = nullptr;
@@ -2938,7 +2935,6 @@ bool Shell::SetOptions(int argc, char* argv[]) {
                strcmp(argv[i], "--no-always-opt") == 0) {
       // No support for stressing if we can't use --always-opt.
       options.stress_opt = false;
-      options.stress_deopt = false;
     } else if (strcmp(argv[i], "--logfile-per-isolate") == 0) {
       logfile_per_isolate = true;
       argv[i] = nullptr;
@@ -3644,9 +3640,8 @@ int Shell::Main(int argc, char* argv[]) {
       tracing_controller->StartTracing(trace_config);
     }
 
-    if (options.stress_opt || options.stress_deopt) {
-      Testing::SetStressRunType(options.stress_opt ? Testing::kStressTypeOpt
-                                                   : Testing::kStressTypeDeopt);
+    if (options.stress_opt) {
+      Testing::SetStressRunType(Testing::kStressTypeOpt);
       options.stress_runs = Testing::GetStressRuns();
       for (int i = 0; i < options.stress_runs && result == 0; i++) {
         printf("============ Stress %d/%d ============\n", i + 1,
diff --git a/src/d8/d8.h b/src/d8/d8.h
@@ -268,7 +268,6 @@ class ShellOptions {
   bool omit_quit = false;
   bool wait_for_wasm = true;
   bool stress_opt = false;
-  bool stress_deopt = false;
   int stress_runs = 1;
   bool interactive_shell = false;
   bool test_shell = false;
