From 95be685b76724e0fb0600f8bdf8ccbbaadf47229 Mon Sep 17 00:00:00 2001
From: Vasileios Karakasis <vkarak@gmail.com>
Date: Fri, 20 Jan 2023 18:44:21 +0100
Subject: [PATCH] Fix performance logging when `perf_variables` are set late

---
 reframe/core/logging.py                |  5 ++-
 reframe/frontend/executors/__init__.py |  4 +--
 unittests/test_policies.py             | 49 ++++++++++++++++++++++++++
 3 files changed, 52 insertions(+), 6 deletions(-)

diff --git a/reframe/core/logging.py b/reframe/core/logging.py
index a749945076..77495eb71d 100644
--- a/reframe/core/logging.py
+++ b/reframe/core/logging.py
@@ -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
@@ -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
diff --git a/reframe/frontend/executors/__init__.py b/reframe/frontend/executors/__init__.py
index 19631c2a58..4ccf8775aa 100644
--- a/reframe/frontend/executors/__init__.py
+++ b/reframe/frontend/executors/__init__.py
@@ -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
diff --git a/unittests/test_policies.py b/unittests/test_policies.py
index bab919ce94..34ce664e5c 100644
--- a/unittests/test_policies.py
+++ b/unittests/test_policies.py
@@ -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):
@@ -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)