Moving triple concat to pi.h and adding PluginVersion to SYCL_PI_TRACE=-1 string

Author: Hugh Delaney

sycl/include/CL/sycl/detail/pi.h

@@ -52,6 +52,8 @@
 
 #define _PI_STRING_HELPER(a) #a
 #define _PI_CONCAT(a, b) _PI_STRING_HELPER(a.b)
+#define _PI_TRIPLE_CONCAT(a, b, c) _PI_STRING_HELPER(a.b.c)
+
 #define _PI_H_VERSION_STRING                                                   \
   _PI_CONCAT(_PI_H_VERSION_MAJOR, _PI_H_VERSION_MINOR)
 

sycl/plugins/cuda/pi_cuda.hpp

@@ -20,8 +20,6 @@
 
 #define _PI_CUDA_PLUGIN_VERSION 1
 
-#define _PI_TRIPLE_CONCAT(a, b, c) _PI_STRING_HELPER(a.b.c)
-
 #define _PI_CUDA_PLUGIN_VERSION_STRING                                         \
   _PI_TRIPLE_CONCAT(_PI_H_VERSION_MAJOR, _PI_H_VERSION_MINOR,                  \
                     _PI_CUDA_PLUGIN_VERSION)

sycl/source/detail/pi.cpp

@@ -451,7 +451,7 @@ static void initializePlugins(std::vector<plugin> &Plugins) {
     if (trace(TraceLevel::PI_TRACE_BASIC))
       std::cerr << "SYCL_PI_TRACE[basic]: "
                 << "Plugin found and successfully loaded: "
-                << PluginNames[I].first << " ["
+                << PluginNames[I].first << " [ PluginVersion: "
                 << Plugins[I].getPiPlugin().PluginVersion << "]" << std::endl;
   }