Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions reframe/core/logging.py
Original file line number Diff line number Diff line change
Expand Up @@ -726,7 +726,7 @@ def _update_check_extras(self):
)

def log_performance(self, level, task, msg=None, multiline=False):
if self.extra['__rfm_check__'] is None:
if self.check is None or not self.check.is_performance_check():
return

self.extra['check_partition'] = task.testcase.partition.name
Expand All @@ -737,8 +737,7 @@ def log_performance(self, level, task, msg=None, multiline=False):

if multiline:
# Log one record for each performance variable
check = self.extra['__rfm_check__']
for var, info in check.perfvalues.items():
for var, info in self.check.perfvalues.items():
val, ref, lower, upper, unit = info
self.extra['check_perf_var'] = var.split(':')[-1]
self.extra['check_perf_value'] = val
Expand Down
4 changes: 1 addition & 3 deletions reframe/frontend/executors/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -368,9 +368,7 @@ def sanity(self):

@logging.time_function
def performance(self):
if self.check.is_performance_check():
self._perflogger = logging.getperflogger(self.check)

self._perflogger = logging.getperflogger(self.check)
self._safe_call(self.check.performance)

@logging.time_function
Expand Down
49 changes: 49 additions & 0 deletions unittests/test_policies.py
Original file line number Diff line number Diff line change
Expand Up @@ -1007,6 +1007,29 @@ def perf0(self):
return _MyFailingTest()


@pytest.fixture
def lazy_perf_test():
class _LazyPerfTest(rfm.RunOnlyRegressionTest):
valid_systems = ['*']
valid_prog_environs = ['*']
executable = 'echo perf0=100'

@sanity_function
def validate(self):
return True

@run_before('performance')
def set_perf_vars(self):
self.perf_variables = {
'perf0': sn.make_performance_function(
sn.extractsingle(r'perf0=(\S+)', self.stdout, 1, float),
'unit0'
)
}

return _LazyPerfTest()


@pytest.fixture
def simple_test():
class _MySimpleTest(rfm.RunOnlyRegressionTest):
Expand Down Expand Up @@ -1240,3 +1263,29 @@ def test_perf_logging_multiline(make_runner, make_exec_ctx, perf_test,
lines = fp.readlines()
assert ',perf0=100.0,unit0' in lines[1]
assert ',perf1=50.0,unit1' in lines[2]


def test_perf_logging_lazy(make_runner, make_exec_ctx, lazy_perf_test,
config_perflog, tmp_path):
make_exec_ctx(
config_perflog(
fmt=(
'%(check_job_completion_time)s,%(version)s,'
'%(check_display_name)s,%(check_system)s,'
'%(check_partition)s,%(check_environ)s,'
'%(check_jobid)s,%(check_result)s,%(check_perfvalues)s'
),
perffmt=(
'%(check_perf_value)s,%(check_perf_unit)s,'
'%(check_perf_ref)s,%(check_perf_lower)s,'
'%(check_perf_upper)s,'
)
)
)
logging.configure_logging(rt.runtime().site_config)
runner = make_runner()
testcases = executors.generate_testcases([lazy_perf_test])
runner.runall(testcases)

logfile = tmp_path / 'perflogs' / 'generic' / 'default' / '_LazyPerfTest.log'
assert os.path.exists(logfile)