Cleaning up trace event stream names

UO-OACISS · Jul 30, 2020 · 1ea3789 · 1ea3789
1 parent ce512e9
commit 1ea3789
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 3 deletions.
diff --git a/src/apex/trace_event_listener.cpp b/src/apex/trace_event_listener.cpp
@@ -9,6 +9,7 @@
 #include <iostream>
 #include <fstream>
 #include <memory>
+#include <iomanip>
 
 using namespace std;
 
@@ -202,9 +203,12 @@ std::string trace_event_listener::make_tid (uint32_t device, uint32_t context, u
            << ",\"args\":{\"name\":"
            << "\"GPU Dev:" << device;
         if (context > 0) {
-            ss << " Ctx:" << context;
+            ss << std::setfill('0');
+            ss << " Ctx:";
+            ss << std::setw(2) << context;
             if (stream > 0) {
-                ss << " Str:" << stream;
+                ss << " Str:";
+                ss << setw(5) << stream;
             }
         }
         ss << "\"";

diff --git a/src/unit_tests/CUDA/CMakeLists.txt b/src/unit_tests/CUDA/CMakeLists.txt
@@ -7,6 +7,7 @@ link_directories (${APEX_BINARY_DIR}/src/apex)
 
 set(example_programs
     apex_cuda
+    apex_multi_cuda
     apex_vector
     multiGpuThread
    )

diff --git a/src/unit_tests/CUDA/apex_cuda.cu b/src/unit_tests/CUDA/apex_cuda.cu
@@ -2,7 +2,7 @@
 #include <stdio.h>
 #include "apex_api.hpp"
 
-#define ITERATIONS 64
+#define ITERATIONS 4
 
 #define RUNTIME_API_CALL(apiFuncCall)                                          \
 do {                                                                           \