Clarifications in comments and some formatting changes.

Signed-off-by: Garima Gupta <[email protected]>

Author: garimagu

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

@@ -926,7 +926,7 @@ struct _pi_plugin {
   // Some choices are:
   // - Use of integers to keep major and minor version.
   // - Keeping char* Versions.
-  const char PiVersion[4] = _PI_H_VERSION_STRING; 
+  const char PiVersion[4] = _PI_H_VERSION_STRING;
   // Plugin edits this.
   char PluginVersion[4] = _PI_H_VERSION_STRING;
   char *Targets;

sycl/include/CL/sycl/detail/pi.hpp

@@ -129,9 +129,9 @@ inline void checkPiResult(PiResult pi_result) {
 // Template Arguments:
 //    FnType  - Type of Function pointer to the PI API.
 //    FnOffset- Offset to the Function Pointer in the piPlugin::FunctionPointers
-//    structure.Used to differentiate between APIs with same pointer type, Eg:
+//    structure. Used to differentiate between APIs with same pointer type, Eg:
 //    piDeviceRelease and piDeviceRetain. Differentiation needed to avoid
-//    duplicate instantiation of class in pi.cpp.
+//    redefinition error during explicit specialization of class in pi.cpp.
 // Members: Initialiaed in default constructor in Class Template Specialization.
 // Usage:
 // Operator() - Call, Trace and Get result
@@ -203,7 +203,8 @@ namespace RT = cl::sycl::detail::pi;
 // runtime_error exception.
 // Usage: PI_CALL(pi)(Args);
 #define PI_CALL(pi)                                                            \
-  RT::CallPiAndCheck<decltype(&::pi), (offsetof(pi_plugin::FunctionPointers, pi))>()
+  RT::CallPiAndCheck<decltype(&::pi),                                          \
+                     (offsetof(pi_plugin::FunctionPointers, pi))>()
 
 // Use this macro to call the API, trace the call and return the result.
 // To check the result use checkPiResult.
@@ -218,8 +219,8 @@ namespace RT = cl::sycl::detail::pi;
 // Exception as given in the MACRO.
 // Usage: PI_CALL_THROW(pi, compile_program_error)(args);
 #define PI_CALL_THROW(pi, Exception)                                           \
-  RT::CallPiAndCheck<decltype(&::pi), (offsetof(pi_plugin::FunctionPointers, pi)), \
-                 Exception>()
+  RT::CallPiAndCheck<decltype(&::pi),                                          \
+                     (offsetof(pi_plugin::FunctionPointers, pi)), Exception>()
 
 #define PI_ASSERT(cond, msg) RT::assertion((cond), "assert: " msg);
 

sycl/source/detail/pi.cpp

@@ -140,12 +140,10 @@ void assertion(bool Condition, const char *Message) {
 // implemented yet.
 
 #define _PI_API(api)                                                           \
-  template <>                                                                  \
-  CallPi<decltype(&::api),                                                      \
-        (offsetof(pi_plugin::FunctionPointers, api))>::CallPi() {               \
+  template <> CallPi<decltype(&::api)>::CallPi() {                             \
     initialize();                                                              \
-    MFnPtr = (RT::PluginInformation.PiFunctionTable.api);                     \
-    MFnName = #api;                                                           \
+    MFnPtr = (RT::PluginInformation.PiFunctionTable.api);                      \
+    MFnName = #api;                                                            \
   }
 #include <CL/sycl/detail/pi.def>
 

sycl/unittests/pi/PlatformTest.cpp

@@ -69,9 +69,10 @@ TEST_F(PlatformTest, piPlatformGetInfo) {
 
     // Create a larger result string to catch overwrites.
     std::vector<char> param_value(reported_string_length * 2u, '\0');
-    EXPECT_EQ((PI_CALL_NOCHECK(piPlatformGetInfo)(
-                  platform, info, param_value.size(), param_value.data(), nullptr)),
-              PI_SUCCESS)
+    EXPECT_EQ(
+        (PI_CALL_NOCHECK(piPlatformGetInfo)(platform, info, param_value.size(),
+                                            param_value.data(), nullptr)),
+        PI_SUCCESS)
         << "piPlatformGetInfo for " << RT::platformInfoToString(info)
         << " failed.\n";