Cleanup

Signed-off-by: Julian Oppermann <[email protected]>

Author: jopperm

sycl-jit/jit-compiler/lib/rtc/DeviceCompilation.cpp

@@ -435,8 +435,9 @@ Expected<RTCBundleInfo> jit_compiler::performPostLink(
   for (auto &&[KV, FrozenPropSet] : zip(PropertySets, BundleInfo.Properties)) {
     const auto &PropertySetName = KV.first;
     const auto &PropertySet = KV.second;
-    FrozenPropertySet FPS{PropertySetName.str(), PropertySet.size()};
-    for (auto &&[KV2, FrozenProp] : zip(PropertySet, FPS.Values)) {
+    FrozenPropSet =
+        FrozenPropertySet{PropertySetName.str(), PropertySet.size()};
+    for (auto &&[KV2, FrozenProp] : zip(PropertySet, FrozenPropSet.Values)) {
       const auto &PropertyName = KV2.first;
       const auto &PropertyValue = KV2.second;
       FrozenProp = PropertyValue.getType() == PropertyValue::Type::UINT32
@@ -446,7 +447,6 @@ Expected<RTCBundleInfo> jit_compiler::performPostLink(
                              PropertyName.str(), PropertyValue.asRawByteArray(),
                              PropertyValue.getRawByteArraySize()};
     }
-    FrozenPropSet = std::move(FPS);
   };
 
   // Regain ownership of the module.

sycl/source/detail/kernel_compiler/kernel_compiler_sycl.hpp

@@ -12,7 +12,7 @@
 #include <sycl/detail/export.hpp> // __SYCL_EXPORT
 #include <sycl/device.hpp>
 
-#include <detail/device_binary_image.hpp>
+#include <detail/compiler.hpp> // sycl_device_binaries
 
 #include <numeric> // std::accumulate
 #include <string>

sycl/test-e2e/KernelCompiler/kernel_compiler_sycl_jit.cpp

@@ -179,6 +179,8 @@ int test_unsupported_options() {
   CheckUnsupported({"-Xsycl-target-frontend", "-fsanitize=address"});
   CheckUnsupported({"-Xsycl-target-frontend=spir64", "-fsanitize=address"});
   CheckUnsupported({"-Xarch_device", "-fsanitize=address"});
+  CheckUnsupported({"-fsycl-device-code-split=kernel"});
+  CheckUnsupported({"-fsycl-device-code-split-esimd"});
 
   return 0;
 }