Merge pull request #11444 from ncteisen/quiet-down

Only Output bm_diff Crashes if They Occur

tools/profiling/microbenchmarks/bm_diff/bm_diff.py

@@ -185,9 +185,14 @@ def diff(bms, loops, track, old, new):
   for name in sorted(benchmarks.keys()):
     if benchmarks[name].skip(): continue
     rows.append([name] + benchmarks[name].row(fields))
-  note = 'Corrupt JSON data (indicates timeout or crash) = %s' % str(
+  note = None
-    badjson_files)
+  if len(badjson_files):
-  note += '\n\nMissing files (new benchmark) = %s' % str(nonexistant_files)
+    note = 'Corrupt JSON data (indicates timeout or crash) = %s' % str(badjson_files)
+  if len(nonexistant_files):
+    if note:
+      note += '\n\nMissing files (indicates new benchmark) = %s' % str(nonexistant_files)
+    else:
+      note = '\n\nMissing files (indicates new benchmark) = %s' % str(nonexistant_files)
   if rows:
     return tabulate.tabulate(rows, headers=headers, floatfmt='+.2f'), note
   else:

tools/profiling/microbenchmarks/bm_diff/bm_main.py

@@ -126,8 +126,10 @@ def main(args):
     text = 'Performance differences noted:\n' + diff
   else:
     text = 'No significant performance differences'
-  print('%s\n%s' % (note, text))
+  if note:
-  comment_on_pr.comment_on_pr('```\n%s\n\n%s\n```' % (note, text))
+    text = note + '\n\n' + text
+  print('%s' % text)
+  comment_on_pr.comment_on_pr('```\n%s\n```' % text)
 
 
 if __name__ == '__main__':