tests: Additional ETE snapshot with multi session buffers.

Add snapshot to test multi-session decode

Signed-off-by: Mike Leach <mike.leach@linaro.org>

14 files changed, 125 insertions, 13 deletions

diff --git a/decoder/tests/run_pkt_decode_tests-ete.bash b/decoder/tests/run_pkt_decode_tests-ete.bash
index 656e7db54018..dd06ca9f7617 100755
--- a/decoder/tests/run_pkt_decode_tests-ete.bash
+++ b/decoder/tests/run_pkt_decode_tests-ete.bash
@@ -60,11 +60,14 @@ declare -a test_dirs_decode=( "001-ack_test"
                               "ete_spec_1"
                               "ete_spec_2"
                               "ete_spec_3"
+                              "ete_wfet"
                               "event_test"
                               "infrastructure"
                               "q_elem"
+                              "rme_test"
                               "s_9001"
                               "src_addr"
+                              "ss_ib_el1ns"
                               "tme_simple"
                               "tme_tcancel"
                               "tme_test"
@@ -74,13 +77,19 @@ declare -a test_dirs_decode=( "001-ack_test"
                               "ts_marker"
                             )
 
-
 # directories for tests using I_SRC_ADDR_range option
 declare -a test_dirs_decode_src_addr_opt=( "002-ack_test_scr"
                               "ete_ip"
                               "src_addr"
                               )
 
+# directories with multi session snapshots
+declare -a test_dirs_decode_multi_sess=( "ss_ib_el1ns"
+                                         "ete-ite-instr"
+                                         "q_elem"
+                                         "rme_test"
+                                         "s_9001"
+                                        )                                            
 
 echo "Running trc_pkt_lister on snapshot directories."
 
@@ -116,3 +125,10 @@ do
     ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/$test_dir_n" $@ -decode -src_addr_n -logfilename "${OUT_DIR}/${test_dir_n}_src_addr_N.ppl"
     echo "Done : Return $?"
 done
+
+for test_dir_ms in "${test_dirs_decode_multi_sess[@]}"
+do
+    echo "Testing with -multi_session  $test_dir_ms..."
+    ${BIN_DIR}trc_pkt_lister -ss_dir "${SNAPSHOT_DIR}/$test_dir_ms" $@ -decode -multi_session -logfilename "${OUT_DIR}/${test_dir_ms}_multi_sess.ppl"
+    echo "Done : Return $?"
+done
diff --git a/decoder/tests/snapshots-ete/ete-ite-instr/trace.ini b/decoder/tests/snapshots-ete/ete-ite-instr/trace.ini
index 1880b6632828..9dc6a457aad7 100644
--- a/decoder/tests/snapshots-ete/ete-ite-instr/trace.ini
+++ b/decoder/tests/snapshots-ete/ete-ite-instr/trace.ini
@@ -1,15 +1,16 @@
 [trace_buffers]
-buffers=buffer2
+buffers=buffer1,buffer2
+
+[buffer2]
+name=ETB_2
+file=session2.bin
+format=source_data
 
 [buffer1]
 name=ETB_1
 file=session1.bin
 format=source_data
 
-[buffer2]
-name=ETB_2
-file=session2.bin
-format=source_data
 
 
 [source_buffers]
diff --git a/decoder/tests/snapshots-ete/q_elem/trace.ini b/decoder/tests/snapshots-ete/q_elem/trace.ini
index 1e22baf7e268..efbdff527194 100644
--- a/decoder/tests/snapshots-ete/q_elem/trace.ini
+++ b/decoder/tests/snapshots-ete/q_elem/trace.ini
@@ -1,17 +1,16 @@
 [trace_buffers]
-#buffers=buffer2,buffer1
-buffers=buffer2
-
-[buffer1]
-name=ETB_1
-file=session1.bin
-format=source_data
+buffers=buffer2,buffer1
 
 [buffer2]
 name=ETB_2
 file=session2.bin
 format=source_data
 
+[buffer1]
+name=ETB_1
+file=session1.bin
+format=source_data
+
 
 [source_buffers]
 ETE_0_s1=ETB_1
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/ETE_0_s1.ini b/decoder/tests/snapshots-ete/ss_ib_el1ns/ETE_0_s1.ini
new file mode 100644
index 000000000000..23947f3904cc
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/ETE_0_s1.ini
@@ -0,0 +1,15 @@
+[device]
+name=ETE_0_s1
+class=trace_source
+type=ETE
+
+
+[regs]
+TRCCONFIGR=0x8001
+TRCTRACEIDR=0x1
+TRCDEVARCH=0x47735a13
+TRCIDR0=0x28c1cea1
+TRCIDR1=0x4100fff0
+TRCIDR2=0xd0001088
+TRCIDR8=0x0
+
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/ETE_0_s2.ini b/decoder/tests/snapshots-ete/ss_ib_el1ns/ETE_0_s2.ini
new file mode 100644
index 000000000000..063b076c90b4
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/ETE_0_s2.ini
@@ -0,0 +1,15 @@
+[device]
+name=ETE_0_s2
+class=trace_source
+type=ETE
+
+
+[regs]
+TRCCONFIGR=0x8001
+TRCTRACEIDR=0x1
+TRCDEVARCH=0x47735a13
+TRCIDR0=0x28c1cea1
+TRCIDR1=0x4100fff0
+TRCIDR2=0xd0001088
+TRCIDR8=0x0
+
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/OTHERS_exec b/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/OTHERS_exec
new file mode 100644
index 000000000000..8eaa6b0d150f
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/OTHERS_exec
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/TEST_NON_DET_CODE_exec b/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/TEST_NON_DET_CODE_exec
new file mode 100644
index 000000000000..965319f4f001
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/TEST_NON_DET_CODE_exec
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/VAL_NON_DET_CODE_exec b/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/VAL_NON_DET_CODE_exec
new file mode 100644
index 000000000000..31303b2870ce
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/VAL_NON_DET_CODE_exec
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/VAL_TEST_CODE_exec b/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/VAL_TEST_CODE_exec
new file mode 100644
index 000000000000..bbbaeb084344
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/bindir_64/VAL_TEST_CODE_exec
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/cpu_0.ini b/decoder/tests/snapshots-ete/ss_ib_el1ns/cpu_0.ini
new file mode 100644
index 000000000000..e9c296f141ab
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/cpu_0.ini
@@ -0,0 +1,32 @@
+[device]
+name=cpu_0
+class=core
+type=ARM-AA64
+
+[regs]
+PC(size:64)=0x0
+SP(size:64)=0
+SCTLR_EL1=0x0
+CPSR=0x0
+
+
+[dump1]
+file=bindir_64/OTHERS_exec
+address=0x00060000
+length=0x22f80
+
+[dump2]
+file=bindir_64/VAL_TEST_CODE_exec
+address=0x01000000
+length=0x3bb80
+
+[dump3]
+file=bindir_64/VAL_NON_DET_CODE_exec
+address=0x00010000
+length=0x2b598
+
+[dump4]
+file=bindir_64/TEST_NON_DET_CODE_exec
+address=0x00050000
+length=0x234
+
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/session1.bin b/decoder/tests/snapshots-ete/ss_ib_el1ns/session1.bin
new file mode 100644
index 000000000000..cb920cc99299
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/session1.bin
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/session2.bin b/decoder/tests/snapshots-ete/ss_ib_el1ns/session2.bin
new file mode 100644
index 000000000000..6f701dfac41b
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/session2.bin
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/snapshot.ini b/decoder/tests/snapshots-ete/ss_ib_el1ns/snapshot.ini
new file mode 100644
index 000000000000..299b37631369
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/snapshot.ini
@@ -0,0 +1,12 @@
+[snapshot]
+version=1.0
+description=checker_metadata.ini
+
+[device_list]
+device0=cpu_0.ini
+device1=ETE_0_s1.ini
+device2=ETE_0_s2.ini
+
+[trace]
+metadata=trace.ini
+
diff --git a/decoder/tests/snapshots-ete/ss_ib_el1ns/trace.ini b/decoder/tests/snapshots-ete/ss_ib_el1ns/trace.ini
new file mode 100644
index 000000000000..3a3192976a35
--- /dev/null
+++ b/decoder/tests/snapshots-ete/ss_ib_el1ns/trace.ini
@@ -0,0 +1,22 @@
+[trace_buffers]
+buffers=buffer1,buffer2
+
+[buffer1]
+name=ETB_1
+file=session1.bin
+format=source_data
+
+[buffer2]
+name=ETB_2
+file=session2.bin
+format=source_data
+
+
+[source_buffers]
+ETE_0_s1=ETB_1
+ETE_0_s2=ETB_2
+
+[core_trace_sources]
+cpu_0=ETE_0_s1
+cpu_0=ETE_0_s2
+