hip-clang fixes

[ROCm/roctracer commit: 3d021b1f0b]

projects/roctracer/build.sh

@@ -18,6 +18,7 @@ if [ -z "$BUILD_TYPE" ] ; then BUILD_TYPE="release"; fi
 if [ -z "$PACKAGE_ROOT" ] ; then PACKAGE_ROOT=$ROCM_PATH; fi
 if [ -z "$PACKAGE_PREFIX" ] ; then PACKAGE_PREFIX="$ROCM_PATH/$COMPONENT"; fi
 if [ -z "$PREFIX_PATH" ] ; then PREFIX_PATH=$PACKAGE_ROOT; fi
+if [ -n "$HIP_VDI" ] ; then HIP_VDI_OPT="-DHIP_VDI=1"; fi
 
 ROCTRACER_ROOT=$(cd $ROCTRACER_ROOT && echo $PWD)
 MAKE_OPTS="-j 8 -C $BUILD_DIR"
@@ -32,6 +33,7 @@ cmake \
     -DCMAKE_INSTALL_PREFIX=$PACKAGE_ROOT \
     -DCPACK_PACKAGING_INSTALL_PREFIX=$PACKAGE_PREFIX \
     -DCPACK_GENERATOR="DEB;RPM" \
+    $HIP_VDI_OPT \
     $ROCTRACER_ROOT
 make
 make mytest

projects/roctracer/test/tool/tracer_tool.cpp

@@ -321,8 +321,10 @@ void hip_api_callback(
         entry->ptr = *(data->args.hipMalloc.ptr);
         break;
       case HIP_API_ID_hipModuleLaunchKernel:
+#if !HIP_VDI
       case HIP_API_ID_hipExtModuleLaunchKernel:
       case HIP_API_ID_hipHccModuleLaunchKernel:
+#endif
         const hipFunction_t f = data->args.hipModuleLaunchKernel.f;
         if (f != NULL) {
           entry->name = strdup(roctracer::HipLoader::Instance().KernelNameRef(f));
@@ -389,8 +391,10 @@ void hip_api_flush_cb(hip_api_trace_entry_t* entry) {
           data->args.hipFree.ptr);
         break;
       case HIP_API_ID_hipModuleLaunchKernel:
+#if !HIP_VDI
       case HIP_API_ID_hipExtModuleLaunchKernel:
       case HIP_API_ID_hipHccModuleLaunchKernel:
+#endif
         fprintf(hip_api_file_handle, "%s(kernel(%s) stream(%p))\n",
           oss.str().c_str(),
           cxx_demangle(entry->name),