Merge pull request #1559 from Bensuo/ewan/buffer_fill_test_fix

Fix CTS test for HIP accessors

Author: kbenzie

test/conformance/exp_command_buffer/buffer_fill_kernel_update.cpp

@@ -19,18 +19,32 @@ struct BufferFillCommandTest
                                          &buffer));
 
         // First argument is buffer to fill
-        ASSERT_SUCCESS(urKernelSetArgMemObj(kernel, 0, nullptr, buffer));
-
-        // second arg is hidden accessor
-        struct {
-            size_t offsets[1] = {0};
-        } accessor;
-        ASSERT_SUCCESS(urKernelSetArgValue(kernel, 1, sizeof(accessor), nullptr,
-                                           &accessor));
-
-        // Second argument is scalar to fill with.
+        unsigned current_arg_index = 0;
         ASSERT_SUCCESS(
-            urKernelSetArgValue(kernel, 2, sizeof(val), nullptr, &val));
+            urKernelSetArgMemObj(kernel, current_arg_index++, nullptr, buffer));
+
+        // Add accessor arguments depending on backend.
+        // HIP has 3 offset parameters and other backends only have 1.
+        if (backend == UR_PLATFORM_BACKEND_HIP) {
+            size_t val = 0;
+            ASSERT_SUCCESS(urKernelSetArgValue(kernel, current_arg_index++,
+                                               sizeof(size_t), nullptr, &val));
+            ASSERT_SUCCESS(urKernelSetArgValue(kernel, current_arg_index++,
+                                               sizeof(size_t), nullptr, &val));
+            ASSERT_SUCCESS(urKernelSetArgValue(kernel, current_arg_index++,
+                                               sizeof(size_t), nullptr, &val));
+        } else {
+            struct {
+                size_t offsets[1] = {0};
+            } accessor;
+            ASSERT_SUCCESS(urKernelSetArgValue(kernel, current_arg_index++,
+                                               sizeof(accessor), nullptr,
+                                               &accessor));
+        }
+
+        // Second user defined argument is scalar to fill with.
+        ASSERT_SUCCESS(urKernelSetArgValue(kernel, current_arg_index++,
+                                           sizeof(val), nullptr, &val));
 
         // Append kernel command to command-buffer and close command-buffer
         ASSERT_SUCCESS(urCommandBufferAppendKernelLaunchExp(

test/conformance/exp_command_buffer/exp_command_buffer_adapter_hip.match

@@ -1,8 +1,3 @@
-{{OPT}}BufferFillCommandTest.UpdateParameters/AMD_HIP_BACKEND{{.*}}
-{{OPT}}BufferFillCommandTest.UpdateGlobalSize/AMD_HIP_BACKEND{{.*}}
-{{OPT}}BufferFillCommandTest.SeparateUpdateCalls/AMD_HIP_BACKEND{{.*}}
-{{OPT}}BufferFillCommandTest.OverrideUpdate/AMD_HIP_BACKEND{{.*}}
-{{OPT}}BufferFillCommandTest.OverrideArgList/AMD_HIP_BACKEND{{.*}}
 {{OPT}}USMFillCommandTest.UpdateParameters/AMD_HIP_BACKEND{{.*}}
 {{OPT}}USMMultipleFillCommandTest.UpdateAllKernels/AMD_HIP_BACKEND{{.*}}
 {{OPT}}BufferSaxpyKernelTest.UpdateParameters/AMD_HIP_BACKEND{{.*}}
@@ -14,4 +9,3 @@
 {{OPT}}urCommandBufferReleaseCommandExpTest.InvalidNullHandle/AMD_HIP_BACKEND{{.*}}
 {{OPT}}urCommandBufferRetainCommandExpTest.Success/AMD_HIP_BACKEND{{.*}}
 {{OPT}}urCommandBufferRetainCommandExpTest.InvalidNullHandle/AMD_HIP_BACKEND{{.*}}
-{{OPT}}{{Segmentation fault|Aborted}}