1 files changed, 56 insertions, 13 deletions

diff --git a/tools/perf/scripts/python/exported-sql-viewer.py b/tools/perf/scripts/python/exported-sql-viewer.py
index f5b1b63995b0..94489cf2ce0e 100755
--- a/tools/perf/scripts/python/exported-sql-viewer.py
+++ b/tools/perf/scripts/python/exported-sql-viewer.py
@@ -781,11 +781,13 @@ class CallGraphModel(CallGraphModelBase):
 
 class CallTreeLevelTwoPlusItemBase(CallGraphLevelItemBase):
 
-        def __init__(self, glb, params, row, comm_id, thread_id, calls_id, time, branch_count, parent_item):
+        def __init__(self, glb, params, row, comm_id, thread_id, calls_id, time, insn_cnt, cyc_cnt, branch_count, parent_item):
                 super(CallTreeLevelTwoPlusItemBase, self).__init__(glb, params, row, parent_item)
                 self.comm_id = comm_id
                 self.thread_id = thread_id
                 self.calls_id = calls_id
+                self.insn_cnt = insn_cnt
+                self.cyc_cnt = cyc_cnt
                 self.branch_count = branch_count
                 self.time = time
 
@@ -795,8 +797,12 @@ class CallTreeLevelTwoPlusItemBase(CallGraphLevelItemBase):
                         comm_thread = " AND comm_id = " + str(self.comm_id) + " AND thread_id = " + str(self.thread_id)
                 else:
                         comm_thread = ""
+                if self.params.have_ipc:
+                        ipc_str = ", insn_count, cyc_count"
+                else:
+                        ipc_str = ""
                 query = QSqlQuery(self.glb.db)
