Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Push 2024 09 15 #829

Merged
merged 14 commits into from
Sep 16, 2024
Merged

Push 2024 09 15 #829

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
a3e671a
Update README.md
rdementi Aug 12, 2024
68f3d92
Fix public github #810
ogbrugge-work Aug 13, 2024
3eac69a
Merge remote-tracking branch 'opcm-github/master'
rdementi Aug 18, 2024
e3960c0
pcm-power for SRF
rdementi Jul 1, 2024
9be2daf
Added license to Dockerfile
twillhal Aug 22, 2024
4f1eaf7
pcm-memory: replace NODE with SKT to avoid confusion with NUMA NODEs
rdementi Sep 10, 2024
ddd96d9
Merge remote-tracking branch 'opcm-github/master'
rdementi Sep 10, 2024
992bd90
add perfmon event repository as submodule for convenience
rdementi Aug 8, 2024
49c76a8
pcm-raw: update instructions for perfmon event map/files
rdementi Aug 8, 2024
471de17
add CPM.cmake
rdementi Sep 11, 2024
475f22e
specify a stable URL for WinPMem
rdementi Sep 11, 2024
f00fc7b
add inital support for LNL (Lunar Lake)
rdementi Sep 11, 2024
1cbf558
support free-running BW counters on LNL
rdementi Sep 11, 2024
da08f11
add GNR support
rdementi Sep 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitmodules
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
[submodule "src/simdjson"]
path = src/simdjson
url = https://github.com/simdjson/simdjson.git
[submodule "perfmon"]
path = perfmon
url = https://github.com/intel/perfmon
24 changes: 24 additions & 0 deletions cmake/CPM.cmake
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
# SPDX-License-Identifier: MIT
#
# SPDX-FileCopyrightText: Copyright (c) 2019-2023 Lars Melchior and contributors

set(CPM_DOWNLOAD_VERSION 0.40.2)
set(CPM_HASH_SUM "c8cdc32c03816538ce22781ed72964dc864b2a34a310d3b7104812a5ca2d835d")

