commit 8b2fe966890403a7fc2518c91e6db604af3b56f7
author Paul Sokolovsky <paul.sokolovsky@linaro.org> Thu Feb 24 12:30:10 2022 +0300
committer Paul Sokolovsky <paul.sokolovsky@linaro.org> Fri Mar 25 19:39:49 2022 +0100
tree 0e4d0025b1322a43ce33ab9f5bf1de599fb6851a
parent fa0b1926aebc42d84cc036d40188bd4051eb7cda

fvp_mps2.jinja2: Improve code coverage support

Add more termination condition for coverage runs

The "fvp_mps2.UART0.shutdown_on_eot" option doesn't seem to work for the
FVP version used by TF-M tests. Instead, emulated it using the
"fvp_mps2.UART0.shutdown_tag=\x04" option. As a fallback, also add
"--cpulimit 130" option, so if EOT output is still missing for some
testsuites, FVP terminates by timeout.

To capture actual trace data to the LAVA logs, follow standard "monitors"
LAVA test clauses with "interactive" cases.

Signed-off-by: Paul Sokolovsky <paul.sokolovsky@linaro.org>
Change-Id: I6a04b37aa7b0ca207fea0291a7b52e940e6169c6

lava_helper/jinja2_templates/fvp_mps2.jinja2

diff --git a/lava_helper/jinja2_templates/fvp_mps2.jinja2 b/lava_helper/jinja2_templates/fvp_mps2.jinja2
index c294c31..9c78d74 100644
--- a/lava_helper/jinja2_templates/fvp_mps2.jinja2
+++ b/lava_helper/jinja2_templates/fvp_mps2.jinja2
@@ -62,6 +62,8 @@
     -  "--parameter fvp_mps2.mps2_visualisation.disable-visualisation=1"
 {%- if enable_code_coverage %}
     -  "--plugin {CC}"
+    -  "--parameter fvp_mps2.UART0.shutdown_tag=\x04"
+    -  "--cpulimit 130"
 {%- endif %}
 
     prompts:
@@ -82,4 +84,21 @@
          '{{monitor.fixup.skip}}': skip
          {%- endif %}
     {%- endfor %}
+
+{%- if enable_code_coverage %}
+- test:
+    namespace: target
+    interactive:
+    - name: fvp_stopped
+      prompts: ['/OSCI/SystemC: Simulation stopped by user.']
+      script:
+      - name: fvp_stopped_1
+        command:
+    - name: fvp_trace_end
+      prompts: ['Trace path: FVP_MPS2_AEMv8M.cpu1']
+      script:
+      - name: fvp_trace_end_1
+        command:
+{%- endif %}
+
 {% endblock %}