-                QueryExec(query, "SELECT calls.id, name, short_name, call_time, return_time - call_time, branch_count"
+                QueryExec(query, "SELECT calls.id, name, short_name, call_time, return_time - call_time" + ipc_str + ", branch_count"
                                         " FROM calls"
                                         " INNER JOIN call_paths ON calls.call_path_id = call_paths.id"
                                         " INNER JOIN symbols ON call_paths.symbol_id = symbols.id"
@@ -804,7 +810,15 @@ class CallTreeLevelTwoPlusItemBase(CallGraphLevelItemBase):
                                         " WHERE calls.parent_id = " + str(self.calls_id) + comm_thread +
                                         " ORDER BY call_time, calls.id")
                 while query.next():
-                        child_item = CallTreeLevelThreeItem(self.glb, self.params, self.child_count, self.comm_id, self.thread_id, query.value(0), query.value(1), query.value(2), query.value(3), int(query.value(4)), int(query.value(5)), self)
+                        if self.params.have_ipc:
+                                insn_cnt = int(query.value(5))
+                                cyc_cnt = int(query.value(6))
+                                branch_count = int(query.value(7))
+                        else:
+                                insn_cnt = 0
+                                cyc_cnt = 0
+                                branch_count = int(query.value(5))
+                        child_item = CallTreeLevelThreeItem(self.glb, self.params, self.child_count, self.comm_id, self.thread_id, query.value(0), query.value(1), query.value(2), query.value(3), int(query.value(4)), insn_cnt, cyc_cnt, branch_count, self)
                         self.child_items.append(child_item)
                         self.child_count += 1
 
@@ -812,10 +826,17 @@ class CallTreeLevelTwoPlusItemBase(CallGraphLevelItemBase):
 
 class CallTreeLevelThreeItem(CallTreeLevelTwoPlusItemBase):
 
-        def __init__(self, glb, params, row, comm_id, thread_id, calls_id, name, dso, count, time, branch_count, parent_item):
-                super(CallTreeLevelThreeItem, self).__init__(glb, params, row, comm_id, thread_id, calls_id, time, branch_count, parent_item)
+        def __init__(self, glb, params, row, comm_id, thread_id, calls_id, name, dso, count, time, insn_cnt, cyc_cnt, branch_count, parent_item):
+                super(CallTreeLevelThreeItem, self).__init__(glb, params, row, comm_id, thread_id, calls_id, time, insn_cnt, cyc_cnt, branch_count, parent_item)
                 dso = dsoname(dso)
-                self.data = [ name, dso, str(count), str(time), PercentToOneDP(time, parent_item.time), str(branch_count), PercentToOneDP(branch_count, parent_item.branch_count) ]
+                if self.params.have_ipc:
+                        insn_pcnt = PercentToOneDP(insn_cnt, parent_item.insn_cnt)
+                        cyc_pcnt = PercentToOneDP(cyc_cnt, parent_item.cyc_cnt)
+                        br_pcnt = PercentToOneDP(branch_count, parent_item.branch_count)
+                        ipc = CalcIPC(cyc_cnt, insn_cnt)
+                        self.data = [ name, dso, str(count), str(time), PercentToOneDP(time, parent_item.time), str(insn_cnt), insn_pcnt, str(cyc_cnt), cyc_pcnt, ipc, str(branch_count), br_pcnt ]
+                else:
+                        self.data = [ name, dso, str(count), str(time), PercentToOneDP(time, parent_item.time), str(branch_count), PercentToOneDP(branch_count, parent_item.branch_count) ]
                 self.dbid = calls_id
 
 # Call tree data model level two item
@@ -823,18 +844,28 @@ class CallTreeLevelThreeItem(CallTreeLevelTwoPlusItemBase):
 class CallTreeLevelTwoItem(CallTreeLevelTwoPlusItemBase):
 
         def __init__(self, glb, params, row, comm_id, thread_id, pid, tid, parent_item):
-                super(CallTreeLevelTwoItem, self).__init__(glb, params, row, comm_id, thread_id, 0, 0, 0, parent_item)
-                self.data = [str(pid) + ":" + str(tid), "", "", "", "", "", ""]
+                super(CallTreeLevelTwoItem, self).__init__(glb, params, row, comm_id, thread_id, 0, 0, 0, 0, 0, parent_item)
+                if self.params.have_ipc:
+                        self.data = [str(pid) + ":" + str(tid), "", "", "", "", "", "", "", "", "", "", ""]
+                else:
+                        self.data = [str(pid) + ":" + str(tid), "", "", "", "", "", ""]
                 self.dbid = thread_id
 
         def Select(self):
                 super(CallTreeLevelTwoItem, self).Select()
                 for child_item in self.child_items:
                         self.time += child_item.time
+                        self.insn_cnt += child_item.insn_cnt
+                        self.cyc_cnt += child_item.cyc_cnt
                         self.branch_count += child_item.branch_count
                 for child_item in self.child_items:
                         child_item.data[4] = PercentToOneDP(child_item.time, self.time)
-                        child_item.data[6] = PercentToOneDP(child_item.branch_count, self.branch_count)
+                        if self.params.have_ipc:
+                                child_item.data[6] = PercentToOneDP(child_item.insn_cnt, self.insn_cnt)
+                                child_item.data[8] = PercentToOneDP(child_item.cyc_cnt, self.cyc_cnt)
+                                child_item.data[11] = PercentToOneDP(child_item.branch_count, self.branch_count)
+                        else:
+                                child_item.data[6] = PercentToOneDP(child_item.branch_count, self.branch_count)
 
 # Call tree data model level one item
 
@@ -842,7 +873,10 @@ class CallTreeLevelOneItem(CallGraphLevelItemBase):
 
         def __init__(self, glb, params, row, comm_id, comm, parent_item):
                 super(CallTreeLevelOneItem, self).__init__(glb, params, row, parent_item)
-                self.data = [comm, "", "", "", "", "", ""]
+                if self.params.have_ipc:
+                        self.data = [comm, "", "", "", "", "", "", "", "", "", "", ""]
+                else:
+                        self.data = [comm, "", "", "", "", "", ""]
                 self.dbid = comm_id
 
         def Select(self):
@@ -885,14 +919,23 @@ class CallTreeModel(CallGraphModelBase):
                 return CallTreeRootItem(self.glb, self.params)
 
         def columnCount(self, parent=None):
-                return 7
+                if self.params.have_ipc:
+                        return 12
+                else:
+                        return 7
 
         def columnHeader(self, column):
-                headers = ["Call Path", "Object", "Call Time", "Time (ns) ", "Time (%) ", "Branch Count ", "Branch Count (%) "]
+                if self.params.have_ipc:
+                        headers = ["Call Path", "Object", "Call Time", "Time (ns) ", "Time (%) ", "Insn Cnt", "Insn Cnt (%)", "Cyc Cnt", "Cyc Cnt (%)", "IPC", "Branch Count ", "Branch Count (%) "]
+                else:
+                        headers = ["Call Path", "Object", "Call Time", "Time (ns) ", "Time (%) ", "Branch Count ", "Branch Count (%) "]
                 return headers[column]
 
         def columnAlignment(self, column):
-                alignment = [ Qt.AlignLeft, Qt.AlignLeft, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight ]
+                if self.params.have_ipc:
+                        alignment = [ Qt.AlignLeft, Qt.AlignLeft, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight ]
+                else:
+                        alignment = [ Qt.AlignLeft, Qt.AlignLeft, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight, Qt.AlignRight ]
                 return alignment[column]
 
         def DoFindSelect(self, query, match):