[SYCL] Treat "ar" image format as PI_DEVICE_BINARY_TYPE_NATIVE

sycl/source/detail/pi.cpp

@@ -718,6 +718,14 @@ getBinaryImageFormat(const unsigned char *ImgData, size_t ImgSize) {
       return PI_DEVICE_BINARY_TYPE_NATIVE;
   }
 
+  if (MatchMagicNumber(std::array{'!', '<', 'a', 'r', 'c', 'h', '>', '\n'}))
+    // "ar" format is used to pack binaries for multiple devices, e.g. via
+    //
+    //   -Xsycl-target-backend=spir64_gen "-device acm-g10,acm-g11"
+    //
+    // option.
+    return PI_DEVICE_BINARY_TYPE_NATIVE;
+
   return PI_DEVICE_BINARY_TYPE_NONE;
 }
 

sycl/test-e2e/KernelAndProgram/test_cache_jit_aot.cpp

@@ -0,0 +1,89 @@
+// Don't use normal %{run} as we need to control cache directory removal and
+// cannot do that reliably when number of devices is unknown.
+//
+// REQUIRES: level_zero, ocloc
+//
+// DEFINE: %{cache_vars} = env SYCL_CACHE_PERSISTENT=1 SYCL_CACHE_TRACE=1 SYCL_CACHE_DIR=%t/cache_dir
+// DEFINE: %{build_cmd} = %{build}
+// RUN: mkdir -p %t/cache_dir
+//
+// The following block of code should be copy-pasted as-is to verify different
+// JIT/AOT options. Don't know how to avoid code duplication.
+// ******************************
+// Check the logs first.
+// RUN: %{build_cmd} -DVALUE=1 -o %t.out
+// RUN: rm -rf %t/cache_dir/*
+// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s %if windows %{ --check-prefixes=CHECK,CHECK-WIN %}
+//
+// Now try to substitute the cached image and verify it is actually taken and
+// the code/binary there is executed.
+// RUN: mv %t/cache_dir/*/*/*/*/*.bin %t.value1.bin
+// RUN: rm -rf %t/cache_dir/*
+// RUN: %{build_cmd} -DVALUE=2 -o %t.out
+// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s --check-prefixes RESULT2
+// RUN: mv %t.value1.bin %t/cache_dir/*/*/*/*/*.bin
+// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s --check-prefixes RESULT1
+// ******************************
+//
+// REDEFINE: %{build_cmd} = %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device acm-g10" %s
+// ******************************
+// Check the logs first.
+// RUN: %{build_cmd} -DVALUE=1 -o %t.out
+// RUN: rm -rf %t/cache_dir/*
+// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s %if windows %{ --check-prefixes=CHECK,CHECK-WIN %}
+//
+// Now try to substitute the cached image and verify it is actually taken and
+// the code/binary there is executed.
+// RUN: mv %t/cache_dir/*/*/*/*/*.bin %t.value1.bin
+// RUN: rm -rf %t/cache_dir/*
+// RUN: %{build_cmd} -DVALUE=2 -o %t.out
+// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s --check-prefixes RESULT2
+// RUN: mv %t.value1.bin %t/cache_dir/*/*/*/*/*.bin
+// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s --check-prefixes RESULT1
+// ******************************
+//
+// REDEFINE: %{build_cmd} = %clangxx -fsycl -fsycl-targets=spir64_gen -Xsycl-target-backend=spir64_gen "-device acm-g10,acm-g11" %s
+// ******************************
+// Check the logs first.
+// RUN: %{build_cmd} -DVALUE=1 -o %t.out
+// RUN: rm -rf %t/cache_dir/*
+// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s %if windows %{ --check-prefixes=CHECK,CHECK-WIN %}
+//
+// Now try to substitute the cached image and verify it is actually taken and
+// the code/binary there is executed.
+// RUN: mv %t/cache_dir/*/*/*/*/*.bin %t.value1.bin
+// RUN: rm -rf %t/cache_dir/*
+// RUN: %{build_cmd} -DVALUE=2 -o %t.out
+// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s --check-prefixes RESULT2
+// RUN: mv %t.value1.bin %t/cache_dir/*/*/*/*/*.bin
+// RUN: %{cache_vars} %{run-unfiltered-devices} %t.out 2>&1 | FileCheck %s --check-prefixes RESULT1
+// ******************************
+
+// CHECK:     Code caching: device binary has been cached: [[BIN_FILE:.*]]
+// CHECK-WIN: Code caching: using cached device binary: [[BIN_FILE]]
+// CHECK-WIN: Code caching: using cached device binary: [[BIN_FILE]]
+
+// RESULT1: Result (0): 1
+// RESULT1: Result (1): 1
+// RESULT1: Result (2): 1
+
+// RESULT2: Result (0): 2
+// RESULT2: Result (1): 2
+// RESULT2: Result (2): 2
+
+#include <sycl/sycl.hpp>
+
+int main() {
+  for (int i = 0; i < 3; ++i) {
+    sycl::buffer<int, 1> b{1};
+    sycl::queue{}
+        .submit([&](sycl::handler &cgh) {
+          sycl::accessor acc{b, cgh};
+          cgh.single_task([=]() { acc[0] = VALUE; });
+        })
+        .wait();
+    std::cout << "Result (" << i << "): " << sycl::host_accessor{b}[0]
+              << std::endl;
+  }
+  return 0;
+}