Rebase onto master

tud-zih-energy · Apr 27, 2023 · dc2d7bf · dc2d7bf
1 parent dce31c2
commit dc2d7bf
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/include/lo2s/perf/event_description.hpp b/include/lo2s/perf/event_description.hpp
@@ -197,7 +197,7 @@ struct EventDescription
         // Needed when scaling multiplexed events, and recognize activation phases
         perf_attr.read_format = PERF_FORMAT_TOTAL_TIME_ENABLED | PERF_FORMAT_TOTAL_TIME_RUNNING;
 
-#if !defined(USE_HW_BREAKPOINT_COMPAT) && defined(USE_PERF_CLOCKID)
+#ifndef USE_HW_BREAKPOINT_COMPAT
         perf_attr.use_clockid = config().use_clockid;
         perf_attr.clockid = config().clockid;
 #endif

diff --git a/include/lo2s/perf/sample/reader.hpp b/include/lo2s/perf/sample/reader.hpp
@@ -100,7 +100,7 @@ class Reader : public EventReader<T>
             perf_attr.mmap = 1;
             perf_attr.disabled = 1;
 
-#if !defined(USE_HW_BREAKPOINT_COMPAT) && defined(USE_PERF_CLOCKID)
+#ifndef USE_HW_BREAKPOINT_COMPAT
             perf_attr.use_clockid = config().use_clockid;
             perf_attr.clockid = config().clockid;
 #endif

diff --git a/src/perf/counter/group/reader.cpp b/src/perf/counter/group/reader.cpp
@@ -57,7 +57,7 @@ Reader<T>::Reader(ExecutionScope scope, bool enable_on_exec)
 
     leader_attr.disabled = 1;
 
-#if !defined(USE_HW_BREAKPOINT_COMPAT) && defined(USE_PERF_CLOCKID)
+#ifndef USE_HW_BREAKPOINT_COMPAT
     leader_attr.use_clockid = config().use_clockid;
     leader_attr.clockid = config().clockid;
 #endif