SWDEV-437776: Fixing ATT CSV ordering

Change-Id: If111b9a2d4354a036693795cfbc18e87899f1f1c

plugin/att/att.py

@@ -576,10 +576,16 @@ if __name__ == "__main__":
         for k in range(len(code)):
             code[k][-2] = int(hitcount_map[k])
             code[k][-1] = int(latency_map[k])
+            try:
+                code[k][-3] = codeservice.ToRawPC(code[k][-3])
+            except:
+                pass
+            if k > 0 and code[k-1][-3] == 0:
+                code[k-1][-3] = code[k][-3]
 
         if CSV_MODE:
             from att_to_csv import dump_csv
-            dump_csv(code, trace_instance_name)
+            dump_csv(code, trace_instance_name, bIsAuto)
 
         if FILE_MODE:
             drawinfo = {

plugin/att/att_to_csv.py

@@ -4,7 +4,7 @@ import numpy as np
 import csv
 import os
 
-def dump_csv(code, trace_instance_name):
+def dump_csv(code, trace_instance_name, bIsAuto):
     outpath = os.getenv("OUT_FILE_NAME")
     if outpath is None:
         outpath = "att_output"
@@ -15,5 +15,9 @@ def dump_csv(code, trace_instance_name):
 
     with open(outpath, 'w') as f:
         writer = csv.writer(f)
-        writer.writerow(['Line', 'Instruction', 'Hitcount', 'Cycles', 'Addr', 'C++ Reference'])
-        [writer.writerow([m[5], m[0], m[7], m[8], hex(m[6]), m[3]]) for m in code]
+        if bIsAuto:
+            writer.writerow(['Addr', 'Instruction', 'Hitcount', 'Cycles', 'C++ Reference'])
+            [writer.writerow([hex(m[6]), m[0], m[7], m[8], m[3]]) for m in code]
+        else:
+            writer.writerow(['Line', 'Instruction', 'Hitcount', 'Cycles', 'C++ Reference'])
+            [writer.writerow([m[5], m[0], m[7], m[8], m[3]]) for m in code]