Revert "Enable lto for performance testing"

4 files changed, 29 insertions, 66 deletions

diff --git a/tools/run_tests/generated/configs.json b/tools/run_tests/generated/configs.json
index d7e527ad76..9173bd7c19 100644
--- a/tools/run_tests/generated/configs.json
+++ b/tools/run_tests/generated/configs.json
@@ -3,26 +3,6 @@
     "config": "opt"
   }, 
   {
-    "config": "asan-trace-cmp", 
-    "environ": {
-      "ASAN_OPTIONS": "detect_leaks=1:color=always", 
-      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
-    }
-  }, 
-  {
-    "config": "dbg"
-  }, 
-  {
-    "config": "asan", 
-    "environ": {
-      "ASAN_OPTIONS": "detect_leaks=1:color=always", 
-      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
-    }
-  }, 
-  {
-    "config": "msan"
-  }, 
-  {
     "config": "basicprof"
   }, 
   {
@@ -39,16 +19,14 @@
     }
   }, 
   {
-    "config": "ubsan", 
+    "config": "asan-trace-cmp", 
     "environ": {
-      "UBSAN_OPTIONS": "halt_on_error=1:print_stacktrace=1"
+      "ASAN_OPTIONS": "detect_leaks=1:color=always", 
+      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
     }
   }, 
   {
-    "config": "tsan", 
-    "environ": {
-      "TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
-    }
+    "config": "dbg"
   }, 
   {
     "config": "stapprof"
@@ -65,7 +43,26 @@
     ]
   }, 
   {
-    "config": "lto"
+    "config": "asan", 
+    "environ": {
+      "ASAN_OPTIONS": "detect_leaks=1:color=always", 
+      "LSAN_OPTIONS": "suppressions=tools/lsan_suppressions.txt:report_objects=1"
+    }
+  }, 
+  {
+    "config": "tsan", 
+    "environ": {
+      "TSAN_OPTIONS": "suppressions=tools/tsan_suppressions.txt:halt_on_error=1:second_deadlock_stack=1"
+    }
+  }, 
+  {
+    "config": "ubsan", 
+    "environ": {
+      "UBSAN_OPTIONS": "halt_on_error=1:print_stacktrace=1"
+    }
+  }, 
+  {
+    "config": "msan"
   }, 
   {
     "config": "mutrace"
diff --git a/tools/run_tests/generated/tests.json b/tools/run_tests/generated/tests.json
index 4ae2355767..ab7938d0ca 100644
--- a/tools/run_tests/generated/tests.json
+++ b/tools/run_tests/generated/tests.json
@@ -40165,7 +40165,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40202,7 +40201,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40239,7 +40237,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40276,7 +40273,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40315,7 +40311,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40354,7 +40349,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40391,7 +40385,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40428,7 +40421,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40465,7 +40457,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40502,7 +40493,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40539,7 +40529,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40576,7 +40565,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40613,7 +40601,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40650,7 +40637,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40687,7 +40673,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40724,7 +40709,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40761,7 +40745,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40798,7 +40781,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40835,7 +40817,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40872,7 +40853,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40909,7 +40889,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40948,7 +40927,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -40987,7 +40965,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41024,7 +41001,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41061,7 +41037,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41098,7 +41073,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41135,7 +41109,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41172,7 +41145,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41209,7 +41181,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41246,7 +41217,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41283,7 +41253,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41320,7 +41289,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41357,7 +41325,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
@@ -41394,7 +41361,6 @@
       "dbg", 
       "gcov", 
       "helgrind", 
-      "lto", 
       "memcheck", 
       "msan", 
       "mutrace", 
diff --git a/tools/run_tests/run_microbenchmark.py b/tools/run_tests/run_microbenchmark.py
index 0c773ddd43..3a9461ecd3 100755
--- a/tools/run_tests/run_microbenchmark.py
+++ b/tools/run_tests/run_microbenchmark.py
@@ -178,7 +178,7 @@ def run_summary(bm_name, cfg, base_json_name):
 
 def collect_summary(bm_name, args):
   heading('Summary: %s [no counters]' % bm_name)
-  text(run_summary(bm_name, 'lto', 'out'))
+  text(run_summary(bm_name, 'opt', 'out'))
   heading('Summary: %s [with counters]' % bm_name)
   text(run_summary(bm_name, 'counters', 'out'))
   if args.bigquery_upload:
@@ -229,7 +229,7 @@ for bm_name in args.benchmarks:
     collectors[collect](bm_name, args)
 if args.diff_perf:
   for bm_name in args.benchmarks:
-    run_summary(bm_name, 'lto', '%s.new' % bm_name)
+    run_summary(bm_name, 'opt', '%s.new' % bm_name)
   where_am_i = subprocess.check_output(['git', 'rev-parse', '--abbrev-ref', 'HEAD']).strip()
   subprocess.check_call(['git', 'checkout', args.diff_perf])
   comparables = []
@@ -237,7 +237,7 @@ if args.diff_perf:
   try:
     for bm_name in args.benchmarks:
       try:
-        run_summary(bm_name, 'lto', '%s.old' % bm_name)
+        run_summary(bm_name, 'opt', '%s.old' % bm_name)
         comparables.append(bm_name)
       except subprocess.CalledProcessError, e:
         pass
diff --git a/tools/run_tests/run_performance_tests.py b/tools/run_tests/run_performance_tests.py
index f1ecdb5480..7c04d228ba 100755
--- a/tools/run_tests/run_performance_tests.py
+++ b/tools/run_tests/run_performance_tests.py
@@ -250,7 +250,7 @@ def build_on_remote_hosts(hosts, languages=scenario_config.LANGUAGES.keys(), bui
         jobset.JobSpec(
             cmdline=['tools/run_tests/performance/remote_host_build.sh'] + languages,
             shortname='remote_host_build.%s' % host,
-            environ = {'USER_AT_HOST': user_at_host, 'CONFIG': 'lto'},
+            environ = {'USER_AT_HOST': user_at_host, 'CONFIG': 'opt'},
             timeout_seconds=build_timeout))
   if build_local:
     # Build locally as well
@@ -258,7 +258,7 @@ def build_on_remote_hosts(hosts, languages=scenario_config.LANGUAGES.keys(), bui
         jobset.JobSpec(
             cmdline=['tools/run_tests/performance/build_performance.sh'] + languages,
             shortname='local_build',
-            environ = {'CONFIG': 'lto'},
+            environ = {'CONFIG': 'opt'},
             timeout_seconds=build_timeout))
   jobset.message('START', 'Building.', do_newline=True)
   num_failures, _ = jobset.run(