-
Notifications
You must be signed in to change notification settings - Fork 787
[SYCL] Add OSUtil::getCurrentDSODir() function #857
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.
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
romanovvlad
merged 5 commits into
intel:sycl
from
asavonic:private/asavonic/osutils-dso-path
Nov 25, 2019
Merged
Changes from all commits
Commits
Show all changes
5 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,5 @@ | ||
set(sycl_lib_dir $<TARGET_FILE_DIR:sycl>) | ||
add_definitions(-DSYCL_LIB_DIR="${sycl_lib_dir}") | ||
add_sycl_unittest(MiscTests | ||
OsUtils.cpp | ||
) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,61 @@ | ||
//==---- OsUtils.cpp --- os_utils unit test --------------------------------==// | ||
// | ||
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions. | ||
// See https://llvm.org/LICENSE.txt for license information. | ||
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
// | ||
//===----------------------------------------------------------------------===// | ||
|
||
#include <CL/sycl/detail/os_util.hpp> | ||
#include <gtest/gtest.h> | ||
|
||
#ifdef _WIN32 | ||
/// Compare for string equality, but ignore difference between forward slash (/) | ||
/// and backward slash (\). | ||
/// | ||
/// This difference can be tricky to avoid, because CMake operates with forward | ||
/// slashes even on Windows, and it can be problematic to convert them when | ||
/// CMake generator expressions are involved. It's easier to handle slashes | ||
/// here in the test itself. | ||
bool isSameDir(const char* LHS, const char* RHS) { | ||
char L = 0, R = 0; | ||
do { | ||
L = *LHS++; | ||
R = *RHS++; | ||
if (L != R) { | ||
if (!((L == '\\' || L == '/') && (R == '\\' || R == '/'))) { | ||
return false; | ||
} | ||
} | ||
} while (L != '\0' && R != '\0'); | ||
bool SameLen = (L == '\0' && R == '\0'); | ||
return SameLen; | ||
} | ||
#else | ||
#include <sys/stat.h> | ||
#include <stdlib.h> | ||
/// Check with respect to symbolic links | ||
bool isSameDir(const char* LHS, const char* RHS) { | ||
struct stat StatBuf; | ||
if (stat(LHS, &StatBuf)) { | ||
perror("stat failed"); | ||
exit(EXIT_FAILURE); | ||
} | ||
ino_t InodeLHS = StatBuf.st_ino; | ||
if (stat(RHS, &StatBuf)) { | ||
perror("stat failed"); | ||
exit(EXIT_FAILURE); | ||
} | ||
ino_t InodeRHS = StatBuf.st_ino; | ||
return InodeRHS == InodeLHS; | ||
} | ||
#endif | ||
|
||
class OsUtilsTest : public ::testing::Test { | ||
}; | ||
|
||
TEST_F(OsUtilsTest, getCurrentDSODir) { | ||
std::string DSODir = cl::sycl::detail::OSUtil::getCurrentDSODir(); | ||
ASSERT_TRUE(isSameDir(DSODir.c_str(), SYCL_LIB_DIR)) << | ||
"expected: " << SYCL_LIB_DIR << ", got: " << DSODir; | ||
} |
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.