CI fixes (#2634)

* Increase timeout for compliance testlist
* Switch to verilator for riscv-tests-v for faster sim
* fix reports for non tandem jobs

.gitlab-ci.yml

@@ -356,6 +356,7 @@ riscv_arch_test:
   after_script: *simu_after_script
 
 compliance:
+  timeout : 2 hours
   extends:
     - .regress_test
   variables:
@@ -377,7 +378,7 @@ riscv-tests-v:
     DASHBOARD_JOB_DESCRIPTION: "Riscv-test regression suite (virtual)"
     DASHBOARD_SORT_INDEX: 3
     DASHBOARD_JOB_CATEGORY: "Test suites"
-    DV_SIMULATORS: "vcs-testharness,spike"
+    DV_SIMULATORS: "veri-testharness,spike"
     DV_TARGET: cv64a6_imafdc_sv39
     DV_TESTLISTS: "../tests/testlist_riscv-tests-$DV_TARGET-v.yaml"
   script: source verif/regress/dv-riscv-tests.sh

.gitlab-ci/scripts/report_simu.py

@@ -18,7 +18,7 @@ with open(str(sys.argv[1]), 'r') as f:
 with_logs = os.environ.get("COLLECT_SIMU_LOGS") != None
 
 pattern = re.compile(
-    r'(?:\w{3}, \d{2} \w{3} \d{4} \d{2}:\d{2}:\d{2} INFO     )(?:Processing regression test list : (?:.*)/testlist_(.*-.*)(?:.yaml), test: (\S*)$[\s\S]*?^(?:\w{3}, \d{2} \w{3} \d{4} \d{2}:\d{2}:\d{2} INFO     )Compiling (.*):.*$|Compiling (.*): .*(tests\S*))$[\s\S]*?^(?:\w{3}, \d{2} \w{3} \d{4} \d{2}:\d{2}:\d{2} INFO     )Found matching ISS: (\S*)$[\s\S]*?^(?:\w{3}, \d{2} \w{3} \d{4} \d{2}:\d{2}:\d{2} INFO     )Target: (\S*)$[\s\S]*?^(?:\w{3}, \d{2} \w{3} \d{4} \d{2}:\d{2}:\d{2}(?: INFO     ))ISA (\S*)$[\s\S]*?^(?:\w{3}, \d{2} \w{3} \d{4} \d{2}:\d{2}:\d{2} (?:(?:INFO     )\[(\w*)\]: (\d*) matched(?:, (\d*) mismatch)?)|(?:^(?:\w{3}, \d{2} \w{3} \d{4} \d{2}:\d{2}:\d{2})(?: ERROR    )(\D{5})(?:.*)$))',
+    r'(?:.*Compiling test: (.*))$[\s\S]*?(?:^.*Target: (.*)$)$[\s\S]*?(?:^.*ISA (.*)$)[\s\S]*?(?:^.*Found matching ISS: (.*)$)[\s\S]*?(?:^.*\[(PASSED|FAILED)\].*$)',
     re.MULTILINE)
 list_of_tests = pattern.findall(log)
 
@@ -27,7 +27,6 @@ metric = rb.TableStatusMetric('')
 metric.add_column("TARGET", "text")
 metric.add_column("ISA", "text")
 metric.add_column("TEST", "text")
-metric.add_column("TEST LIST", "text")
 
 if with_logs:
     metric.add_column("OUTPUT", "log")
@@ -40,22 +39,20 @@ job_test_total = 0
 for i in list_of_tests:
     job_test_total += 1
 
-    target = i[6]
-    isa = i[7]
-    test = i[1] or i[4].split("/")[-1].split(".")[0]
-    testsuite = i[0] or "custom test"
-    test_type = i[2] or i[4]
+    target = i[1]
+    isa = i[2]
+    test = i[0] 
 
     if with_logs:
         logsPath = "logs/" + os.environ.get("CI_JOB_ID") + "/artifacts/logs/"
         output_log = logsPath + 'logfile.log.head'
         tb_log = logsPath + test + "." + target + '.log.iss.head'
         disassembly = logsPath + test + "." + target + '.csv.head'
-        col = [target, isa, test, testsuite, output_log, tb_log, disassembly]
+        col = [target, isa, test, output_log, tb_log, disassembly]
     else:
-        col = [target, isa, test, testsuite]
+        col = [target, isa, test]
 
-    if i[8] == "PASSED":
+    if i[4] == "PASSED":
         metric.add_pass(*col)
         job_test_pass += 1
     else:

verif/sim/cva6.py

@@ -500,7 +500,7 @@ def run_test(test, iss_yaml, isa, target, mabi, gcc_opts, iss_opts, output_dir,
 
   if test_type != "o":
     # gcc compilation
-    logging.info("Compiling test: %s" % test)
+    logging.info("Compiling test: %s" % test_path)
     cmd = ("%s %s \
           -I%s/dv/user_extension \
             -T%s %s -o %s " % \