Merge pull request #1845 from aarongreig/aaron/removePowerOf2FillVal

kbenzie · web-flow · commit 2f548cae3b58 · 2024-07-10T12:36:17.000+01:00
Remove the power of 2 pattern size requirement from USMFill
diff --git a/include/ur_api.h b/include/ur_api.h
@@ -6894,7 +6894,6 @@ urEnqueueMemUnmap(
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE
 ///         + `patternSize == 0 || size == 0`
 ///         + `patternSize > size`
-///         + `(patternSize & (patternSize - 1)) != 0`
 ///         + `size % patternSize != 0`
 ///         + If `size` is higher than the allocation size of `ptr`
 ///     - ::UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST
@@ -8388,7 +8387,6 @@ urCommandBufferAppendUSMMemcpyExp(
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE
 ///         + `patternSize == 0 || size == 0`
 ///         + `patternSize > size`
-///         + `(patternSize & (patternSize - 1)) != 0`
 ///         + `size % patternSize != 0`
 ///         + If `size` is higher than the allocation size of `ptr`
 ///     - ::UR_RESULT_ERROR_INVALID_MEM_OBJECT
diff --git a/scripts/core/enqueue.yml b/scripts/core/enqueue.yml
@@ -1061,7 +1061,6 @@ returns:
     - $X_RESULT_ERROR_INVALID_SIZE:
         - "`patternSize == 0 || size == 0`"
         - "`patternSize > size`"
-        - "`(patternSize & (patternSize - 1)) != 0`"
         - "`size % patternSize != 0`"
         - "If `size` is higher than the allocation size of `ptr`"
     - $X_RESULT_ERROR_INVALID_EVENT_WAIT_LIST:
diff --git a/scripts/core/exp-command-buffer.yml b/scripts/core/exp-command-buffer.yml
@@ -408,7 +408,6 @@ returns:
     - $X_RESULT_ERROR_INVALID_SIZE:
         - "`patternSize == 0 || size == 0`"
         - "`patternSize > size`"
-        - "`(patternSize & (patternSize - 1)) != 0`"
         - "`size % patternSize != 0`"
         - "If `size` is higher than the allocation size of `ptr`"
     - $X_RESULT_ERROR_INVALID_MEM_OBJECT
diff --git a/source/loader/layers/validation/ur_valddi.cpp b/source/loader/layers/validation/ur_valddi.cpp
@@ -5979,10 +5979,6 @@ __urdlllocal ur_result_t UR_APICALL urEnqueueUSMFill(
             return UR_RESULT_ERROR_INVALID_SIZE;
         }
 
-        if ((patternSize & (patternSize - 1)) != 0) {
-            return UR_RESULT_ERROR_INVALID_SIZE;
-        }
-
         if (size % patternSize != 0) {
             return UR_RESULT_ERROR_INVALID_SIZE;
         }
@@ -8089,10 +8085,6 @@ __urdlllocal ur_result_t UR_APICALL urCommandBufferAppendUSMFillExp(
             return UR_RESULT_ERROR_INVALID_SIZE;
         }
 
-        if ((patternSize & (patternSize - 1)) != 0) {
-            return UR_RESULT_ERROR_INVALID_SIZE;
-        }
-
         if (size % patternSize != 0) {
             return UR_RESULT_ERROR_INVALID_SIZE;
         }
diff --git a/source/loader/ur_libapi.cpp b/source/loader/ur_libapi.cpp
@@ -5887,7 +5887,6 @@ ur_result_t UR_APICALL urEnqueueMemUnmap(
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE
 ///         + `patternSize == 0 || size == 0`
 ///         + `patternSize > size`
-///         + `(patternSize & (patternSize - 1)) != 0`
 ///         + `size % patternSize != 0`
 ///         + If `size` is higher than the allocation size of `ptr`
 ///     - ::UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST
@@ -7540,7 +7539,6 @@ ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE
 ///         + `patternSize == 0 || size == 0`
 ///         + `patternSize > size`
-///         + `(patternSize & (patternSize - 1)) != 0`
 ///         + `size % patternSize != 0`
 ///         + If `size` is higher than the allocation size of `ptr`
 ///     - ::UR_RESULT_ERROR_INVALID_MEM_OBJECT
diff --git a/source/ur_api.cpp b/source/ur_api.cpp
@@ -5023,7 +5023,6 @@ ur_result_t UR_APICALL urEnqueueMemUnmap(
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE
 ///         + `patternSize == 0 || size == 0`
 ///         + `patternSize > size`
-///         + `(patternSize & (patternSize - 1)) != 0`
 ///         + `size % patternSize != 0`
 ///         + If `size` is higher than the allocation size of `ptr`
 ///     - ::UR_RESULT_ERROR_INVALID_EVENT_WAIT_LIST
@@ -6404,7 +6403,6 @@ ur_result_t UR_APICALL urCommandBufferAppendUSMMemcpyExp(
 ///     - ::UR_RESULT_ERROR_INVALID_SIZE
 ///         + `patternSize == 0 || size == 0`
 ///         + `patternSize > size`
-///         + `(patternSize & (patternSize - 1)) != 0`
 ///         + `size % patternSize != 0`
 ///         + If `size` is higher than the allocation size of `ptr`
 ///     - ::UR_RESULT_ERROR_INVALID_MEM_OBJECT

Original file line number	Diff line number	Diff line change
`@@ -5979,10 +5979,6 @@ __urdlllocal ur_result_t UR_APICALL urEnqueueUSMFill(`
`5979`	`5979`	`return UR_RESULT_ERROR_INVALID_SIZE;`
`5980`	`5980`	`}`
`5981`	`5981`
`5982`		`- if ((patternSize & (patternSize - 1)) != 0) {`
`5983`		`- return UR_RESULT_ERROR_INVALID_SIZE;`
`5984`		`- }`
`5985`		`-`
`5986`	`5982`	`if (size % patternSize != 0) {`
`5987`	`5983`	`return UR_RESULT_ERROR_INVALID_SIZE;`
`5988`	`5984`	`}`
`@@ -8089,10 +8085,6 @@ __urdlllocal ur_result_t UR_APICALL urCommandBufferAppendUSMFillExp(`
`8089`	`8085`	`return UR_RESULT_ERROR_INVALID_SIZE;`
`8090`	`8086`	`}`
`8091`	`8087`
`8092`		`- if ((patternSize & (patternSize - 1)) != 0) {`
`8093`		`- return UR_RESULT_ERROR_INVALID_SIZE;`
`8094`		`- }`
`8095`		`-`
`8096`	`8088`	`if (size % patternSize != 0) {`
`8097`	`8089`	`return UR_RESULT_ERROR_INVALID_SIZE;`
`8098`	`8090`	`}`