From 9fdc3b256f5f85b030674a51621345024d25cb8c Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Tue, 7 Dec 2021 00:25:21 +0100 Subject: [PATCH] [PATCH 89/90] rename pocl_basic_svm_fill() to pocl_driver_svm_fill() Gbp-Pq: Name 0089-rename-pocl_basic_svm_fill-to-pocl_driver_svm_fill.patch --- lib/CL/devices/basic/basic.c | 12 +----------- lib/CL/devices/common_driver.c | 10 ++++++++++ lib/CL/devices/common_driver.h | 5 +++++ lib/CL/devices/hsa/pocl-hsa.c | 2 +- 4 files changed, 17 insertions(+), 12 deletions(-) diff --git a/lib/CL/devices/basic/basic.c b/lib/CL/devices/basic/basic.c index 539c8b8..af5cb9a 100644 --- a/lib/CL/devices/basic/basic.c +++ b/lib/CL/devices/basic/basic.c @@ -125,7 +125,7 @@ pocl_basic_init_device_ops(struct pocl_device_ops *ops) ops->svm_map = NULL; ops->svm_unmap = NULL; ops->svm_copy = pocl_basic_svm_copy; - ops->svm_fill = pocl_basic_svm_fill; + ops->svm_fill = pocl_driver_svm_fill; ops->create_kernel = NULL; ops->free_kernel = NULL; @@ -787,13 +787,3 @@ pocl_basic_svm_copy (cl_device_id dev, void *__restrict__ dst, { memcpy (dst, src, size); } - -POCL_EXPORT -void -pocl_basic_svm_fill (cl_device_id dev, void *__restrict__ svm_ptr, size_t size, - void *__restrict__ pattern, size_t pattern_size) -{ - pocl_mem_identifier temp; - temp.mem_ptr = svm_ptr; - pocl_driver_memfill (dev->data, &temp, NULL, size, 0, pattern, pattern_size); -} diff --git a/lib/CL/devices/common_driver.c b/lib/CL/devices/common_driver.c index 6033097..229862a 100644 --- a/lib/CL/devices/common_driver.c +++ b/lib/CL/devices/common_driver.c @@ -471,6 +471,16 @@ pocl_driver_free (cl_device_id device, cl_mem mem) p->version = 0; } +void +pocl_driver_svm_fill (cl_device_id dev, void *__restrict__ svm_ptr, + size_t size, void *__restrict__ pattern, + size_t pattern_size) +{ + pocl_mem_identifier temp; + temp.mem_ptr = svm_ptr; + pocl_driver_memfill (dev->data, &temp, NULL, size, 0, pattern, pattern_size); +} + /* These are implementations of compilation callbacks for all devices * that support compilation via LLVM. They take care of compilation/linking * of source/binary/spir down to parallel.bc level. diff --git a/lib/CL/devices/common_driver.h b/lib/CL/devices/common_driver.h index 777c02a..2f01941 100644 --- a/lib/CL/devices/common_driver.h +++ b/lib/CL/devices/common_driver.h @@ -81,6 +81,11 @@ cl_int pocl_driver_alloc_mem_obj (cl_device_id device, cl_mem mem, POCL_EXPORT void pocl_driver_free (cl_device_id device, cl_mem mem); +POCL_EXPORT +void pocl_driver_svm_fill (cl_device_id dev, void *__restrict__ svm_ptr, + size_t size, void *__restrict__ pattern, + size_t pattern_size); + POCL_EXPORT int pocl_driver_build_source (cl_program program, cl_uint device_i, cl_uint num_input_headers, diff --git a/lib/CL/devices/hsa/pocl-hsa.c b/lib/CL/devices/hsa/pocl-hsa.c index 82d20ee..4047980 100644 --- a/lib/CL/devices/hsa/pocl-hsa.c +++ b/lib/CL/devices/hsa/pocl-hsa.c @@ -257,7 +257,7 @@ pocl_hsa_init_device_ops(struct pocl_device_ops *ops) ops->svm_free = pocl_hsa_svm_free; ops->svm_alloc = pocl_hsa_svm_alloc; ops->svm_copy = pocl_hsa_svm_copy; - ops->svm_fill = pocl_basic_svm_fill; + ops->svm_fill = pocl_driver_svm_fill; ops->svm_register = pocl_hsa_svm_register; ops->svm_unregister = pocl_hsa_svm_unregister; -- 2.30.2