Merge branch 'main' into semaphore_negative_clEnqueueSignalSemaphoresKHR

shajder · Sep 4, 2024 · fa4ea84 · fa4ea84
2 parents dc72b54 + 9116bb7
commit fa4ea84
Show file tree

Hide file tree

Showing 24 changed files with 1,210 additions and 947 deletions.
diff --git a/test_common/harness/kernelHelpers.cpp b/test_common/harness/kernelHelpers.cpp
@@ -1511,30 +1511,27 @@ size_t get_min_alignment(cl_context context)
     return align_size;
 }
 
-cl_device_fp_config get_default_rounding_mode(cl_device_id device,
-                                              const cl_uint &param)
+cl_device_fp_config get_default_rounding_mode(const cl_device_id device,
+                                              const cl_uint param)
 {
-    if (param == CL_DEVICE_DOUBLE_FP_CONFIG)
-        test_error_ret(
-            -1,
-            "FAILURE: CL_DEVICE_DOUBLE_FP_CONFIG not supported by this routine",
-            0);
-
     char profileStr[128] = "";
-    cl_device_fp_config single = 0;
-    int error = clGetDeviceInfo(device, param, sizeof(single), &single, NULL);
+    cl_device_fp_config config = 0;
+    int error = clGetDeviceInfo(device, param, sizeof(config), &config, NULL);
     if (error)
     {
-        std::string message = std::string("Unable to get device ")
-            + std::string(param == CL_DEVICE_HALF_FP_CONFIG
-                              ? "CL_DEVICE_HALF_FP_CONFIG"
-                              : "CL_DEVICE_SINGLE_FP_CONFIG");
+        std::string config_name = "CL_DEVICE_SINGLE_FP_CONFIG";
+        if (param == CL_DEVICE_HALF_FP_CONFIG)
+            config_name = "CL_DEVICE_HALF_FP_CONFIG";
+        else if (param == CL_DEVICE_DOUBLE_FP_CONFIG)
+            config_name = "CL_DEVICE_DOUBLE_FP_CONFIG";
+        std::string message =
+            std::string("Unable to get device ") + config_name;
         test_error_ret(error, message.c_str(), 0);
     }
 
-    if (single & CL_FP_ROUND_TO_NEAREST) return CL_FP_ROUND_TO_NEAREST;
+    if (config & CL_FP_ROUND_TO_NEAREST) return CL_FP_ROUND_TO_NEAREST;
 
-    if (0 == (single & CL_FP_ROUND_TO_ZERO))
+    if (0 == (config & CL_FP_ROUND_TO_ZERO))
         test_error_ret(-1,
                        "FAILURE: device must support either "
                        "CL_FP_ROUND_TO_ZERO or CL_FP_ROUND_TO_NEAREST",

diff --git a/test_common/harness/kernelHelpers.h b/test_common/harness/kernelHelpers.h
@@ -157,8 +157,8 @@ size_t get_min_alignment(cl_context context);
 /* Helper to obtain the default rounding mode for single precision computation.
  * (Double is always CL_FP_ROUND_TO_NEAREST.) Returns 0 on error. */
 cl_device_fp_config
-get_default_rounding_mode(cl_device_id device,
-                          const cl_uint &param = CL_DEVICE_SINGLE_FP_CONFIG);
+get_default_rounding_mode(const cl_device_id device,
+                          const cl_uint param = CL_DEVICE_SINGLE_FP_CONFIG);
 
 #define PASSIVE_REQUIRE_IMAGE_SUPPORT(device)                                  \
     if (checkForImageSupport(device))                                          \

diff --git a/test_conformance/api/test_api_consistency.cpp b/test_conformance/api/test_api_consistency.cpp
@@ -13,6 +13,8 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //
+#include <cinttypes>
+
 #include "testBase.h"
 #include "harness/testHarness.h"
 #include "harness/deviceInfo.h"
@@ -158,8 +160,9 @@ static int check_atomic_capabilities(cl_device_atomic_capabilities atomicCaps,
 {
     if ((atomicCaps & requiredCaps) != requiredCaps)
     {
-        log_error("Atomic capabilities %llx is missing support for at least "
-                  "one required capability %llx!\n",
+        log_error("Atomic capabilities %" PRIx64
+                  " is missing support for at least "
+                  "one required capability %" PRIx64 "!\n",
                   atomicCaps, requiredCaps);
         return TEST_FAIL;
     }