WIP: Try modifying more tests

Author: ldionne

lnt/tests/nt.py

@@ -729,7 +729,7 @@ def execute_nt_tests(test_log, make_variables, basedir, config):
 # Keep a mapping of mangled test names, to the original names in the
 # test-suite.
 TEST_TO_NAME = {}
-KNOWN_SAMPLE_KEYS = ('compile', 'exec', 'hash',
+KNOWN_SAMPLE_KEYS = ('compile_time', 'execution_time', 'hash',
                      'gcc.compile', 'bc.compile', 'llc.compile',
                      'llc-beta.compile', 'jit.compile', 'gcc.exec', 'llc.exec',
                      'llc-beta.exec', 'jit.exec')
@@ -750,10 +750,10 @@ def append_to_sample_keys(tup):
         # for now, user time is the unqualified Time stat
         if config.test_time_stat == "real":
             time_stat = 'Real_'
-        append_to_sample_keys((True, 'compile', 'CC_' + time_stat + 'Time',
+        append_to_sample_keys((True, 'compile_time', 'CC_' + time_stat + 'Time',
                                None, 'CC', float))
         append_to_sample_keys((False, 'hash', 'CC_Hash', None, 'CC', str))
-        append_to_sample_keys((True, 'exec', 'Exec_' + time_stat + 'Time',
+        append_to_sample_keys((True, 'execution_time', 'Exec_' + time_stat + 'Time',
                                None, 'Exec', float))
     else:
         test_namespace = 'nightlytest'

lnt/tests/test_suite.py

@@ -720,8 +720,8 @@ def _get_cc_info(self, cmake_vars):
 
     def _parse_lit_output(self, path, data, cmake_vars, only_test=False):
         LIT_METRIC_TO_LNT = {
-            'compile_time': 'compile',
-            'exec_time': 'exec',
+            'compile_time': 'compile_time',
+            'exec_time': 'execution_time',
             'score': 'score',
             'hash': 'hash',
             'link_time': 'compile',

tests/runtest/exclude_stat.py

@@ -10,5 +10,6 @@
 # RUN: filecheck --check-prefix CHECK-STDOUT < %t.log %s
 # RUN: filecheck --check-prefix CHECK-REPORT < %t.SANDBOX/build/report.json %s
 # CHECK-STDOUT: Import succeeded.
-# CHECK-REPORT:     "Name": "nts.{{[^.]+}}.exec"
-# CHECK-REPORT-NOT: "Name": "nts.{{[^.]+}}.compile"
+# CHECK-REPORT:     "execution_time":
+# CHECK-REPORT-NOT: "compile_time":
+# CHECK-REPORT-NOT: "compile":

tests/runtest/test_suite-metrics.shtest

@@ -14,8 +14,8 @@
 # RUN: filecheck --check-prefix CHECK-METRICS < %t.SANDBOX/build/report.json %s
 # RUN: filecheck --check-prefix CHECK-METRICS2 < %t.SANDBOX/build/report.json %s
 # CHECK-METRICS-DAG: "name": "nts.foo"
-# CHECK-METRICS-DAG: "exec":
-# CHECK-METRICS-DAG: "compile":
+# CHECK-METRICS-DAG: "execution_time":
+# CHECK-METRICS-DAG: "compile_time":
 # CHECK-METRICS-DAG: "score":
 # CHECK-METRICS-DAG: "hash":
 # CHECK-METRICS2-NOT: "unknown":

tests/runtest/test_suite.shtest

@@ -19,8 +19,8 @@
 
 # CHECK-REPORT: "no_errors": "True",
 # CHECK-REPORT: "run_order": "154331"
-# CHECK-REPORT: "compile": 1.3
-# CHECK-REPORT: "exec": 1.4
+# CHECK-REPORT: "compile_time": 1.3
+# CHECK-REPORT: "execution_time": 1.4
 # CHECK-REPORT: "hash": "xyz"
 # CHECK-REPORT: "name": "nts.foo"
 # CHECK-REPORT: "score": 1.5