SWDEV-393541: Closed ATT 5.6 features. Fixed python3 syntax for 5.6

Change-Id: Ia2b56b1c4c6e9ba37911746325683314aa464d7a

plugin/att/att.py

@@ -18,7 +18,7 @@ import matplotlib.pyplot as plt
 from io import BytesIO
 
 class FileBytesIO:
-    def __init__(self, iobytes) -> None:
+    def __init__(self, iobytes):
         self.iobytes = iobytes
         self.seek = 0
 
@@ -493,7 +493,7 @@ if __name__ == "__main__":
 
     # Trace Parsing
     if args.trace_file is None:
-        filenames = glob.glob(args.att_kernel.split('_kernel.txt')[0]+'*.att')
+        filenames = glob.glob(args.att_kernel.split('_kernel.txt')[0]+'_*.att')
         assert(len(filenames) > 0)
     else:
         filenames = glob.glob(args.trace_file)

plugin/att/trace_view.py

@@ -24,7 +24,7 @@ from http import HTTPStatus
 from io import BytesIO
 
 class Readable:
-    def __init__(self, jsonstring) -> None:
+    def __init__(self, jsonstring):
         self.jsonstr = json.dumps(jsonstring)
         self.seek = 0
 
@@ -86,9 +86,10 @@ WaveInstCategory = {
 JSON_GLOBAL_DICTIONARY = {}
 
 class RegisterWatchList:
-    def __init__(self, labels) -> None:
+    def __init__(self, labels):
         self.registers = {'v'+str(k): [[] for m in range(64)] for k in range(64)}
-        self.registers = {**self.registers, **{'s'+str(k): [] for k in range(64)}}
+        for k in range(64):
+            self.registers['s'+str(k)] = []
         self.labels = labels
 
     def try_translate(self, tok):
@@ -457,7 +458,6 @@ def extract_data(df, se_number, code, jumps):
     for wave_id in df['id']:
         if non_stitched[df['simd'][wave_id]][df['wave_slot'][wave_id]] == 0:
             continue
-        print(f"Parsing :{se_number}-{df['simd'][wave_id]}-{df['wave_slot'][wave_id]}")
         insts, timeline = [], []
         if len(df['instructions'][wave_id]) == 0 or len(df['timeline'][wave_id]) == 0:
             continue