Fix and cleanup some tests

Signed-off-by: Georgi Mirazchiyski <[email protected]>

Author: GeorgeWeb

sycl/test-e2e/bindless_images/array/read_write_1d_subregion.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: aspect-ext_oneapi_image_array
 
-// RUN: %if !any-device-is-hip %{ %{build} -o %t.out %}
-// RUN: %if !any-device-is-hip %{ %{run} %t.out %}
+// RUN: %{build} -o %t.out
+// RUN: %{run} %t.out
 
 #include <iostream>
 #include <sycl/detail/core.hpp>

sycl/test-e2e/bindless_images/read_sampled.cpp

@@ -1,7 +1,7 @@
 // REQUIRES: aspect-ext_oneapi_bindless_images
 
 // UNSUPPORTED: hip || level_zero
-// UNSUPPORTED-INTENDED: Returning non-FP values from fetching fails on HIP.
+// UNSUPPORTED-INTENDED: Returning non-FP values from sampling fails on HIP.
 // Also, the feature is not fully implemented in the Level Zero stack.
 
 // RUN: %{build} -o %t.out
@@ -20,8 +20,8 @@
 #include "helpers/common.hpp"
 #include "helpers/sampling.hpp"
 #include <cassert>
+#include <cstdlib>
 #include <iostream>
-#include <random>
 #include <sycl/accessor_image.hpp>
 #include <sycl/detail/core.hpp>
 
@@ -326,7 +326,7 @@ bool runTests(sycl::range<1> dims, sycl::range<1> localSize, float offset,
       syclexp::bindless_image_sampler samp(addrMode, normMode, filtMode);
 
 #if defined(VERBOSE_LV2) || defined(VERBOSE_LV3)
-      util::printTestInfo(samp, offset);
+      sampling_helpers::printTestInfo(samp, offset);
 #endif
 
       bindless_helpers::printTestName<NDims>("Running 1D short", dims,
@@ -483,7 +483,7 @@ bool runTests(sycl::range<2> dims, sycl::range<2> localSize, float offset,
       syclexp::bindless_image_sampler samp(addrMode, normMode, filtMode);
 
 #if defined(VERBOSE_LV2) || defined(VERBOSE_LV3)
-      util::printTestInfo(samp, offset);
+      sampling_helpers::printTestInfo(samp, offset);
 #endif
 
       bindless_helpers::printTestName<NDims>("Running 2D short", dims,