last minute clean up

Author: cperkinsintel

sycl/source/detail/kernel_bundle_impl.hpp

@@ -397,15 +397,6 @@ class kernel_bundle_impl {
     return SS.str();
   }
 
-  // TODO: remove duplication in kernel_compiler_sycl.cpp.
-  std::string userArgsAsString(const std::vector<std::string> &UserArguments) {
-    return std::accumulate(UserArguments.begin(), UserArguments.end(),
-                           std::string(""),
-                           [](const std::string &A, const std::string &B) {
-                             return A.empty() ? B : A + " " + B;
-                           });
-  }
-
   bool
   extKernelCompilerFetchFromCache(const std::vector<device> Devices,
                                   const std::vector<std::string> &BuildOptions,
@@ -415,7 +406,7 @@ class kernel_bundle_impl {
     ContextImplPtr ContextImpl = getSyclObjImpl(MContext);
     const PluginPtr &Plugin = ContextImpl->getPlugin();
 
-    std::string UserArgs = userArgsAsString(BuildOptions);
+    std::string UserArgs = syclex::detail::userArgsAsString(BuildOptions);
     auto BinProg = PersistentDeviceCodeCache::getCompiledKernelFromDisc(
         Devices[0], UserArgs, SourceStr);
     if (!BinProg.empty()) {
@@ -509,7 +500,6 @@ class kernel_bundle_impl {
                               "languages at this time");
       }();
 
-      // CP  ur_program_handle_t UrProgram = nullptr;
       Plugin->call<UrApiKind::urProgramCreateWithIL>(
           ContextImpl->getHandleRef(), spirv.data(), spirv.size(), nullptr,
           &UrProgram);
@@ -559,7 +549,8 @@ class kernel_bundle_impl {
     // If caching enabled and kernel not fetched from cache, cache.
     if (PersistentDeviceCodeCache::isEnabled() && !FetchedFromCache) {
       PersistentDeviceCodeCache::putCompiledKernelToDisc(
-          Devices[0], userArgsAsString(BuildOptions), SourceStr, UrProgram);
+          Devices[0], syclex::detail::userArgsAsString(BuildOptions), SourceStr,
+          UrProgram);
     }
 
     return std::make_shared<kernel_bundle_impl>(MContext, MDevices, DevImg,

sycl/source/detail/kernel_compiler/kernel_compiler_sycl.hpp

@@ -31,6 +31,8 @@ SYCL_to_SPIRV(const std::string &Source, include_pairs_t IncludePairs,
 
 bool SYCL_Compilation_Available();
 
+std::string userArgsAsString(const std::vector<std::string> &UserArguments);
+
 } // namespace detail
 } // namespace ext::oneapi::experimental
 

sycl/test-e2e/KernelCompiler/kernel_compiler_opencl.cpp

@@ -11,9 +11,11 @@
 
 // The leak check env var is set even if it might be ignored by some backends.
 
+// -- Test the kernel_compiler with OpenCL source.
 // RUN: %{build} -o %t.out
 // RUN: env UR_L0_LEAKS_DEBUG=1 %{run} %t.out
 
+// -- Test again, with caching.
 // DEFINE: %{cache_vars} = env UR_L0_LEAKS_DEBUG=1 env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_TRACE=1 SYCL_CACHE_DIR=%t/cache_dir
 // RUN: rm -rf %t/cache_dir
 // RUN:  %{cache_vars} %t.out 2>&1 |  FileCheck %s --check-prefixes=CHECK-WRITTEN-TO-CACHE

sycl/test-e2e/KernelCompiler/kernel_compiler_sycl.cpp

@@ -11,11 +11,14 @@
 
 // The leak check env var is set even if it might be ignored by some backends.
 
+// -- Test the kernel_compiler with SYCL source.
 // RUN: %{build} -o %t.out
 // RUN: env UR_L0_LEAKS_DEBUG=1 %{run} %t.out
 
+// -- Test again, with caching.
 // 'reading-from-cache' is just a string we pass to differentiate between the
 // two runs.
+
 // DEFINE: %{cache_vars} = env UR_L0_LEAKS_DEBUG=1 env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_TRACE=1 SYCL_CACHE_DIR=%t/cache_dir
 // RUN: rm -rf %t/cache_dir
 // RUN:  %{cache_vars} %t.out 2>&1 |  FileCheck %s --check-prefixes=CHECK-WRITTEN-TO-CACHE