From da34fa7ba2ebcc09a7b93d0dbd5afd14ae38734f Mon Sep 17 00:00:00 2001
From: Tim Besard <tim.besard@gmail.com>
Date: Sat, 12 Aug 2023 08:55:06 -0400
Subject: [PATCH] Fixes for CUDA 11.0.

---
 lib/cupti/wrappers.jl |  2 +-
 src/profile.jl        | 36 +++++++++++++++++++++++-------------
 2 files changed, 24 insertions(+), 14 deletions(-)

diff --git a/lib/cupti/wrappers.jl b/lib/cupti/wrappers.jl
index bbda1d3527..b8ca450baa 100644
--- a/lib/cupti/wrappers.jl
+++ b/lib/cupti/wrappers.jl
@@ -163,7 +163,7 @@ function process(f, cfg::ActivityConfig)
         elseif cuda_version >= v"11.1"
             CUpti_ActivityMemcpy4
         else # v"11.0"
-            CUpti_ActivityMemset3
+            CUpti_ActivityMemcpy3
         end
     activity_types[CUPTI_ACTIVITY_KIND_MEMSET] =
         if cuda_version >= v"11.6"
diff --git a/src/profile.jl b/src/profile.jl
index a25db061ef..e2576cdcd3 100644
--- a/src/profile.jl
+++ b/src/profile.jl
@@ -183,9 +183,11 @@ function emit_native_profile(code, kwargs)
         # memory operations
         CUPTI.CUPTI_ACTIVITY_KIND_MEMCPY,
         CUPTI.CUPTI_ACTIVITY_KIND_MEMSET,
-        # additional information for API host calls
-        CUPTI.CUPTI_ACTIVITY_KIND_MEMORY2,
     ]
+    if CUDA.runtime_version() >= v"11.2"
+        # additional information for API host calls
+        push!(activity_kinds, CUPTI.CUPTI_ACTIVITY_KIND_MEMORY2)
+    end
 
     quote
         cfg = CUPTI.ActivityConfig($activity_kinds)
@@ -262,17 +264,25 @@ function generate_traces(cfg)
             id = record.correlationId
             t0, t1 = record.start/1e9, record._end/1e9
 
-            name = if record.kind == CUPTI.CUPTI_ACTIVITY_KIND_DRIVER
-                ref = Ref{Cstring}(C_NULL)
-                CUPTI.cuptiGetCallbackName(CUPTI.CUPTI_CB_DOMAIN_DRIVER_API,
-                                            record.cbid, ref)
-                unsafe_string(ref[])
-            elseif record.kind == CUPTI.CUPTI_ACTIVITY_KIND_RUNTIME
-                ref = Ref{Cstring}(C_NULL)
-                CUPTI.cuptiGetCallbackName(CUPTI.CUPTI_CB_DOMAIN_RUNTIME_API,
-                                            record.cbid, ref)
-                unsafe_string(ref[])
-            else
+            name = try
+                if record.kind == CUPTI.CUPTI_ACTIVITY_KIND_DRIVER
+                    ref = Ref{Cstring}(C_NULL)
+                    CUPTI.cuptiGetCallbackName(CUPTI.CUPTI_CB_DOMAIN_DRIVER_API,
+                                                record.cbid, ref)
+                    unsafe_string(ref[])
+                elseif record.kind == CUPTI.CUPTI_ACTIVITY_KIND_RUNTIME
+                    ref = Ref{Cstring}(C_NULL)
+                    CUPTI.cuptiGetCallbackName(CUPTI.CUPTI_CB_DOMAIN_RUNTIME_API,
+                                                record.cbid, ref)
+                    unsafe_string(ref[])
+                else
+                    "<unknown>"
+                end
+            catch err
+                # XXX: as observed on CUDA 11.0
+                (isa(err, CUPTIError) &&
+                 err.code == CUPTI.CUPTI_ERROR_INVALID_PARAMETER) ||
+                    rethrow()
                 "<unknown>"
             end