Move kpep reading out of profiler's initializer

fzhinkin · Mar 23, 2024 · c79e77b · c79e77b
1 parent 4b49fa5
commit c79e77b
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/profiler/src/main/java/org/openjdk/jmh/profile/XCTraceNormProfiler.java b/profiler/src/main/java/org/openjdk/jmh/profile/XCTraceNormProfiler.java
@@ -75,10 +75,6 @@
  */
 public class XCTraceNormProfiler implements ExternalProfiler {
     private static final XCTraceTableDesc.TableType SUPPORTED_TABLE_TYPE = XCTraceTableDesc.TableType.COUNTERS_PROFILE;
-    private static final List<String> INSTRUCTIONS_COUNTERS
-            = KpepUtils.supportedEvents().aliases(KpepUtils.PerfEvents.INSTRUCTIONS);
-    private static final List<String> CYCLES_COUNTERS
-            = KpepUtils.supportedEvents().aliases(KpepUtils.PerfEvents.CYCLES);
 
     private final String tracingTemplate;
     private final Path temporaryFolder;
@@ -339,17 +335,18 @@ private Collection<? extends Result> processResults(BenchmarkResult br) {
 
         Collection<Result<?>> results = new ArrayList<>();
         {
+            KpepUtils.PerfEvents supportedEvents = KpepUtils.supportedEvents();
             Double insts = null;
             String instsName = null;
-            for (String name : INSTRUCTIONS_COUNTERS) {
+            for (String name : supportedEvents.aliases(KpepUtils.PerfEvents.INSTRUCTIONS)) {
                 if ((insts = aggregator.getCountOrNull(name)) != null) {
                     instsName = name;
                     break;
                 }
             }
             Double cycles = null;
             String cyclesName = null;
-            for (String name : CYCLES_COUNTERS) {
+            for (String name : supportedEvents.aliases(KpepUtils.PerfEvents.CYCLES)) {
                 if ((cycles = aggregator.getCountOrNull(name)) != null) {
                     cyclesName = name;
                     break;