[BINDLESS][E2E] Split image_get_info into three tests

sycl/test-e2e/bindless_images/bindless_aspects.cpp

@@ -0,0 +1,143 @@
+// REQUIRES: aspect-ext_oneapi_bindless_images
+
+// RUN: %{build} -o %t.out
+// RUN: %{run-unfiltered-devices} %t.out
+
+#include <iostream>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/bindless_images.hpp>
+
+// Uncomment to print additional test information
+// #define VERBOSE_PRINT
+
+int main() {
+
+  sycl::device dev;
+
+  bool validated = true;
+
+  try {
+    // Extension: query for bindless image support -- device aspects
+    bool bindlessSupport = dev.has(sycl::aspect::ext_oneapi_bindless_images);
+    bool bindlessSharedUsmSupport =
+        dev.has(sycl::aspect::ext_oneapi_bindless_images_shared_usm);
+    bool usm1dSupport =
+        dev.has(sycl::aspect::ext_oneapi_bindless_images_1d_usm);
+    bool usm2dSupport =
+        dev.has(sycl::aspect::ext_oneapi_bindless_images_2d_usm);
+
+#ifdef VERBOSE_PRINT
+    std::cout << "bindless_images_support: " << bindlessSupport
+              << "\nbindless_images_shared_usm_support: "
+              << bindlessSharedUsmSupport
+              << "\nbindless_images_1d_usm_support: " << usm1dSupport
+              << "\nbindless_images_2d_usm_support: " << usm2dSupport << "\n";
+#endif
+
+    // Extension: query for sampled image fetch capabilities
+    bool sampledFetch1DUSMSupport =
+        dev.has(sycl::aspect::ext_oneapi_bindless_sampled_image_fetch_1d_usm);
+    bool sampledFetch2DUSMSupport =
+        dev.has(sycl::aspect::ext_oneapi_bindless_sampled_image_fetch_2d_usm);
+    bool sampledFetch1DSupport =
+        dev.has(sycl::aspect::ext_oneapi_bindless_sampled_image_fetch_1d);
+    bool sampledFetch2DSupport =
+        dev.has(sycl::aspect::ext_oneapi_bindless_sampled_image_fetch_2d);
+    bool sampledFetch3DSupport =
+        dev.has(sycl::aspect::ext_oneapi_bindless_sampled_image_fetch_3d);
+
+#ifdef VERBOSE_PRINT
+    std::cout << "sampledFetch1DUSMSupport: " << sampledFetch1DUSMSupport
+              << "\nsampledFetch2DUSMSupport: " << sampledFetch2DUSMSupport
+              << "\nsampledFetch1DSupport: " << sampledFetch1DSupport
+              << "\nsampledFetch2DSupport: " << sampledFetch2DSupport
+              << "\nsampledFetch3DSupport: " << sampledFetch3DSupport << "\n";
+#endif
+    // Extension: query for bindless image mipmaps support -- aspects & info
+    bool mipmapSupport = dev.has(sycl::aspect::ext_oneapi_mipmap);
+    bool mipmapAnisotropySupport =
+        dev.has(sycl::aspect::ext_oneapi_mipmap_anisotropy);
+    float mipmapMaxAnisotropy;
+    if (mipmapAnisotropySupport) {
+      mipmapMaxAnisotropy = dev.get_info<sycl::ext::oneapi::experimental::info::
+                                             device::mipmap_max_anisotropy>();
+    }
+    bool mipmapLevelReferenceSupport =
+        dev.has(sycl::aspect::ext_oneapi_mipmap_level_reference);
+
+#ifdef VERBOSE_PRINT
+    std::cout << "mipmapSupport: " << mipmapSupport
+              << "\nmipmapAnisotropySupport: " << mipmapAnisotropySupport
+              << "\nmipmapLevelReferenceSupport: "
+              << mipmapLevelReferenceSupport << "\n";
+    if (mipmapAnisotropySupport) {
+      std::cout << "mipmapMaxAnisotropy: " << mipmapMaxAnisotropy << "\n";
+    }
+#endif
+
+    // Extension: query for bindless image cubemaps support -- aspects.
+    bool cubemapSupport = dev.has(sycl::aspect::ext_oneapi_cubemap);
+    bool cubemapSeamlessFilterSupport =
+        dev.has(sycl::aspect::ext_oneapi_cubemap_seamless_filtering);
+
+#ifdef VERBOSE_PRINT
+    std::cout << "cubemapSupport: " << cubemapSupport
+              << "\ncubemapSeamlessFilterSupport: "
+              << cubemapSeamlessFilterSupport << "\n";
+#endif
+
+    // Extension: query for bindless image interop support -- device aspects
+    bool externalMemoryImportSupport =
+        dev.has(sycl::aspect::ext_oneapi_external_memory_import);
+    bool externalSemaphoreImportSupport =
+        dev.has(sycl::aspect::ext_oneapi_external_semaphore_import);
+
+#ifdef VERBOSE_PRINT
+    std::cout << "externalMemoryImportSupport: " << externalMemoryImportSupport
+              << "\nexternalSemaphoreImportSupport: "
+              << externalSemaphoreImportSupport << "\n";
+#endif
+
+    // Extension: query for bindless image array support - device aspect
+    bool imageArraySupport = dev.has(sycl::aspect::ext_oneapi_image_array);
+
+#ifdef VERBOSE_PRINT
+    std::cout << "imageArraySupport: " << imageArraySupport << "\n";
+#endif
+
+    // Extension: query for bindless image unique addressing support - device
+    // aspect
+    bool uniqueAddrSupport =
+        dev.has(sycl::aspect::ext_oneapi_unique_addressing_per_dim);
+
+#ifdef VERBOSE_PRINT
+    std::cout << "uniqueAddrSupport: " << uniqueAddrSupport << "\n";
+#endif
+
+    // Extension: query for usm sample support - device aspect
+    bool usm1DSampleSupport =
+        dev.has(sycl::aspect::ext_oneapi_bindless_images_sample_1d_usm);
+    bool usm2DSampleSupport =
+        dev.has(sycl::aspect::ext_oneapi_bindless_images_sample_2d_usm);
+
+#ifdef VERBOSE_PRINT
+    std::cout << "usm1DSampleSupport: " << usm1DSampleSupport << "\n";
+    std::cout << "usm2DSampleSupport: " << usm2DSampleSupport << "\n";
+#endif
+
+  } catch (sycl::exception e) {
+    std::cerr << "SYCL exception caught! : " << e.what() << "\n";
+    return 1;
+  } catch (...) {
+    std::cerr << "Unknown exception caught!\n";
+    return 2;
+  }
+
+  if (validated) {
+    std::cout << "Test Passed!\n";
+    return 0;
+  }
+
+  std::cout << "Test Failed!" << std::endl;
+  return 3;
+}