if(CPM_SOURCE_CACHE)
set(CPM_DOWNLOAD_LOCATION "${CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
elseif(DEFINED ENV{CPM_SOURCE_CACHE})
set(CPM_DOWNLOAD_LOCATION "$ENV{CPM_SOURCE_CACHE}/cpm/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
else()
set(CPM_DOWNLOAD_LOCATION "${CMAKE_BINARY_DIR}/cmake/CPM_${CPM_DOWNLOAD_VERSION}.cmake")
endif()

# Expand relative path. This is important if the provided path contains a tilde (~)
get_filename_component(CPM_DOWNLOAD_LOCATION ${CPM_DOWNLOAD_LOCATION} ABSOLUTE)

file(DOWNLOAD
https://github.com/cpm-cmake/CPM.cmake/releases/download/v${CPM_DOWNLOAD_VERSION}/CPM.cmake
${CPM_DOWNLOAD_LOCATION} EXPECTED_HASH SHA256=${CPM_HASH_SUM}
)

include(${CPM_DOWNLOAD_LOCATION})
1 change: 1 addition & 0 deletions perfmon
Open in desktop
Submodule perfmon added at f8c51c
158 changes: 158 additions & 0 deletions src/PMURegisterDeclarations/GenuineIntel-6-AD-0.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,158 @@
{
"core" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"User": {"Config": 0, "Position": 16, "Width": 1, "DefaultValue": 1},
"OS": {"Config": 0, "Position": 17, "Width": 1, "DefaultValue": 1},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1},
"PinControl": {"Config": 0, "Position": 19, "Width": 1, "DefaultValue": 0},
"APICInt": {"Config": 0, "Position": 20, "Width": 1, "DefaultValue": 0},
"Enable": {"Config": 0, "Position": 22, "Width": 1, "DefaultValue": 1},
"Invert": {"Config": 0, "Position": 23, "Width": 1},
"CounterMask": {"Config": 0, "Position": 24, "Width": 8},
"InTX": {"Config": 0, "Position": 32, "Width": 1, "DefaultValue": 0},
"InTXCheckpointed": {"Config": 0, "Position": 33, "Width": 1, "DefaultValue": 0},
"MSRIndex": {
"0x1a6" : {"Config": 1, "Position": 0, "Width": 64},
"0x1a7" : {"Config": 2, "Position": 0, "Width": 64},
"0x3f6" : {"Config": 3, "Position": 0, "Width": 64},
"0x3f7" : {"Config": 4, "Position": 0, "Width": 64}
}
},
"fixed0" : {
"OS": {"Config": 0, "Position": 0, "Width": 1, "DefaultValue": 1},
"User": {"Config": 0, "Position": 1, "Width": 1, "DefaultValue": 1},
"EnablePMI": {"Config": 0, "Position": 3, "Width": 1, "DefaultValue": 0},
"EventCode": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"UMask": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"EdgeDetect": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"Invert": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"CounterMask": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"}
},
"fixed1" : {
"OS": {"Config": 0, "Position": 4, "Width": 1, "DefaultValue": 1},
"User": {"Config": 0, "Position": 5, "Width": 1, "DefaultValue": 1},
"EnablePMI": {"Config": 0, "Position": 7, "Width": 1, "DefaultValue": 0},
"EventCode": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"UMask": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"EdgeDetect": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"Invert": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"CounterMask": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"}
},
"fixed2" : {
"OS": {"Config": 0, "Position": 8, "Width": 1, "DefaultValue": 1},
"User": {"Config": 0, "Position": 9, "Width": 1, "DefaultValue": 1},
"EnablePMI": {"Config": 0, "Position": 11, "Width": 1, "DefaultValue": 0},
"EventCode": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"UMask": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"EdgeDetect": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"Invert": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"CounterMask": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"}
},
"fixed3" : {
"OS": {"Config": 0, "Position": 12, "Width": 1, "DefaultValue": 1},
"User": {"Config": 0, "Position": 13, "Width": 1, "DefaultValue": 1},
"EnablePMI": {"Config": 0, "Position": 15, "Width": 1, "DefaultValue": 0},
"EventCode": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"UMask": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"EdgeDetect": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"Invert": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"CounterMask": {"Config": 0, "Position": -1, "__comment": "position=-1 means field ignored"},
"PerfMetrics": {"Config": 2, "Position": 0, "Width": 1, "DefaultValue": 0, "__comment": "fake field to tell the collector to also print the L1 top-down metrics, not just raw slots count"}
}
},
"cha" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"TIDEnable": {"Config": 0, "Position": 16, "Width": 1, "DefaultValue": 0},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
"Threshold": {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0},
"UMaskExt": {"Config": 0, "Position": 32, "Width": 26},
"TID": {"Config": 1, "Position": 0, "Width": 10, "DefaultValue": 0}
}
},
"imc" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
"Threshold": {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0}
}
},
"xpi" : {
"__comment" : "this is for UPI LL and QPI LL uncore PMUs",
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
"Threshold": {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0},
"UMaskExt": {"Config": 0, "Position": 32, "Width": 24}
}
},
"m2m" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
"Threshold": {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0},
"UMaskExt": {"Config": 0, "Position": 32, "Width": 8}
}
},
"m3upi" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
"Threshold": {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0}
}
},
"mdf" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
"Threshold": {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0}
}
},
"irp" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
"Threshold": {"Config": 0, "Position": 24, "Width": 8, "DefaultValue": 0}
}
},
"pcu" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0}
}
},
"pciex8" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0}
}
},
"pciex16" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0}
}
},
"iio" : {
"programmable" : {
"EventCode": {"Config": 0, "Position": 0, "Width": 8},
"UMask": {"Config": 0, "Position": 8, "Width": 8},
"EdgeDetect": {"Config": 0, "Position": 18, "Width": 1, "DefaultValue": 0},
"Threshold": {"Config": 0, "Position": 24, "Width": 12, "DefaultValue": 0},
"PortMask": {"Config": 0, "Position": 36, "Width": 12},
"FCMask": {"Config": 0, "Position": 48, "Width": 3}
}
}
}
Loading