The branch main has been updated by mhorne:

URL: 
https://cgit.FreeBSD.org/src/commit/?id=1be8ef26794dcf93e2f4851474808dc3b34dbcbd

commit 1be8ef26794dcf93e2f4851474808dc3b34dbcbd
Author:     Mitchell Horne <mho...@freebsd.org>
AuthorDate: 2023-05-05 21:55:54 +0000
Commit:     Mitchell Horne <mho...@freebsd.org>
CommitDate: 2023-05-06 17:49:18 +0000

    hwpmc: drop vestigial IAP event definitions
    
    These are maintained elsewhere. No functional change.
    
    Reviewed by:    jkoshy
    MFC after:      2 weeks
    Sponsored by:   The FreeBSD Foundation
    Differential Revision:  https://reviews.freebsd.org/D39900
---
 sys/dev/hwpmc/pmc_events.h | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/sys/dev/hwpmc/pmc_events.h b/sys/dev/hwpmc/pmc_events.h
index e1b97f5a1948..dd31107de9e7 100644
--- a/sys/dev/hwpmc/pmc_events.h
+++ b/sys/dev/hwpmc/pmc_events.h
@@ -204,22 +204,6 @@ __PMC_EV_ALIAS("instruction-retired",      
IAF_INSTR_RETIRED_ANY)          \
 __PMC_EV_ALIAS("unhalted-core-cycles", IAF_CPU_CLK_UNHALTED_CORE)      \
 __PMC_EV_ALIAS("unhalted-reference-cycles", IAF_CPU_CLK_UNHALTED_REF)
 
-
-#define        PMC_EV_IAP_FIRST        PMC_EV_IAP_ARCH_BR_INS_RET
-#define        PMC_EV_IAP_LAST         PMC_EV_IAP_EVENT_FDH_40H
-
-/*
- * Map "architectural" event names to event ids.
- */
-#define        __PMC_EV_ALIAS_INTEL_ARCHITECTURAL()                            
\
-__PMC_EV_ALIAS("branch-instruction-retired",   IAP_ARCH_BR_INS_RET)    \
-__PMC_EV_ALIAS("branch-misses-retired",                IAP_ARCH_BR_MIS_RET)    
\
-__PMC_EV_ALIAS("instruction-retired",          IAP_ARCH_INS_RET)       \
-__PMC_EV_ALIAS("llc-misses",                   IAP_ARCH_LLC_MIS)       \
-__PMC_EV_ALIAS("llc-reference",                        IAP_ARCH_LLC_REF)       
\
-__PMC_EV_ALIAS("unhalted-reference-cycles",    IAP_ARCH_UNH_REF_CYC)   \
-__PMC_EV_ALIAS("unhalted-core-cycles",         IAP_ARCH_UNH_COR_CYC)
-
 #define        __PMC_EV_UCP()                          \
        __PMC_EV(UCP, EVENT_0CH_04H_E)                                     \
        __PMC_EV(UCP, EVENT_0CH_04H_F)                                     \

Reply via email to