diff --git a/profiling/nvprof-connector/CMakeLists.txt b/profiling/nvtx-connector/CMakeLists.txt similarity index 100% rename from profiling/nvprof-connector/CMakeLists.txt rename to profiling/nvtx-connector/CMakeLists.txt diff --git a/profiling/nvprof-connector/Makefile b/profiling/nvtx-connector/Makefile similarity index 69% rename from profiling/nvprof-connector/Makefile rename to profiling/nvtx-connector/Makefile index bff0a30cf..8dac2a446 100644 --- a/profiling/nvprof-connector/Makefile +++ b/profiling/nvtx-connector/Makefile @@ -4,15 +4,15 @@ LDFLAGS=-L$(CUDA_ROOT)/lib64 LIBS=-lnvToolsExt SHARED_CXXFLAGS=-shared -fPIC -all: kp_nvprof_connector.so +all: kp_nvtx_connector.so MAKEFILE_PATH := $(subst Makefile,,$(abspath $(lastword $(MAKEFILE_LIST)))) CXXFLAGS+=-I${MAKEFILE_PATH} -I${MAKEFILE_PATH}/../../common/makefile-only -I${MAKEFILE_PATH}../all -kp_nvprof_connector.so: ${MAKEFILE_PATH}kp_nvprof_connector.cpp +kp_nvtx_connector.so: ${MAKEFILE_PATH}kp_nvtx_connector.cpp $(CXX) $(SHARED_CXXFLAGS) $(CXXFLAGS) $(LDFLAGS) \ - -o $@ ${MAKEFILE_PATH}kp_nvprof_connector.cpp $(LIBS) + -o $@ ${MAKEFILE_PATH}kp_nvtx_connector.cpp $(LIBS) clean: - rm *.so + rm -f kp_nvtx_connector.so diff --git a/profiling/nvprof-connector/kp_nvprof_connector.cpp b/profiling/nvtx-connector/kp_nvtx_connector.cpp similarity index 91% rename from profiling/nvprof-connector/kp_nvprof_connector.cpp rename to profiling/nvtx-connector/kp_nvtx_connector.cpp index 2db81ff29..dd845e75f 100644 --- a/profiling/nvprof-connector/kp_nvprof_connector.cpp +++ b/profiling/nvtx-connector/kp_nvtx_connector.cpp @@ -124,6 +124,21 @@ void kokkosp_stop_profile_section(const uint32_t sID) { nvtxRangeEnd(section.id); } +void kokkosp_profile_event(const char* name) { nvtxMarkA(name); } + +void kokkosp_begin_fence(const char* name, const uint32_t deviceId, + uint64_t* handle) { + if (nullptr == name) { + name = "anon. Kokkos fence"; + } + nvtxRangeId_t id = nvtxRangeStartA(name); + *handle = id; // handle will be provided back to end_fence +} +void kokkosp_end_fence(uint64_t handle) { + nvtxRangeId_t id = handle; + nvtxRangeEnd(id); +} + } // namespace NVProfConnector } // namespace KokkosTools @@ -143,4 +158,4 @@ EXPOSE_END_PARALLEL_SCAN(impl::kokkosp_end_parallel_scan) EXPOSE_BEGIN_PARALLEL_REDUCE(impl::kokkosp_begin_parallel_reduce) EXPOSE_END_PARALLEL_REDUCE(impl::kokkosp_end_parallel_reduce) // TODO: expose section stuff -} // extern "C" +} // extern "C" \ No newline at end of file diff --git a/profiling/nvprof-connector/kp_nvprof_connector_domain.h b/profiling/nvtx-connector/kp_nvtx_connector_domain.h similarity index 100% rename from profiling/nvprof-connector/kp_nvprof_connector_domain.h rename to profiling/nvtx-connector/kp_nvtx_connector_domain.h