review fixes

franz · Oct 9, 2023 · 54b32f3 · 54b32f3
1 parent d705c5c
commit 54b32f3
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 13 deletions.
diff --git a/test_conformance/extensions/cl_khr_command_buffer/command_buffer_test_copy.cpp b/test_conformance/extensions/cl_khr_command_buffer/command_buffer_test_copy.cpp
@@ -205,8 +205,8 @@ struct CopySVMBufferKHR : public BasicSVMCommandBufferTest
     cl_int Run() override
     {
         cl_int error = clCommandSVMMemFillKHR(
-            command_buffer, nullptr, svm_in_mem(), &pattern_1,
-            sizeof(cl_char), data_size(), 0, nullptr, nullptr, nullptr);
+            command_buffer, nullptr, svm_in_mem(), &pattern_1, sizeof(cl_char),
+            data_size(), 0, nullptr, nullptr, nullptr);
         test_error(error, "clCommandSVMMemFillKHR failed");
 
         error = clCommandSVMMemcpyKHR(command_buffer, nullptr, svm_out_mem(),

diff --git a/test_conformance/extensions/cl_khr_command_buffer/command_buffer_test_fill.cpp b/test_conformance/extensions/cl_khr_command_buffer/command_buffer_test_fill.cpp
@@ -179,8 +179,8 @@ struct FillSVMBufferKHR : public BasicSVMCommandBufferTest
     cl_int Run() override
     {
         cl_int error = clCommandSVMMemFillKHR(
-            command_buffer, nullptr, svm_in_mem(), &pattern_1,
-            sizeof(cl_char), data_size(), 0, nullptr, nullptr, nullptr);
+            command_buffer, nullptr, svm_in_mem(), &pattern_1, sizeof(cl_char),
+            data_size(), 0, nullptr, nullptr, nullptr);
         test_error(error, "clCommandSVMMemFillKHR failed");
 
         error = clFinalizeCommandBufferKHR(command_buffer);

diff --git a/test_conformance/extensions/cl_khr_command_buffer/svm_command_basic.cpp b/test_conformance/extensions/cl_khr_command_buffer/svm_command_basic.cpp
@@ -51,12 +51,6 @@ bool BasicSVMCommandBufferTest::Skip()
         log_error("Unable to initialise extension functions");
         return true;
     }
-    if (clCommandSVMMemcpyKHR == nullptr || clCommandSVMMemFillKHR == nullptr)
-    {
-        log_info("Platform does not support clCommandSVMMemcpyKHR or "
-                 "clCommandSVMMemFillKHR\n");
-        return true;
-    }
 
     return false;
 }
@@ -85,11 +79,12 @@ cl_int BasicSVMCommandBufferTest::SetUpKernelArgs(void)
 
 cl_int BasicSVMCommandBufferTest::init_extension_functions()
 {
-    BasicCommandBufferTest::init_extension_functions();
+    cl_int error = BasicCommandBufferTest::init_extension_functions();
+    test_error(error, "Unable to initialise extension functions");
 
     cl_platform_id platform;
-    cl_int error = clGetDeviceInfo(device, CL_DEVICE_PLATFORM,
-                                   sizeof(cl_platform_id), &platform, nullptr);
+    error = clGetDeviceInfo(device, CL_DEVICE_PLATFORM, sizeof(cl_platform_id),
+                            &platform, nullptr);
     test_error(error, "clGetDeviceInfo for CL_DEVICE_PLATFORM failed");
 
     GET_EXTENSION_ADDRESS(clCommandSVMMemFillKHR);