summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohannes Stoelp <johannes.stoelp@gmail.com>2024-10-04 19:10:04 +0200
committerJohannes Stoelp <johannes.stoelp@gmail.com>2024-10-04 19:10:04 +0200
commit28372905a333f0678b836f6f289ad546f758103c (patch)
tree4d963ed0d9c17d42431f688d13056ba156e5f8ad
parent751fc86a8826b3af827a83629309e399788a1bad (diff)
downloadlibperf-main.tar.gz
libperf-main.zip
move pmc descriptors into own headerHEADmain
-rw-r--r--example/counting.cc22
-rw-r--r--perf.hpp8
-rw-r--r--pmc.hpp62
3 files changed, 74 insertions, 18 deletions
diff --git a/example/counting.cc b/example/counting.cc
index a2af7f9..5d086f6 100644
--- a/example/counting.cc
+++ b/example/counting.cc
@@ -1,18 +1,16 @@
-#include <linux/perf_event.h>
#include "perf.hpp"
+#include <cstdio>
+
int main() {
- perf_group pg({
- {.name = "CPUCLK",
- .type = PERF_TYPE_SOFTWARE,
- .config = PERF_COUNT_SW_CPU_CLOCK},
- {.name = "TASK",
- .type = PERF_TYPE_SOFTWARE,
- .config = PERF_COUNT_SW_TASK_CLOCK},
- {.name = "INSN",
- .type = PERF_TYPE_HARDWARE,
- .config = PERF_COUNT_HW_INSTRUCTIONS},
- });
+ perf_group pg({PMC_CPU_CLK, PMC_TASK_CLK, PMC_INSN, PMC_CYCLES});
+
+ std::puts("- start-stop-dump");
+ pg.start();
+ pg.stop();
+ pg.dump();
+
+ std::puts("- start-2nop-stop-dump");
pg.start();
asm volatile("nop");
asm volatile("nop");
diff --git a/perf.hpp b/perf.hpp
index b504e74..3b202ef 100644
--- a/perf.hpp
+++ b/perf.hpp
@@ -25,6 +25,8 @@
#ifndef LIBPERF_HPP
#define LIBPERF_HPP
+#include "pmc.hpp"
+
#include <asm/unistd.h>
#include <asm/unistd_64.h>
#include <linux/perf_event.h>
@@ -72,12 +74,6 @@ static inline void read(int fd, T& buf) {
class perf_group {
public:
- struct pmc_desc {
- const char* name;
- uint64_t type;
- uint64_t config;
- };
-
enum mode : bool {
RUN_SINGLE = false,
RUN_GROUP = true,
diff --git a/pmc.hpp b/pmc.hpp
new file mode 100644
index 0000000..8bd5dc0
--- /dev/null
+++ b/pmc.hpp
@@ -0,0 +1,62 @@
+/**
+ * MIT License
+ *
+ * Copyright (c) 2024 Johannes Stölp
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ * SOFTWARE.
+ **/
+
+#ifndef LIBPERF_PMC_HPP
+#define LIBPERF_PMC_HPP
+
+#include <linux/perf_event.h>
+
+#include <cstdint>
+
+struct pmc_desc {
+ const char* name;
+ uint64_t type;
+ uint64_t config;
+};
+
+inline constexpr pmc_desc PMC_CPU_CLK{
+ .name = "CPUCLK",
+ .type = PERF_TYPE_SOFTWARE,
+ .config = PERF_COUNT_SW_CPU_CLOCK,
+};
+
+inline constexpr pmc_desc PMC_TASK_CLK{
+ .name = "TASK",
+ .type = PERF_TYPE_SOFTWARE,
+ .config = PERF_COUNT_SW_TASK_CLOCK,
+};
+
+inline constexpr pmc_desc PMC_INSN{
+ .name = "INSN",
+ .type = PERF_TYPE_HARDWARE,
+ .config = PERF_COUNT_HW_INSTRUCTIONS,
+};
+
+inline constexpr pmc_desc PMC_CYCLES{
+ .name = "CYCLES",
+ .type = PERF_TYPE_HARDWARE,
+ .config = PERF_COUNT_HW_CPU_CYCLES,
+};
+
+#endif