added nvtx support

Author: AndrewBMadison

CMakeLists.txt

@@ -355,9 +355,33 @@ add_library(RNG STATIC ${RNG_Source})
 
 
 # Create Utils library
-file(GLOB Utils_Source  Simulator/Utils/*.cpp Simulator/Utils/*.h)
+file(GLOB Utils_Source Simulator/Utils/*.cpp Simulator/Utils/*.h)
 list(REMOVE_ITEM Utils_Source "${CMAKE_CURRENT_SOURCE_DIR}/Simulator/Utils/Factory.cpp")
-add_library(Utils  ${Utils_Source})
+
+if(CMAKE_BUILD_TYPE STREQUAL "Profiling")
+        if(ENABLE_CUDA)
+# Find NVTX Library
+                find_library(NVTX_LIBRARY nvToolsExt)
+                if(NVTX_LIBRARY)
+                        message(STATUS "Found NVTX: ${NVTX_LIBRARY} included in Profiling")
+                        add_compile_definitions(ENABLE_NVTX) 
+                else()
+                        message(STATUS "NVTX library not found! Not included in Profiling.")
+                        list(REMOVE_ITEM Utils_Source "${CMAKE_CURRENT_SOURCE_DIR}/Simulator/Utils/NvtxHelper.cpp")
+                endif()
+        endif()
+
+else()
+        list(REMOVE_ITEM Utils_Source "${CMAKE_CURRENT_SOURCE_DIR}/Simulator/Utils/NvtxHelper.cpp")
+endif()
+
+# Always create the Utils library (even if NVTX and CUDA are missing)
+add_library(Utils ${Utils_Source})
+
+# Only link NVTX if it was found
+if(NVTX_LIBRARY)
+        target_link_libraries(Utils PRIVATE ${NVTX_LIBRARY})
+endif()
 
 
 # Used to locate and run other CMakeLists.txt files from Third Party resources for further compilation of the project.

Simulator/Core/GPUModel.cpp

@@ -13,6 +13,7 @@
 #include "AllVertices.h"
 #include "Connections.h"
 #include "Global.h"
+#include "NvtxHelper.h"
 
 #ifdef PERFORMANCE_METRICS
 float g_time;
@@ -186,9 +187,11 @@ void GPUModel::calcSummationPoint()
    int blocksPerGrid
       = (Simulator::getInstance().getTotalVertices() + threadsPerBlock - 1) / threadsPerBlock;
 
+   nvtxPushColor("calcSummation", GREEN);
    calcSummationPointDevice<<<blocksPerGrid, threadsPerBlock>>>(
       Simulator::getInstance().getTotalVertices(), allVerticesDevice_, synapseIndexMapDevice_,
       allEdgesDevice_);
+   nvtxPop();
 }
 
 /// Update the connection of all the Neurons and Synapses of the simulation.

Simulator/Utils/NvtxHelper.cpp

@@ -0,0 +1,21 @@
+#include "NvtxHelper.h"
+#include <cuda_runtime.h>
+#include <nvToolsExt.h>
+
+void nvtxPushColor(const std::string &name, uint32_t color)
+{
+   nvtxEventAttributes_t eventAttrib = {};
+   eventAttrib.version = NVTX_VERSION;
+   eventAttrib.size = NVTX_EVENT_ATTRIB_STRUCT_SIZE;
+   eventAttrib.colorType = NVTX_COLOR_ARGB;
+   eventAttrib.color = color;
+   eventAttrib.messageType = NVTX_MESSAGE_TYPE_ASCII;
+   eventAttrib.message.ascii = name.c_str();
+
+   nvtxRangePushEx(&eventAttrib);
+}
+
+void nvtxPop()
+{
+   nvtxRangePop();
+}

Simulator/Utils/NvtxHelper.h

@@ -0,0 +1,34 @@
+#ifndef NVTX_HELPER_H
+#define NVTX_HELPER_H
+
+#include <cstdint>
+#include <string>
+
+// Define NVTX colors (ARGB format)
+#define RED 0xFFFF0000      // Red
+#define GREEN 0xFF00FF00    // Green
+#define BLUE 0xFF0000FF     // Blue
+#define YELLOW 0xFFFFFF00   // Yellow
+#define ORANGE 0xFFFFA500   // Orange
+#define PURPLE 0xFF800080   // Purple
+
+#ifdef ENABLE_NVTX
+
+// Function to push an NVTX range with a given name and color
+void nvtxPushColor(const std::string &name, uint32_t color);
+
+// Function to pop the most recent NVTX range
+void nvtxPop();
+
+#else
+inline void nvtxPushColor(const std::string &, uint32_t)
+{
+}
+inline void nvtxPop()
+{
+}
+
+#endif   // ENABLE_NVTX
+
+
+#endif   // NVTX_HELPER_H