commit 4241727b0578f8b63e505d26e0e7e30bf28ec763
author Simon Pilgrim <llvm-dev@redking.me.uk> Sun Dec 09 13:45:15 2018 +0000
committer Simon Pilgrim <llvm-dev@redking.me.uk> Sun Dec 09 13:45:15 2018 +0000
tree ace48d56eb1c42b405124424fb273e86149360d7
parent bdbf3db28d9ae94c82976186548fd5415f01ed73

[X86] Extend pfm counter coverage for llvm-exegesis

Extension to rL348617, turns out llvm-exegesis doesn't need to match the perf counter name against a scheduler model resource name - so I've added a few more counters that I could find in the libpfm4 source code (and fix a typo in the knl/knm retired_uops counter - which uses 'all' instead of 'any').

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@348721 91177308-0d34-0410-b5e6-96231b3b80d8

lib/Target/X86/X86PfmCounters.td

diff --git a/lib/Target/X86/X86PfmCounters.td b/lib/Target/X86/X86PfmCounters.td
index f38933a..a1a4210 100644
--- a/lib/Target/X86/X86PfmCounters.td
+++ b/lib/Target/X86/X86PfmCounters.td
@@ -56,8 +56,13 @@
 def : PfmCountersBinding<"goldmont", SLMPfmCounters>;
 def : PfmCountersBinding<"goldmont-plus", SLMPfmCounters>;
 def : PfmCountersBinding<"tremont", SLMPfmCounters>;
-def : PfmCountersBinding<"knl", SLMPfmCounters>;
-def : PfmCountersBinding<"knm", SLMPfmCounters>;
+
+def KnightPfmCounters : ProcPfmCounters {
+  let CycleCounter = UnhaltedCoreCyclesPfmCounter;
+  let UopsCounter = PfmCounter<"uops_retired:all">;
+}
+def : PfmCountersBinding<"knl", KnightPfmCounters>;
+def : PfmCountersBinding<"knm", KnightPfmCounters>;
 
 def SandyBridgePfmCounters : ProcPfmCounters {
   let CycleCounter = UnhaltedCoreCyclesPfmCounter;
@@ -161,9 +166,6 @@
 def : PfmCountersBinding<"athlon64-sse3", DefaultAMDPfmCounters>;
 def : PfmCountersBinding<"amdfam10", DefaultAMDPfmCounters>;
 def : PfmCountersBinding<"barcelona", DefaultAMDPfmCounters>;
-def : PfmCountersBinding<"btver1", DefaultAMDPfmCounters>;
-def : PfmCountersBinding<"bdver3", DefaultAMDPfmCounters>;
-def : PfmCountersBinding<"bdver4", DefaultAMDPfmCounters>;
 
 def BdVer2PfmCounters : ProcPfmCounters {
   let CycleCounter = PfmCounter<"cpu_clk_unhalted">;
@@ -178,6 +180,28 @@
 def : PfmCountersBinding<"bdver1", BdVer2PfmCounters>;
 def : PfmCountersBinding<"bdver2", BdVer2PfmCounters>;
 
+def BdVer3PfmCounters : ProcPfmCounters {
+  let CycleCounter = PfmCounter<"cpu_clk_unhalted">;
+  let UopsCounter = PfmCounter<"retired_uops">;
+  let IssueCounters = [
+    PfmIssueCounter<"SrFPU0", "dispatched_fpu_ops:ops_pipe0 + dispatched_fpu_ops:ops_dual_pipe0">,
+    PfmIssueCounter<"SrFPU1", "dispatched_fpu_ops:ops_pipe1 + dispatched_fpu_ops:ops_dual_pipe1">,
+    PfmIssueCounter<"SrFPU2", "dispatched_fpu_ops:ops_pipe2 + dispatched_fpu_ops:ops_dual_pipe2">
+  ];
+}
+def : PfmCountersBinding<"bdver3", BdVer3PfmCounters>;
+def : PfmCountersBinding<"bdver4", BdVer3PfmCounters>;
+
+def BtVer1PfmCounters : ProcPfmCounters {
+  let CycleCounter = PfmCounter<"cpu_clk_unhalted">;
+  let UopsCounter = PfmCounter<"retired_uops">;
+  let IssueCounters = [
+    PfmIssueCounter<"BtFPU0", "dispatched_fpu:pipe0">,
+    PfmIssueCounter<"BtFPU1", "dispatched_fpu:pipe1">
+  ];
+}
+def : PfmCountersBinding<"btver1", BtVer1PfmCounters>;
+
 def BtVer2PfmCounters : ProcPfmCounters {
   let CycleCounter = PfmCounter<"cpu_clk_unhalted">;
   let UopsCounter = PfmCounter<"retired_uops">;