[NFC][SYCL] A few clang-tidy inspired changes (#18302)

Co-authored-by: Marcos Maronas <[email protected]>

Author: aelovikov-intel

sycl/source/detail/common.cpp

@@ -23,11 +23,10 @@ static thread_local detail::code_location GCodeLocTLS = {};
 /// @brief Default constructor to use in lower levels of the calling stack to
 /// check and see if code location object is available. If not, continue with
 /// instrumentation as needed
-tls_code_loc_t::tls_code_loc_t() {
-  // Check TLS to see if a previously stashed code_location object is
-  // available; if so, we are in a local scope.
-  MLocalScope = GCodeLocTLS.fileName() && GCodeLocTLS.functionName();
-}
+tls_code_loc_t::tls_code_loc_t()
+    : // Check TLS to see if a previously stashed code_location object is
+      // available; if so, we are in a local scope.
+      MLocalScope(GCodeLocTLS.fileName() && GCodeLocTLS.functionName()) {}
 
 ur_code_location_t codeLocationCallback(void *) {
   ur_code_location_t codeloc;
@@ -44,12 +43,11 @@ ur_code_location_t codeLocationCallback(void *) {
 /// application code. In this case, we still check to see if another code
 /// location has been stashed in the TLS at a higher level. If not, we have the
 /// code location information that must be active for the current calling scope.
-tls_code_loc_t::tls_code_loc_t(const detail::code_location &CodeLoc) {
-  // Check TLS to see if a previously stashed code_location object is
-  // available; if so, then don't overwrite the previous information as we
-  // are still in scope of the instrumented function
-  MLocalScope = GCodeLocTLS.fileName() && GCodeLocTLS.functionName();
-
+tls_code_loc_t::tls_code_loc_t(const detail::code_location &CodeLoc)
+    : // Check TLS to see if a previously stashed code_location object is
+      // available; if so, then don't overwrite the previous information as we
+      // are still in scope of the instrumented function.
+      MLocalScope(GCodeLocTLS.fileName() && GCodeLocTLS.functionName()) {
   if (!MLocalScope)
     // Update the TLS information with the code_location information
     GCodeLocTLS = CodeLoc;

sycl/source/detail/jit_device_binaries.cpp

@@ -104,7 +104,7 @@ void DeviceBinaryContainer::setCompileOptions(std::string_view CompileOpts) {
 sycl_device_binary_struct DeviceBinaryContainer::getPIDeviceBinary(
     const unsigned char *BinaryStart, size_t BinarySize, const char *TargetSpec,
     sycl_device_binary_type Format) {
-  sycl_device_binary_struct DeviceBinary;
+  sycl_device_binary_struct DeviceBinary{};
   DeviceBinary.Version = SYCL_DEVICE_BINARY_VERSION;
   DeviceBinary.Kind = SYCL_DEVICE_BINARY_OFFLOAD_KIND_SYCL;
   DeviceBinary.Format = Format;

sycl/source/detail/queue_impl.hpp

@@ -466,22 +466,21 @@ class queue_impl {
       }
       CreationFlags |= UR_QUEUE_FLAG_PRIORITY_HIGH;
     }
-    // Track that submission modes do not conflict.
-    bool SubmissionSeen = false;
-    if (PropList.has_property<
-            ext::intel::property::queue::no_immediate_command_list>()) {
-      SubmissionSeen = true;
-      CreationFlags |= UR_QUEUE_FLAG_SUBMISSION_BATCHED;
-    }
-    if (PropList.has_property<
-            ext::intel::property::queue::immediate_command_list>()) {
-      if (SubmissionSeen) {
+    {
+      // Track that submission modes do not conflict.
+      bool no_imm_cmdlist = PropList.has_property<
+          ext::intel::property::queue::no_immediate_command_list>();
+      bool imm_cmdlist = PropList.has_property<
+          ext::intel::property::queue::immediate_command_list>();
+      if (no_imm_cmdlist && imm_cmdlist) {
         throw sycl::exception(
             make_error_code(errc::invalid),
-            "Queue cannot be constructed with different submission modes.");
+            "Queue cannot be constructed with conflicting submission modes.");
       }
-      SubmissionSeen = true;
-      CreationFlags |= UR_QUEUE_FLAG_SUBMISSION_IMMEDIATE;
+      if (no_imm_cmdlist)
+        CreationFlags |= UR_QUEUE_FLAG_SUBMISSION_BATCHED;
+      if (imm_cmdlist)
+        CreationFlags |= UR_QUEUE_FLAG_SUBMISSION_IMMEDIATE;
     }
     return CreationFlags;
   }

sycl/source/detail/scheduler/commands.cpp

@@ -1992,25 +1992,23 @@ void instrumentationAddExtraKernelMetadata(
   auto FilterArgs = [&Args](detail::ArgDesc &Arg, int NextTrueIndex) {
     Args.push_back({Arg.MType, Arg.MPtr, Arg.MSize, NextTrueIndex});
   };
-  ur_program_handle_t Program = nullptr;
   ur_kernel_handle_t Kernel = nullptr;
   std::mutex *KernelMutex = nullptr;
   const KernelArgMask *EliminatedArgMask = nullptr;
 
   if (nullptr != SyclKernel) {
-    Program = SyclKernel->getProgramRef();
     if (!SyclKernel->isCreatedFromSource())
       EliminatedArgMask = SyclKernel->getKernelArgMask();
   } else if (auto SyclKernelImpl =
                  KernelBundleImplPtr ? KernelBundleImplPtr->tryGetKernel(
                                            KernelName, KernelBundleImplPtr)
                                      : std::shared_ptr<kernel_impl>{nullptr}) {
     EliminatedArgMask = SyclKernelImpl->getKernelArgMask();
-    Program = SyclKernelImpl->getDeviceImage()->get_ur_program_ref();
   } else if (Queue) {
     // NOTE: Queue can be null when kernel is directly enqueued to a command
     // buffer
     //       by graph API, when a modifiable graph is finalized.
+    ur_program_handle_t Program = nullptr;
     std::tie(Kernel, KernelMutex, EliminatedArgMask, Program) =
         detail::ProgramManager::getInstance().getOrCreateKernel(
             Queue->getContextImplPtr(), Queue->getDeviceImpl(), KernelName);