[PATCH] D59894: [opt-viewer] Make filter_=None by default in get_remarks and gather_results

[Jessica Paquette via Phabricator via llvm-commits]

paquette created this revision.
paquette added reviewers: fhahn, thegameg, anemet.
Herald added a subscriber: jdoerfert.
Herald added a project: LLVM.

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.


https://reviews.llvm.org/D59894

Files:
  llvm/tools/opt-viewer/optrecord.py


Index: llvm/tools/opt-viewer/optrecord.py
===================================================================
--- llvm/tools/opt-viewer/optrecord.py
+++ llvm/tools/opt-viewer/optrecord.py
@@ -265,7 +265,7 @@
         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 @@
     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 @@
     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:


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D59894.192482.patch
Type: text/x-patch
Size: 1450 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20190327/af66cf9d/attachment.bin>