From 36d7ef1b37e9505ef0073748de5e798cfafc1c34 Mon Sep 17 00:00:00 2001 From: Andreas Beckmann Date: Mon, 26 Jun 2023 15:55:19 +0200 Subject: [PATCH] [PATCH 1/4] rename bitcode_is_triple() to pocl_bitcode_is_triple() Gbp-Pq: Name 0001-rename-bitcode_is_triple-to-pocl_bitcode_is_triple.patch --- lib/CL/devices/common_driver.c | 6 +++--- lib/CL/devices/level0/level0-driver.cc | 2 +- lib/CL/devices/level0/pocl-level0.cc | 8 ++++---- lib/CL/pocl_llvm.h | 2 +- lib/CL/pocl_llvm_utils.cc | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) diff --git a/lib/CL/devices/common_driver.c b/lib/CL/devices/common_driver.c index 8a11e49..9d222f5 100644 --- a/lib/CL/devices/common_driver.c +++ b/lib/CL/devices/common_driver.c @@ -579,7 +579,7 @@ pocl_llvm_convert_and_link_ir (cl_program program, cl_uint device_i, if (program->binaries[device_i]) { int spir_binary - = bitcode_is_triple ((char *)program->binaries[device_i], + = pocl_bitcode_is_triple ((char *)program->binaries[device_i], program->binary_sizes[device_i], "spir"); if (spir_binary) { @@ -854,7 +854,7 @@ pocl_driver_supports_binary (cl_device_id device, size_t length, #ifdef ENABLE_SPIR /* SPIR binary is supported if the device has cl_khr_spir */ - if (bitcode_is_triple (binary, length, "spir")) + if (pocl_bitcode_is_triple (binary, length, "spir")) { if (strstr (device->extensions, "cl_khr_spir") == NULL) { @@ -871,7 +871,7 @@ pocl_driver_supports_binary (cl_device_id device, size_t length, /* LLVM IR can be supported by the driver, if the triple matches */ if (device->llvm_target_triplet - && bitcode_is_triple (binary, length, device->llvm_target_triplet)) + && pocl_bitcode_is_triple (binary, length, device->llvm_target_triplet)) return 1; return 0; diff --git a/lib/CL/devices/level0/level0-driver.cc b/lib/CL/devices/level0/level0-driver.cc index a1194e9..9dee5e6 100644 --- a/lib/CL/devices/level0/level0-driver.cc +++ b/lib/CL/devices/level0/level0-driver.cc @@ -2486,7 +2486,7 @@ int Level0Device::createProgram(cl_program Program, cl_uint DeviceI) { std::vector ProgramBC; char *BinaryPtr = (char *)Program->binaries[DeviceI]; size_t BinarySize = Program->binary_sizes[DeviceI]; - int TestR = bitcode_is_triple(BinaryPtr, BinarySize, "spir"); + int TestR = pocl_bitcode_is_triple(BinaryPtr, BinarySize, "spir"); assert(TestR && "Program->binaries[] is not LLVM bitcode!"); ProgramBC.insert(ProgramBC.end(), BinaryPtr, BinaryPtr + BinarySize); diff --git a/lib/CL/devices/level0/pocl-level0.cc b/lib/CL/devices/level0/pocl-level0.cc index a5164e5..63fd44f 100644 --- a/lib/CL/devices/level0/pocl-level0.cc +++ b/lib/CL/devices/level0/pocl-level0.cc @@ -490,8 +490,8 @@ int pocl_level0_supports_binary(cl_device_id Device, size_t Length, return 1; } #ifdef ENABLE_SPIR - if ((bitcode_is_triple(Binary, Length, "spir-unknown") != 0) || - (bitcode_is_triple(Binary, Length, "spir64-unknown") != 0)) { + if ((pocl_bitcode_is_triple(Binary, Length, "spir-unknown") != 0) || + (pocl_bitcode_is_triple(Binary, Length, "spir64-unknown") != 0)) { return 1; } #endif @@ -567,10 +567,10 @@ int pocl_level0_build_binary(cl_program Program, cl_uint DeviceI, assert(Program->binary_sizes[DeviceI] > 0); int Triple = - bitcode_is_triple((char *)Program->binaries[DeviceI], + pocl_bitcode_is_triple((char *)Program->binaries[DeviceI], Program->binary_sizes[DeviceI], "spir-unknown"); Triple += - bitcode_is_triple((char *)Program->binaries[DeviceI], + pocl_bitcode_is_triple((char *)Program->binaries[DeviceI], Program->binary_sizes[DeviceI], "spir64-unknown"); POCL_RETURN_ERROR_ON((Triple == 0), CL_BUILD_PROGRAM_FAILURE, "the binary supplied to level0 driver is " diff --git a/lib/CL/pocl_llvm.h b/lib/CL/pocl_llvm.h index 61910cb..7ae6d36 100644 --- a/lib/CL/pocl_llvm.h +++ b/lib/CL/pocl_llvm.h @@ -42,7 +42,7 @@ extern "C" { int cpu_has_fma (); POCL_EXPORT - int bitcode_is_triple (const char *bitcode, size_t size, const char *triple); + int pocl_bitcode_is_triple (const char *bitcode, size_t size, const char *triple); /* Sets up the native/preferred vector widths at runtime (using LLVM). */ void cpu_setup_vector_widths (cl_device_id dev); diff --git a/lib/CL/pocl_llvm_utils.cc b/lib/CL/pocl_llvm_utils.cc index b0479c9..dba89cc 100644 --- a/lib/CL/pocl_llvm_utils.cc +++ b/lib/CL/pocl_llvm_utils.cc @@ -157,7 +157,7 @@ char *pocl_get_llvm_cpu_name() { return cpu_name; } -int bitcode_is_triple(const char *bitcode, size_t size, const char *triple) { +int pocl_bitcode_is_triple(const char *bitcode, size_t size, const char *triple) { std::string Triple; if (getModuleTriple(bitcode, size, Triple) == 0) return Triple.find(triple) != std::string::npos; -- 2.30.2