From d005df4c1656e80dee4743ee04823f9a1d82e0f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Milo=C5=A1=20Stojanovi=C4=87?= Date: Thu, 19 Dec 2019 12:52:15 +0100 Subject: [PATCH] [llvm-exegesis] Fix pfm counter names for Haswell for older versions of libpfm The inconsistency caused uops mode to fail on an older version of libpfm since the dispatched_port was added as an alias for executed_port only after v4.6.0 of libpfm. Differential revision: https://reviews.llvm.org/D71665 --- llvm/lib/Target/X86/X86PfmCounters.td | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/llvm/lib/Target/X86/X86PfmCounters.td b/llvm/lib/Target/X86/X86PfmCounters.td index 5610f4bc8873..93238983afa2 100644 --- a/llvm/lib/Target/X86/X86PfmCounters.td +++ b/llvm/lib/Target/X86/X86PfmCounters.td @@ -81,14 +81,14 @@ def HaswellPfmCounters : ProcPfmCounters { let CycleCounter = UnhaltedCoreCyclesPfmCounter; let UopsCounter = UopsIssuedPfmCounter; let IssueCounters = [ - PfmIssueCounter<"HWPort0", "uops_dispatched_port:port_0">, - PfmIssueCounter<"HWPort1", "uops_dispatched_port:port_1">, - PfmIssueCounter<"HWPort2", "uops_dispatched_port:port_2">, - PfmIssueCounter<"HWPort3", "uops_dispatched_port:port_3">, - PfmIssueCounter<"HWPort4", "uops_dispatched_port:port_4">, - PfmIssueCounter<"HWPort5", "uops_dispatched_port:port_5">, - PfmIssueCounter<"HWPort6", "uops_dispatched_port:port_6">, - PfmIssueCounter<"HWPort7", "uops_dispatched_port:port_7"> + PfmIssueCounter<"HWPort0", "uops_executed_port:port_0">, + PfmIssueCounter<"HWPort1", "uops_executed_port:port_1">, + PfmIssueCounter<"HWPort2", "uops_executed_port:port_2">, + PfmIssueCounter<"HWPort3", "uops_executed_port:port_3">, + PfmIssueCounter<"HWPort4", "uops_executed_port:port_4">, + PfmIssueCounter<"HWPort5", "uops_executed_port:port_5">, + PfmIssueCounter<"HWPort6", "uops_executed_port:port_6">, + PfmIssueCounter<"HWPort7", "uops_executed_port:port_7"> ]; } def : PfmCountersBinding<"haswell", HaswellPfmCounters>;