Merge pull request #543 from veselypeta/petr/fix-sampler-spec

veselypeta · web-flow · commit 08bfe781ceff · 2023-05-29T11:21:55.000+01:00
[UR] clarify sampler spec and add CTS
diff --git a/include/ur_api.h b/include/ur_api.h
@@ -2289,20 +2289,23 @@ urSamplerRelease(
 ///         + `NULL == hSampler`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
 ///         + `::UR_SAMPLER_INFO_FILTER_MODE < propName`
-///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
-///         + `NULL == pPropValue`
-///         + `NULL == pPropSizeRet`
 ///     - ::UR_RESULT_ERROR_INVALID_SAMPLER
 ///     - ::UR_RESULT_ERROR_INVALID_VALUE
 ///     - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
 ///     - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
+///     - ::UR_RESULT_ERROR_INVALID_SIZE
+///         + `propSize == 0 && pPropValue != NULL`
+///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
+///         + `propSize != 0 && pPropValue == NULL`
+///         + `pPropValue == NULL && pPropSizeRet == NULL`
 UR_APIEXPORT ur_result_t UR_APICALL
 urSamplerGetInfo(
     ur_sampler_handle_t hSampler, ///< [in] handle of the sampler object
     ur_sampler_info_t propName,   ///< [in] name of the sampler property to query
     size_t propSize,              ///< [in] size in bytes of the sampler property value provided
-    void *pPropValue,             ///< [out][typename(propName, propSize)] value of the sampler property
-    size_t *pPropSizeRet          ///< [out] size in bytes returned in sampler property value
+    void *pPropValue,             ///< [out][typename(propName, propSize)][optional] value of the sampler
+                                  ///< property
+    size_t *pPropSizeRet          ///< [out][optional] size in bytes returned in sampler property value
 );
 
 ///////////////////////////////////////////////////////////////////////////////
diff --git a/scripts/core/sampler.yml b/scripts/core/sampler.yml
@@ -155,15 +155,20 @@ params:
       desc: "[in] size in bytes of the sampler property value provided"
     - type: "void*"
       name: pPropValue
-      desc: "[out][typename(propName, propSize)] value of the sampler property"
+      desc: "[out][typename(propName, propSize)][optional] value of the sampler property"
     - type: "size_t*"
       name: pPropSizeRet
-      desc: "[out] size in bytes returned in sampler property value"
+      desc: "[out][optional] size in bytes returned in sampler property value"
 returns:
     - $X_RESULT_ERROR_INVALID_SAMPLER
     - $X_RESULT_ERROR_INVALID_VALUE
     - $X_RESULT_ERROR_OUT_OF_HOST_MEMORY
     - $X_RESULT_ERROR_OUT_OF_RESOURCES
+    - $X_RESULT_ERROR_INVALID_SIZE:
+      - "`propSize == 0 && pPropValue != NULL`"
+    - $X_RESULT_ERROR_INVALID_NULL_POINTER:
+      - "`propSize != 0 && pPropValue == NULL`"
+      - "`pPropValue == NULL && pPropSizeRet == NULL`"
 --- #--------------------------------------------------------------------------
 type: function
 desc: "Return sampler native sampler handle."
diff --git a/source/adapters/null/ur_nullddi.cpp b/source/adapters/null/ur_nullddi.cpp
@@ -1019,9 +1019,10 @@ __urdlllocal ur_result_t UR_APICALL urSamplerGetInfo(
     size_t
         propSize, ///< [in] size in bytes of the sampler property value provided
     void *
-        pPropValue, ///< [out][typename(propName, propSize)] value of the sampler property
+        pPropValue, ///< [out][typename(propName, propSize)][optional] value of the sampler
+                    ///< property
     size_t *
-        pPropSizeRet ///< [out] size in bytes returned in sampler property value
+        pPropSizeRet ///< [out][optional] size in bytes returned in sampler property value
     ) try {
     ur_result_t result = UR_RESULT_SUCCESS;
 
diff --git a/source/loader/layers/tracing/ur_trcddi.cpp b/source/loader/layers/tracing/ur_trcddi.cpp
@@ -1152,9 +1152,10 @@ __urdlllocal ur_result_t UR_APICALL urSamplerGetInfo(
     size_t
         propSize, ///< [in] size in bytes of the sampler property value provided
     void *
-        pPropValue, ///< [out][typename(propName, propSize)] value of the sampler property
+        pPropValue, ///< [out][typename(propName, propSize)][optional] value of the sampler
+                    ///< property
     size_t *
-        pPropSizeRet ///< [out] size in bytes returned in sampler property value
+        pPropSizeRet ///< [out][optional] size in bytes returned in sampler property value
 ) {
     auto pfnGetInfo = context.urDdiTable.Sampler.pfnGetInfo;
 
diff --git a/source/loader/layers/validation/ur_valddi.cpp b/source/loader/layers/validation/ur_valddi.cpp
@@ -1335,9 +1335,10 @@ __urdlllocal ur_result_t UR_APICALL urSamplerGetInfo(
     size_t
         propSize, ///< [in] size in bytes of the sampler property value provided
     void *
-        pPropValue, ///< [out][typename(propName, propSize)] value of the sampler property
+        pPropValue, ///< [out][typename(propName, propSize)][optional] value of the sampler
+                    ///< property
     size_t *
-        pPropSizeRet ///< [out] size in bytes returned in sampler property value
+        pPropSizeRet ///< [out][optional] size in bytes returned in sampler property value
 ) {
     auto pfnGetInfo = context.urDdiTable.Sampler.pfnGetInfo;
 
@@ -1350,17 +1351,21 @@ __urdlllocal ur_result_t UR_APICALL urSamplerGetInfo(
             return UR_RESULT_ERROR_INVALID_NULL_HANDLE;
         }
 
-        if (NULL == pPropValue) {
+        if (propSize != 0 && pPropValue == NULL) {
             return UR_RESULT_ERROR_INVALID_NULL_POINTER;
         }
 
-        if (NULL == pPropSizeRet) {
+        if (pPropValue == NULL && pPropSizeRet == NULL) {
             return UR_RESULT_ERROR_INVALID_NULL_POINTER;
         }
 
         if (UR_SAMPLER_INFO_FILTER_MODE < propName) {
             return UR_RESULT_ERROR_INVALID_ENUMERATION;
         }
+
+        if (propSize == 0 && pPropValue != NULL) {
+            return UR_RESULT_ERROR_INVALID_SIZE;
+        }
     }
 
     ur_result_t result =
diff --git a/source/loader/ur_ldrddi.cpp b/source/loader/ur_ldrddi.cpp
@@ -1366,9 +1366,10 @@ __urdlllocal ur_result_t UR_APICALL urSamplerGetInfo(
     size_t
         propSize, ///< [in] size in bytes of the sampler property value provided
     void *
-        pPropValue, ///< [out][typename(propName, propSize)] value of the sampler property
+        pPropValue, ///< [out][typename(propName, propSize)][optional] value of the sampler
+                    ///< property
     size_t *
-        pPropSizeRet ///< [out] size in bytes returned in sampler property value
+        pPropSizeRet ///< [out][optional] size in bytes returned in sampler property value
 ) {
     ur_result_t result = UR_RESULT_SUCCESS;
 
diff --git a/source/loader/ur_libapi.cpp b/source/loader/ur_libapi.cpp
@@ -1538,22 +1538,25 @@ ur_result_t UR_APICALL urSamplerRelease(
 ///         + `NULL == hSampler`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
 ///         + `::UR_SAMPLER_INFO_FILTER_MODE < propName`
-///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
-///         + `NULL == pPropValue`
-///         + `NULL == pPropSizeRet`
 ///     - ::UR_RESULT_ERROR_INVALID_SAMPLER
 ///     - ::UR_RESULT_ERROR_INVALID_VALUE
 ///     - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
 ///     - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
+///     - ::UR_RESULT_ERROR_INVALID_SIZE
+///         + `propSize == 0 && pPropValue != NULL`
+///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
+///         + `propSize != 0 && pPropValue == NULL`
+///         + `pPropValue == NULL && pPropSizeRet == NULL`
 ur_result_t UR_APICALL urSamplerGetInfo(
     ur_sampler_handle_t hSampler, ///< [in] handle of the sampler object
     ur_sampler_info_t propName, ///< [in] name of the sampler property to query
     size_t
         propSize, ///< [in] size in bytes of the sampler property value provided
     void *
-        pPropValue, ///< [out][typename(propName, propSize)] value of the sampler property
+        pPropValue, ///< [out][typename(propName, propSize)][optional] value of the sampler
+                    ///< property
     size_t *
-        pPropSizeRet ///< [out] size in bytes returned in sampler property value
+        pPropSizeRet ///< [out][optional] size in bytes returned in sampler property value
     ) try {
     auto pfnGetInfo = ur_lib::context->urDdiTable.Sampler.pfnGetInfo;
     if (nullptr == pfnGetInfo) {
diff --git a/source/ur_api.cpp b/source/ur_api.cpp
@@ -1277,22 +1277,25 @@ ur_result_t UR_APICALL urSamplerRelease(
 ///         + `NULL == hSampler`
 ///     - ::UR_RESULT_ERROR_INVALID_ENUMERATION
 ///         + `::UR_SAMPLER_INFO_FILTER_MODE < propName`
-///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
-///         + `NULL == pPropValue`
-///         + `NULL == pPropSizeRet`
 ///     - ::UR_RESULT_ERROR_INVALID_SAMPLER
 ///     - ::UR_RESULT_ERROR_INVALID_VALUE
 ///     - ::UR_RESULT_ERROR_OUT_OF_HOST_MEMORY
 ///     - ::UR_RESULT_ERROR_OUT_OF_RESOURCES
+///     - ::UR_RESULT_ERROR_INVALID_SIZE
+///         + `propSize == 0 && pPropValue != NULL`
+///     - ::UR_RESULT_ERROR_INVALID_NULL_POINTER
+///         + `propSize != 0 && pPropValue == NULL`
+///         + `pPropValue == NULL && pPropSizeRet == NULL`
 ur_result_t UR_APICALL urSamplerGetInfo(
     ur_sampler_handle_t hSampler, ///< [in] handle of the sampler object
     ur_sampler_info_t propName, ///< [in] name of the sampler property to query
     size_t
         propSize, ///< [in] size in bytes of the sampler property value provided
     void *
-        pPropValue, ///< [out][typename(propName, propSize)] value of the sampler property
+        pPropValue, ///< [out][typename(propName, propSize)][optional] value of the sampler
+                    ///< property
     size_t *
-        pPropSizeRet ///< [out] size in bytes returned in sampler property value
+        pPropSizeRet ///< [out][optional] size in bytes returned in sampler property value
 ) {
     ur_result_t result = UR_RESULT_SUCCESS;
     return result;
diff --git a/test/conformance/CMakeLists.txt b/test/conformance/CMakeLists.txt
@@ -50,6 +50,7 @@ add_subdirectory(memory)
 add_subdirectory(usm)
 add_subdirectory(event)
 add_subdirectory(queue)
+add_subdirectory(sampler)
 add_subdirectory(enqueue)
 
 if(DEFINED UR_DPCXX)
diff --git a/test/conformance/sampler/CMakeLists.txt b/test/conformance/sampler/CMakeLists.txt
@@ -0,0 +1,11 @@
+# Copyright (C) 2023 Intel Corporation
+# SPDX-License-Identifier: MIT
+
+add_conformance_test_with_devices_environment(sampler 
+    urSamplerCreate.cpp
+    urSamplerCreateWithNativeHandle.cpp 
+    urSamplerGetInfo.cpp 
+    urSamplerGetNativeHandle.cpp 
+    urSamplerRelease.cpp 
+    urSamplerRetain.cpp
+)
diff --git a/test/conformance/sampler/urSamplerCreate.cpp b/test/conformance/sampler/urSamplerCreate.cpp
@@ -0,0 +1,102 @@
+// Copyright (C) 2023 Intel Corporation
+// SPDX-License-Identifier: MIT
+
+#include <uur/fixtures.h>
+
+using SamplerCreateParamTy =
+    std::tuple<bool, ur_sampler_addressing_mode_t, ur_sampler_filter_mode_t>;
+
+struct urSamplerCreateTestWithParam
+    : uur::urContextTestWithParam<SamplerCreateParamTy> {};
+
+namespace uur {
+template <>
+std::string deviceTestWithParamPrinter(
+    const ::testing::TestParamInfo<
+        std::tuple<ur_device_handle_t, SamplerCreateParamTy>> &info) {
+    auto device = std::get<0>(info.param);
+    auto param = std::get<1>(info.param);
+
+    const auto normalized = std::get<0>(param);
+    const auto addr_mode = std::get<1>(param);
+    const auto filter_mode = std::get<2>(param);
+
+    std::stringstream ss;
+    ss << normalized << "_" << addr_mode << "_" << filter_mode;
+    return uur::GetPlatformAndDeviceName(device) + "__" + ss.str();
+}
+} // namespace uur
+UUR_TEST_SUITE_P(
+    urSamplerCreateTestWithParam,
+    ::testing::Combine(
+        ::testing::Values(true, false),
+        ::testing::Values(UR_SAMPLER_ADDRESSING_MODE_NONE,
+                          UR_SAMPLER_ADDRESSING_MODE_CLAMP_TO_EDGE,
+                          UR_SAMPLER_ADDRESSING_MODE_CLAMP,
+                          UR_SAMPLER_ADDRESSING_MODE_REPEAT,
+                          UR_SAMPLER_ADDRESSING_MODE_MIRRORED_REPEAT),
+        ::testing::Values(UR_SAMPLER_FILTER_MODE_NEAREST,
+                          UR_SAMPLER_FILTER_MODE_LINEAR)),
+    uur::deviceTestWithParamPrinter<SamplerCreateParamTy>);
+
+TEST_P(urSamplerCreateTestWithParam, Success) {
+
+    const auto param = getParam();
+    const auto normalized = std::get<0>(param);
+    const auto addr_mode = std::get<1>(param);
+    const auto filter_mode = std::get<2>(param);
+
+    ur_sampler_desc_t sampler_desc{
+        UR_STRUCTURE_TYPE_SAMPLER_DESC, /* stype */
+        nullptr,                        /* pNext */
+        normalized,                     /* normalizedCoords */
+        addr_mode,                      /* addressing mode */
+        filter_mode,                    /* filterMode */
+    };
+
+    ur_sampler_handle_t hSampler = nullptr;
+    ASSERT_SUCCESS(urSamplerCreate(context, &sampler_desc, &hSampler));
+    ASSERT_NE(hSampler, nullptr);
+    EXPECT_SUCCESS(urSamplerRelease(hSampler));
+}
+
+using urSamplerCreateTest = uur::urContextTest;
+UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urSamplerCreateTest);
+
+TEST_P(urSamplerCreateTest, InvalidNullHandleContext) {
+    ur_sampler_desc_t sampler_desc{
+        UR_STRUCTURE_TYPE_SAMPLER_DESC,   /* stype */
+        nullptr,                          /* pNext */
+        true,                             /* normalizedCoords */
+        UR_SAMPLER_ADDRESSING_MODE_CLAMP, /* addressing mode */
+        UR_SAMPLER_FILTER_MODE_LINEAR,    /* filterMode */
+    };
+    ur_sampler_handle_t hSampler = nullptr;
+    ASSERT_EQ_RESULT(urSamplerCreate(nullptr, &sampler_desc, &hSampler),
+                     UR_RESULT_ERROR_INVALID_NULL_HANDLE);
+}
+
+TEST_P(urSamplerCreateTest, InvalidEnumerationAddrMode) {
+    ur_sampler_desc_t sampler_desc{
+        UR_STRUCTURE_TYPE_SAMPLER_DESC,          /* stype */
+        nullptr,                                 /* pNext */
+        true,                                    /* normalizedCoords */
+        UR_SAMPLER_ADDRESSING_MODE_FORCE_UINT32, /* addressing mode */
+        UR_SAMPLER_FILTER_MODE_LINEAR,           /* filterMode */
+    };
+    ur_sampler_handle_t hSampler = nullptr;
+    ASSERT_EQ_RESULT(urSamplerCreate(context, &sampler_desc, &hSampler),
+                     UR_RESULT_ERROR_INVALID_ENUMERATION);
+}
+TEST_P(urSamplerCreateTest, InvalidEnumerationFilterMode) {
+    ur_sampler_desc_t sampler_desc{
+        UR_STRUCTURE_TYPE_SAMPLER_DESC,      /* stype */
+        nullptr,                             /* pNext */
+        true,                                /* normalizedCoords */
+        UR_SAMPLER_ADDRESSING_MODE_CLAMP,    /* addressing mode */
+        UR_SAMPLER_FILTER_MODE_FORCE_UINT32, /* filterMode */
+    };
+    ur_sampler_handle_t hSampler = nullptr;
+    ASSERT_EQ_RESULT(urSamplerCreate(context, &sampler_desc, &hSampler),
+                     UR_RESULT_ERROR_INVALID_ENUMERATION);
+}
diff --git a/test/conformance/sampler/urSamplerCreateWithNativeHandle.cpp b/test/conformance/sampler/urSamplerCreateWithNativeHandle.cpp
@@ -0,0 +1,16 @@
+// Copyright (C) 2023 Intel Corporation
+// SPDX-License-Identifier: MIT
+
+#include <uur/fixtures.h>
+
+using urSamplerCreateWithNativeHandleTest = uur::urContextTest;
+
+UUR_INSTANTIATE_DEVICE_TEST_SUITE_P(urSamplerCreateWithNativeHandleTest);
+
+TEST_P(urSamplerCreateWithNativeHandleTest, InvalidNullHandleNativeHandle) {
+    ur_sampler_handle_t sampler = nullptr;
+    ur_sampler_native_properties_t props{};
+    ASSERT_EQ_RESULT(
+        UR_RESULT_ERROR_INVALID_NULL_HANDLE,
+        urSamplerCreateWithNativeHandle(nullptr, context, &props, &sampler));
+}
diff --git a/test/conformance/sampler/urSamplerGetInfo.cpp b/test/conformance/sampler/urSamplerGetInfo.cpp
diff --git a/test/conformance/sampler/urSamplerGetNativeHandle.cpp b/test/conformance/sampler/urSamplerGetNativeHandle.cpp
diff --git a/test/conformance/sampler/urSamplerRelease.cpp b/test/conformance/sampler/urSamplerRelease.cpp
diff --git a/test/conformance/sampler/urSamplerRetain.cpp b/test/conformance/sampler/urSamplerRetain.cpp
diff --git a/test/conformance/testing/include/uur/fixtures.h b/test/conformance/testing/include/uur/fixtures.h