sycl/test-e2e/bindless_images/image_get_info.cpp

@@ -1,15 +1,13 @@
 // REQUIRES: aspect-ext_oneapi_bindless_images
 
-// UNSUPPORTED: hip || level_zero
+// UNSUPPORTED: hip
 // UNSUPPORTED-INTENDED: Image channels queries not working correctly on HIP.
-// Also, the feature is not fully implemented in the Level Zero stack.
 
 // RUN: %{build} -o %t.out
 // RUN: %{run-unfiltered-devices} %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>
-
 #include <sycl/ext/oneapi/bindless_images.hpp>
 
 // Uncomment to print additional test information
@@ -34,10 +32,6 @@ int main() {
   bool validated = true;
 
   try {
-    // Submit dummy kernel to let the runtime decide the backend (CUDA)
-    // Without this, the default Level Zero backend is active
-    q.submit([&](sycl::handler &cgh) { cgh.single_task([]() {}); });
-
     // Extension: image descriptor - can use the same for both images
     sycl::ext::oneapi::experimental::image_descriptor desc(
         {width, height, depth}, 1, sycl::image_channel_type::signed_int32);
@@ -46,131 +40,6 @@ int main() {
     // Input images memory
     sycl::ext::oneapi::experimental::image_mem imgMem(desc, dev, ctxt);
 
-    // Extension: query for bindless image support -- device aspects
-    bool bindlessSupport = dev.has(sycl::aspect::ext_oneapi_bindless_images);
-    bool bindlessSharedUsmSupport =
-        dev.has(sycl::aspect::ext_oneapi_bindless_images_shared_usm);
-    bool usm1dSupport =
-        dev.has(sycl::aspect::ext_oneapi_bindless_images_1d_usm);
-    bool usm2dSupport =
-        dev.has(sycl::aspect::ext_oneapi_bindless_images_2d_usm);
-
-#ifdef VERBOSE_PRINT
-    std::cout << "bindless_images_support: " << bindlessSupport
-              << "\nbindless_images_shared_usm_support: "
-              << bindlessSharedUsmSupport
-              << "\nbindless_images_1d_usm_support: " << usm1dSupport
-              << "\nbindless_images_2d_usm_support: " << usm2dSupport << "\n";
-#endif
-
-    // Extension: query for sampled image fetch capabilities
-    bool sampledFetch1DUSMSupport =
-        dev.has(sycl::aspect::ext_oneapi_bindless_sampled_image_fetch_1d_usm);
-    bool sampledFetch2DUSMSupport =
-        dev.has(sycl::aspect::ext_oneapi_bindless_sampled_image_fetch_2d_usm);
-    bool sampledFetch1DSupport =
-        dev.has(sycl::aspect::ext_oneapi_bindless_sampled_image_fetch_1d);
-    bool sampledFetch2DSupport =
-        dev.has(sycl::aspect::ext_oneapi_bindless_sampled_image_fetch_2d);
-    bool sampledFetch3DSupport =
-        dev.has(sycl::aspect::ext_oneapi_bindless_sampled_image_fetch_3d);
-
-#ifdef VERBOSE_PRINT
-    std::cout << "sampledFetch1DUSMSupport: " << sampledFetch1DUSMSupport
-              << "\nsampledFetch2DUSMSupport: " << sampledFetch2DUSMSupport
-              << "\nsampledFetch1DSupport: " << sampledFetch1DSupport
-              << "\nsampledFetch2DSupport: " << sampledFetch2DSupport
-              << "\nsampledFetch3DSupport: " << sampledFetch3DSupport << "\n";
-#endif
-
-    // Extension: get pitch alignment information from device -- device info
-    // Make sure our pitch alignment queries work properly
-    // These can be different depending on the device so we cannot test that the
-    // values are correct
-    // But we should at least see that the query itself works
-    auto pitchAlign = dev.get_info<
-        sycl::ext::oneapi::experimental::info::device::image_row_pitch_align>();
-    auto maxPitch = dev.get_info<sycl::ext::oneapi::experimental::info::device::
-                                     max_image_linear_row_pitch>();
-    auto maxWidth = dev.get_info<sycl::ext::oneapi::experimental::info::device::
-                                     max_image_linear_width>();
-    auto maxheight = dev.get_info<sycl::ext::oneapi::experimental::info::
-                                      device::max_image_linear_height>();
-
-#ifdef VERBOSE_PRINT
-    std::cout << "image_row_pitch_align: " << pitchAlign
-              << "\nmax_image_linear_row_pitch: " << maxPitch
-              << "\nmax_image_linear_width: " << maxWidth
-              << "\nmax_image_linear_height: " << maxheight << "\n";
-#endif
-
-    // Extension: query for bindless image mipmaps support -- aspects & info
-    bool mipmapSupport = dev.has(sycl::aspect::ext_oneapi_mipmap);
-    bool mipmapAnisotropySupport =
-        dev.has(sycl::aspect::ext_oneapi_mipmap_anisotropy);
-    float mipmapMaxAnisotropy = dev.get_info<
-        sycl::ext::oneapi::experimental::info::device::mipmap_max_anisotropy>();
-    bool mipmapLevelReferenceSupport =
-        dev.has(sycl::aspect::ext_oneapi_mipmap_level_reference);
-
-#ifdef VERBOSE_PRINT
-    std::cout << "mipmapSupport: " << mipmapSupport
-              << "\nmipmapAnisotropySupport: " << mipmapAnisotropySupport
-              << "\nmipmapMaxAnisotropy: " << mipmapMaxAnisotropy
-              << "\nmipmapLevelReferenceSupport: "
-              << mipmapLevelReferenceSupport << "\n";
-#endif
-
-    // Extension: query for bindless image cubemaps support -- aspects.
-    bool cubemapSupport = dev.has(sycl::aspect::ext_oneapi_cubemap);
-    bool cubemapSeamlessFilterSupport =
-        dev.has(sycl::aspect::ext_oneapi_cubemap_seamless_filtering);
-
-#ifdef VERBOSE_PRINT
-    std::cout << "cubemapSupport: " << cubemapSupport
-              << "\ncubemapSeamlessFilterSupport: "
-              << cubemapSeamlessFilterSupport << "\n";
-#endif
-
-    // Extension: query for bindless image interop support -- device aspects
-    bool externalMemoryImportSupport =
-        dev.has(sycl::aspect::ext_oneapi_external_memory_import);
-    bool externalSemaphoreImportSupport =
-        dev.has(sycl::aspect::ext_oneapi_external_semaphore_import);
-
-#ifdef VERBOSE_PRINT
-    std::cout << "externalMemoryImportSupport: " << externalMemoryImportSupport
-              << "\nexternalSemaphoreImportSupport: "
-              << externalSemaphoreImportSupport << "\n";
-#endif
-
-    // Extension: query for bindless image array support - device aspect
-    bool imageArraySupport = dev.has(sycl::aspect::ext_oneapi_image_array);
-
-#ifdef VERBOSE_PRINT
-    std::cout << "imageArraySupport: " << imageArraySupport << "\n";
-#endif
-
-    // Extension: query for bindless image unique addressing support - device
-    // aspect
-    bool uniqueAddrSupport =
-        dev.has(sycl::aspect::ext_oneapi_unique_addressing_per_dim);
-
-#ifdef VERBOSE_PRINT
-    std::cout << "uniqueAddrSupport: " << uniqueAddrSupport << "\n";
-#endif
-
-    // Extension: query for usm sample support - device aspect
-    bool usm1DSampleSupport =
-        dev.has(sycl::aspect::ext_oneapi_bindless_images_sample_1d_usm);
-    bool usm2DSampleSupport =
-        dev.has(sycl::aspect::ext_oneapi_bindless_images_sample_2d_usm);
-
-#ifdef VERBOSE_PRINT
-    std::cout << "usm1DSampleSupport: " << usm1DSampleSupport << "\n";
-    std::cout << "usm2DSampleSupport: " << usm2DSampleSupport << "\n";
-#endif
-
     auto rangeMem = imgMem.get_range();
     auto range = sycl::ext::oneapi::experimental::get_image_range(
         imgMem.get_handle(), dev, ctxt);

sycl/test-e2e/bindless_images/image_reqs_get_info.cpp

@@ -0,0 +1,60 @@
+// REQUIRES: aspect-ext_oneapi_bindless_images
+
+// UNSUPPORTED: level_zero
+// UNSUPPORTED-INTENDED: The feature is not implemented in the Level Zero stack.
+// https://github.com/intel/llvm/issues/17663
+
+// RUN: %{build} -o %t.out
+// RUN: %{run-unfiltered-devices} %t.out
+
+#include <iostream>
+#include <sycl/detail/core.hpp>
+#include <sycl/ext/oneapi/bindless_images.hpp>
+
+// Uncomment to print additional test information
+// #define VERBOSE_PRINT
+
+int main() {
+
+  sycl::device dev;
+
+  bool validated = true;
+
+  try {
+    // Extension: get pitch alignment information from device -- device info
+    // Make sure our pitch alignment queries work properly
+    // These can be different depending on the device so we cannot test that the
+    // values are correct
+    // But we should at least see that the query itself works
+    auto pitchAlign = dev.get_info<
+        sycl::ext::oneapi::experimental::info::device::image_row_pitch_align>();
+    auto maxPitch = dev.get_info<sycl::ext::oneapi::experimental::info::device::
+                                     max_image_linear_row_pitch>();
+    auto maxWidth = dev.get_info<sycl::ext::oneapi::experimental::info::device::
+                                     max_image_linear_width>();
+    auto maxheight = dev.get_info<sycl::ext::oneapi::experimental::info::
+                                      device::max_image_linear_height>();
+
+#ifdef VERBOSE_PRINT
+    std::cout << "image_row_pitch_align: " << pitchAlign
+              << "\nmax_image_linear_row_pitch: " << maxPitch
+              << "\nmax_image_linear_width: " << maxWidth
+              << "\nmax_image_linear_height: " << maxheight << "\n";
+#endif
+
+  } catch (sycl::exception e) {
+    std::cerr << "SYCL exception caught! : " << e.what() << "\n";
+    return 1;
+  } catch (...) {
+    std::cerr << "Unknown exception caught!\n";
+    return 2;
+  }
+
+  if (validated) {
+    std::cout << "Test Passed!\n";
+    return 0;
+  }
+
+  std::cout << "Test Failed!" << std::endl;
+  return 3;
+}