diff --git a/llvm/tools/opt-viewer/optpmap.py b/llvm/tools/opt-viewer/optpmap.py
index db6b079b3a6d..ff3e683f3d06 100644
--- a/llvm/tools/opt-viewer/optpmap.py
+++ b/llvm/tools/opt-viewer/optpmap.py
@@ -42,7 +42,7 @@ def pmap(func, iterable, processes, should_print_progress, *args, **kwargs):
 
     func_and_args = [(func, arg, should_print_progress,) for arg in iterable]
     if processes == 1:
-        result = map(_wrapped_func, func_and_args, *args, **kwargs)
+        result = list(map(_wrapped_func, func_and_args, *args, **kwargs))
     else:
         pool = multiprocessing.Pool(initializer=_init,
                                     initargs=(_current, _total,),
diff --git a/llvm/utils/schedcover.py b/llvm/utils/schedcover.py
index 8c0aeeb32b53..9532f1b554bd 100644
--- a/llvm/utils/schedcover.py
+++ b/llvm/utils/schedcover.py
@@ -39,7 +39,7 @@ def display():
     ordered_table  = sorted(table.items(), key=operator.itemgetter(0))
     ordered_models = ["itinerary", "default"]
     ordered_models.extend(sorted(models))
-    ordered_models = filter(filter_model, ordered_models)
+    ordered_models = [m for m in ordered_models if filter_model(m)]
 
     # print header
     sys.stdout.write("instruction")