Fix omnitrace-avail component list (#328)

* Fix omnitrace-avail component list - remove omnitrace components from `omnitrace-avail -C` since these are no-ops in OMNITRACE_TIMEMORY_COMPONENTS * Fix omnitrace-avail-filter-wall-clock-available test
ROCm · Jan 11, 2024 · 77d5281 · 77d5281
1 parent edd6f57
commit 77d5281
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 39 deletions.
diff --git a/source/bin/tests/CMakeLists.txt b/source/bin/tests/CMakeLists.txt
@@ -271,7 +271,7 @@ omnitrace_add_bin_test(
     LABELS "omnitrace-avail"
     TIMEOUT 45
     PASS_REGEX
-        "\\\|[-]+\\\|\n\\\|[ ]+COMPONENT[ ]+\\\|\n\\\|[-]+\\\|\n\\\| (wall_clock)[ ]+\\\|\n\\\| (sampling_wall_clock)[ ]+\\\|\n\\\|[-]+\\\|"
+        "\\\|[-]+\\\|\n\\\|[ ]+COMPONENT[ ]+\\\|\n\\\|[-]+\\\|\n\\\| (wall_clock)[ ]+\\\|\n\\\|[-]+\\\|"
     )
 
 omnitrace_add_bin_test(

diff --git a/source/lib/core/components/fwd.hpp b/source/lib/core/components/fwd.hpp
@@ -160,27 +160,6 @@ TIMEMORY_SET_COMPONENT_API(omnitrace::component::sampling_gpu_temp, project::omn
                            category::temperature, category::sampling,
                            category::process_sampling)
 
-TIMEMORY_PROPERTY_SPECIALIZATION(omnitrace::component::roctracer, OMNITRACE_ROCTRACER,
-                                 "roctracer", "omnitrace_roctracer")
-TIMEMORY_PROPERTY_SPECIALIZATION(omnitrace::component::rocprofiler, OMNITRACE_ROCPROFILER,
-                                 "rocprofiler", "omnitrace_rocprofiler")
-TIMEMORY_PROPERTY_SPECIALIZATION(omnitrace::component::sampling_wall_clock,
-                                 OMNITRACE_SAMPLING_WALL_CLOCK, "sampling_wall_clock", "")
-TIMEMORY_PROPERTY_SPECIALIZATION(omnitrace::component::sampling_cpu_clock,
-                                 OMNITRACE_SAMPLING_CPU_CLOCK, "sampling_cpu_clock", "")
-TIMEMORY_PROPERTY_SPECIALIZATION(omnitrace::component::sampling_percent,
-                                 OMNITRACE_SAMPLING_PERCENT, "sampling_percent", "")
-TIMEMORY_PROPERTY_SPECIALIZATION(omnitrace::component::sampling_gpu_busy,
-                                 OMNITRACE_SAMPLING_GPU_BUSY, "sampling_gpu_busy",
-                                 "sampling_gpu_util")
-TIMEMORY_PROPERTY_SPECIALIZATION(omnitrace::component::sampling_gpu_memory,
-                                 OMNITRACE_SAMPLING_GPU_MEMORY_USAGE,
-                                 "sampling_gpu_memory_usage", "")
-TIMEMORY_PROPERTY_SPECIALIZATION(omnitrace::component::sampling_gpu_power,
-                                 OMNITRACE_SAMPLING_GPU_POWER, "sampling_gpu_power", "")
-TIMEMORY_PROPERTY_SPECIALIZATION(omnitrace::component::sampling_gpu_temp,
-                                 OMNITRACE_SAMPLING_GPU_TEMP, "sampling_gpu_temp", "")
-
 TIMEMORY_METADATA_SPECIALIZATION(omnitrace::component::roctracer, "roctracer",
                                  "High-precision ROCm API and kernel tracing", "")
 TIMEMORY_METADATA_SPECIALIZATION(omnitrace::component::rocprofiler, "rocprofiler",

diff --git a/source/lib/core/defines.hpp.in b/source/lib/core/defines.hpp.in
@@ -24,23 +24,6 @@
 
 #include "common/defines.h"
 
-#define TIMEMORY_USER_COMPONENT_ENUM                                                     \
-    OMNITRACE_ROCTRACER_idx, OMNITRACE_ROCPROFILER_idx,                                  \
-        OMNITRACE_SAMPLING_WALL_CLOCK_idx, OMNITRACE_SAMPLING_CPU_CLOCK_idx,             \
-        OMNITRACE_SAMPLING_PERCENT_idx, OMNITRACE_SAMPLING_GPU_POWER_idx,                \
-        OMNITRACE_SAMPLING_GPU_TEMP_idx, OMNITRACE_SAMPLING_GPU_BUSY_idx,                \
-        OMNITRACE_SAMPLING_GPU_MEMORY_USAGE_idx,
-
-#define OMNITRACE_ROCTRACER                 OMNITRACE_ROCTRACER_idx
-#define OMNITRACE_ROCPROFILER               OMNITRACE_ROCPROFILER_idx
-#define OMNITRACE_SAMPLING_WALL_CLOCK       OMNITRACE_SAMPLING_WALL_CLOCK_idx
-#define OMNITRACE_SAMPLING_CPU_CLOCK        OMNITRACE_SAMPLING_CPU_CLOCK_idx
-#define OMNITRACE_SAMPLING_PERCENT          OMNITRACE_SAMPLING_PERCENT_idx
-#define OMNITRACE_SAMPLING_GPU_POWER        OMNITRACE_SAMPLING_GPU_POWER_idx
-#define OMNITRACE_SAMPLING_GPU_TEMP         OMNITRACE_SAMPLING_GPU_TEMP_idx
-#define OMNITRACE_SAMPLING_GPU_BUSY         OMNITRACE_SAMPLING_GPU_BUSY_idx
-#define OMNITRACE_SAMPLING_GPU_MEMORY_USAGE OMNITRACE_SAMPLING_GPU_MEMORY_USAGE_idx
-
 #define OMNITRACE_METADATA(...) ::tim::manager::add_metadata(__VA_ARGS__)
 
 #if !defined(OMNITRACE_DEFAULT_OBJECT)