Skip to content

[UR][OPENCL] Eliminate usage of regex in opencl #1039

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kbenzie merged 2 commits into from
Nov 24, 2023
Merged

[UR][OPENCL] Eliminate usage of regex in opencl #1039

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
56f6994
[UR][OPENCL] eliminate usage of regex in opencl
Nov 3, 2023
63dfb35
Merge branch 'adapters' into eliminate-usage-of-regex-in-opencl
Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 18 additions & 6 deletions source/adapters/opencl/common.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@
#include <climits>
#include <map>
#include <mutex>
#include <regex>
#include <ur/ur.hpp>

/**
Expand Down Expand Up @@ -72,12 +71,25 @@ class OpenCLVersion {
* 'OpenCL<space><ocl_major_version.ocl_minor_version><space><vendor-specific
* information>' for devices.
*/
std::regex Rx("OpenCL ([0-9]+)\\.([0-9]+)");
std::smatch Match;
std::string_view Prefix = "OpenCL ";
size_t VersionBegin = Version.find_first_of(" ");
size_t VersionEnd = Version.find_first_of(" ", VersionBegin + 1);
size_t VersionSeparator = Version.find_first_of(".", VersionBegin + 1);

if (std::regex_search(Version, Match, Rx) && (Match.size() == 3)) {
OCLMajor = strtoul(Match[1].str().c_str(), nullptr, 10);
OCLMinor = strtoul(Match[2].str().c_str(), nullptr, 10);
bool HaveOCLPrefix =
std::equal(Prefix.begin(), Prefix.end(), Version.begin());

if (HaveOCLPrefix && VersionBegin != std::string::npos &&
VersionEnd != std::string::npos &&
VersionSeparator != std::string::npos) {

std::string VersionMajor{Version.begin() + VersionBegin + 1,
Version.begin() + VersionSeparator};
std::string VersionMinor{Version.begin() + VersionSeparator + 1,
Version.begin() + VersionEnd};

OCLMajor = strtoul(VersionMajor.c_str(), nullptr, 10);
OCLMinor = strtoul(VersionMinor.c_str(), nullptr, 10);

if (!isValid()) {
OCLMajor = OCLMinor = 0;
Expand Down
3 changes: 3 additions & 0 deletions source/adapters/opencl/kernel.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,9 @@
//===----------------------------------------------------------------------===//
#include "common.hpp"

#include <algorithm>
#include <memory>

UR_APIEXPORT ur_result_t UR_APICALL
urKernelCreate(ur_program_handle_t hProgram, const char *pKernelName,
ur_kernel_handle_t *phKernel) {
Expand Down