summaryrefslogtreecommitdiff
path: root/simpleperf
diff options
context:
space:
mode:
authorTreehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com>2024-04-17 20:37:54 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2024-04-17 20:37:54 +0000
commitc6e61744bebed592d53699c66920fd7343e30fc9 (patch)
tree80d4df3e80ceba87213962bc9d0c4d0927f51830 /simpleperf
parentf7d8406bac7c01bf0f2e1f3e7d0a194877fa7879 (diff)
parent08466993b70e29d853b12f266de07054b9add4f2 (diff)
downloadextras-c6e61744bebed592d53699c66920fd7343e30fc9.tar.gz
Merge "simpleperf: Mark cycle counting in ETM config register." into main
Diffstat (limited to 'simpleperf')
-rw-r--r--simpleperf/ETMConstants.h1
-rw-r--r--simpleperf/ETMRecorder.cpp1
2 files changed, 2 insertions, 0 deletions
diff --git a/simpleperf/ETMConstants.h b/simpleperf/ETMConstants.h
index 78e9cc26..003d88ab 100644
--- a/simpleperf/ETMConstants.h
+++ b/simpleperf/ETMConstants.h
@@ -24,6 +24,7 @@ static constexpr int ETM_OPT_CTXTID = 14;
static constexpr int ETM_OPT_CTXTID2 = 15;
static constexpr int ETM_OPT_TS = 28;
// For etm_config_reg:
+static constexpr int ETM4_CFG_BIT_CCI = 4;
static constexpr int ETM4_CFG_BIT_CTXTID = 6;
static constexpr int ETM4_CFG_BIT_VMID = 7;
static constexpr int ETM4_CFG_BIT_TS = 11;
diff --git a/simpleperf/ETMRecorder.cpp b/simpleperf/ETMRecorder.cpp
index cde1eb2b..a722df5c 100644
--- a/simpleperf/ETMRecorder.cpp
+++ b/simpleperf/ETMRecorder.cpp
@@ -229,6 +229,7 @@ void ETMRecorder::BuildEtmConfig() {
}
if (cycles_supported) {
etm_event_config_ |= 1ULL << ETM_OPT_CYCACC;
+ etm_config_reg_ |= 1U << ETM4_CFG_BIT_CCI;
if (cycle_threshold_) {
cc_threshold_config_ |= cycle_threshold_;