From beda859a15ae064c5ace8c230709fdf79dc7a602 Mon Sep 17 00:00:00 2001 From: Jessica Paquette Date: Wed, 27 Mar 2019 18:14:32 +0000 Subject: [PATCH] [opt-viewer] Make filter_=None by default in get_remarks and gather_results Right now, if you try to use optdiff.py on any opt records, it will fail because its calls to gather_results weren't updated to support filtering. Since filters are supposed to be optional, this makes them None by default in get_remarks and in gather_results. This allows other tools that don't support filtering to still use the functions as is. Differential Revision: https://reviews.llvm.org/D59894 llvm-svn: 357106 --- llvm/tools/opt-viewer/optrecord.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/llvm/tools/opt-viewer/optrecord.py b/llvm/tools/opt-viewer/optrecord.py index e952d1be..81d6da9 100644 --- a/llvm/tools/opt-viewer/optrecord.py +++ b/llvm/tools/opt-viewer/optrecord.py @@ -265,7 +265,7 @@ class Missed(Remark): return "red" -def get_remarks(input_file, filter_): +def get_remarks(input_file, filter_=None): max_hotness = 0 all_remarks = dict() file_remarks = defaultdict(functools.partial(defaultdict, list)) @@ -273,14 +273,16 @@ def get_remarks(input_file, filter_): with open(input_file) as f: docs = yaml.load_all(f, Loader=Loader) - filter_e = re.compile(filter_) + filter_e = None + if filter_: + filter_e = re.compile(filter_) for remark in docs: remark.canonicalize() # Avoid remarks withoug debug location or if they are duplicated if not hasattr(remark, 'DebugLoc') or remark.key in all_remarks: continue - if filter_ and not filter_e.search(remark.Pass): + if filter_e and not filter_e.search(remark.Pass): continue all_remarks[remark.key] = remark @@ -297,7 +299,7 @@ def get_remarks(input_file, filter_): return max_hotness, all_remarks, file_remarks -def gather_results(filenames, num_jobs, should_print_progress, filter_): +def gather_results(filenames, num_jobs, should_print_progress, filter_=None): if should_print_progress: print('Reading YAML files...') if not Remark.demangler_proc: -- 2.7.4