summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorTodd Gamblin <tgamblin@llnl.gov>2020-01-26 11:21:04 -0800
committerTodd Gamblin <tgamblin@llnl.gov>2020-11-17 10:04:13 -0800
commit7a1b5ca65e8f340a01ae317ebaf989135ff29cb9 (patch)
treed3e921b525669f0cbbdf4f724ecf3a2756ef13ff /lib
parent5185ed1d28c7bd8420be000ef0e586ac3984e192 (diff)
downloadspack-7a1b5ca65e8f340a01ae317ebaf989135ff29cb9.tar.gz
spack-7a1b5ca65e8f340a01ae317ebaf989135ff29cb9.tar.bz2
spack-7a1b5ca65e8f340a01ae317ebaf989135ff29cb9.tar.xz
spack-7a1b5ca65e8f340a01ae317ebaf989135ff29cb9.zip
concretizer: add timers around phases
Diffstat (limited to 'lib')
-rw-r--r--lib/spack/spack/cmd/solve.py5
-rw-r--r--lib/spack/spack/solver/asp.py37
2 files changed, 38 insertions, 4 deletions
diff --git a/lib/spack/spack/cmd/solve.py b/lib/spack/spack/cmd/solve.py
index a9197bb0cb..74ec42d5af 100644
--- a/lib/spack/spack/cmd/solve.py
+++ b/lib/spack/spack/cmd/solve.py
@@ -56,6 +56,9 @@ def setup_parser(subparser):
'-t', '--types', action='store_true', default=False,
help='show dependency types')
subparser.add_argument(
+ '--timers', action='store_true', default=False,
+ help='print out timers for different solve phases')
+ subparser.add_argument(
'specs', nargs=argparse.REMAINDER, help="specs of packages")
@@ -90,7 +93,7 @@ def solve(parser, args):
specs = spack.cmd.parse_specs(args.specs)
# dump generated ASP program
- result = asp.solve(specs, dump=dump, models=models)
+ result = asp.solve(specs, dump=dump, models=models, timers=args.timers)
if 'solutions' not in dump:
return
diff --git a/lib/spack/spack/solver/asp.py b/lib/spack/spack/solver/asp.py
index d85eae81bf..4ca7862d51 100644
--- a/lib/spack/spack/solver/asp.py
+++ b/lib/spack/spack/solver/asp.py
@@ -10,6 +10,7 @@ import pkgutil
import re
import sys
import tempfile
+import time
import types
from six import string_types
@@ -861,10 +862,30 @@ def highlight(string):
return string
+class Timer(object):
+ def __init__(self):
+ self.start = time.time()
+ self.last = self.start
+ self.phases = {}
+
+ def phase(self, name):
+ last = self.last
+ now = time.time()
+ self.phases[name] = now - last
+ self.last = now
+
+ def write(self, out=sys.stdout):
+ now = time.time()
+ out.write("Time:\n")
+ for phase, t in self.phases.items():
+ out.write(" %-15s%.4f\n" % (phase + ":", t))
+ out.write("Total: %.4f\n" % (now - self.start))
+
+
#
# These are handwritten parts for the Spack ASP model.
#
-def solve(specs, dump=None, models=0):
+def solve(specs, dump=None, models=0, timers=False):
"""Solve for a stable model of specs.
Arguments:
@@ -878,15 +899,17 @@ def solve(specs, dump=None, models=0):
def colorize(string):
color.cprint(highlight(color.cescape(string)))
+ timer = Timer()
with tempfile.TemporaryFile("w+") as program:
generator = AspGenerator(program)
generator.generate_asp_program(specs)
+ timer.phase("generate")
program.seek(0)
result = Result(program.read())
program.seek(0)
- if 'asp' in dump:
+ if dump and 'asp' in dump:
if sys.stdout.isatty():
tty.msg('ASP program:')
@@ -895,6 +918,7 @@ def solve(specs, dump=None, models=0):
return
else:
colorize(result.asp)
+ timer.phase("dump")
with tempfile.TemporaryFile("w+") as output:
with tempfile.TemporaryFile() as warnings:
@@ -915,6 +939,7 @@ def solve(specs, dump=None, models=0):
output=output,
error=warnings,
fail_on_error=False)
+ timer.phase("solve")
warnings.seek(0)
result.warnings = warnings.read().decode("utf-8")
@@ -927,9 +952,10 @@ def solve(specs, dump=None, models=0):
output.seek(0)
result.output = output.read()
+ timer.phase("read")
# dump the raw output of the solver
- if 'output' in dump:
+ if dump and 'output' in dump:
if sys.stdout.isatty():
tty.msg('Clingo output:')
print(result.output)
@@ -939,5 +965,10 @@ def solve(specs, dump=None, models=0):
output.seek(0)
parser.parse_best(output, result)
+ timer.phase("parse")
+
+ if timers:
+ timer.write()
+ print()
return result