interim

Author: cperkinsintel

sycl/include/sycl/kernel_bundle_enums.hpp

@@ -25,7 +25,6 @@ enum class source_language : int {
   spirv = 1,
   sycl = 2,
   /* cuda */
-  sycl_jit = 99 /* temporary, alternative implementation for SYCL */
 };
 
 // opencl versions

sycl/source/detail/kernel_bundle_impl.hpp

@@ -499,16 +499,17 @@ class kernel_bundle_impl {
           return Result;
         }
         if (Language == syclex::source_language::sycl) {
-          return syclex::detail::SYCL_to_SPIRV(*SourceStrPtr, IncludePairs,
+          return syclex::detail::SYCL_JIT_to_SPIRV(*SourceStrPtr, IncludePairs,
                                                BuildOptions, LogPtr,
                                                RegisteredKernelNames);
         }
-        if (Language == syclex::source_language::sycl_jit) {
-          const auto &SourceStr = std::get<std::string>(this->Source);
-          return syclex::detail::SYCL_JIT_to_SPIRV(SourceStr, IncludePairs,
-                                                   BuildOptions, LogPtr,
-                                                   RegisteredKernelNames);
-        }
+        // CP
+        // if (Language == syclex::source_language::sycl_jit) {
+        //   const auto &SourceStr = std::get<std::string>(this->Source);
+        //   return syclex::detail::SYCL_JIT_to_SPIRV(SourceStr, IncludePairs,
+        //                                            BuildOptions, LogPtr,
+        //                                            RegisteredKernelNames);
+        // }
         throw sycl::exception(
             make_error_code(errc::invalid),
             "SYCL C++, OpenCL C and SPIR-V are the only supported "
@@ -578,8 +579,7 @@ class kernel_bundle_impl {
   std::string adjust_kernel_name(const std::string &Name,
                                  syclex::source_language Lang) {
     // Once name demangling support is in, we won't need this.
-    if (Lang != syclex::source_language::sycl &&
-        Lang != syclex::source_language::sycl_jit)
+    if (Lang != syclex::source_language::sycl)
       return Name;
 
     bool isMangled = Name.find("__sycl_kernel_") != std::string::npos;