diff options
Diffstat (limited to 'lang/compute-runtime/files/patch-unix')
-rw-r--r-- | lang/compute-runtime/files/patch-unix | 219 |
1 files changed, 219 insertions, 0 deletions
diff --git a/lang/compute-runtime/files/patch-unix b/lang/compute-runtime/files/patch-unix new file mode 100644 index 000000000000..32660a0e3c86 --- /dev/null +++ b/lang/compute-runtime/files/patch-unix @@ -0,0 +1,219 @@ +Relax Linux checks for the code works on any non-Windows platform + +core/elf/writer.cpp:54:9: error: + use of undeclared identifier 'memcpy_s' + memcpy_s(data, queueFront.dataSize, queueFront.data.c_str(), queueFront.dataSize); + ^ +core/elf/writer.cpp:59:13: error: + use of undeclared identifier 'memcpy_s' + memcpy_s(curString, queueFront.name.size(), queueFront.name.c_str(), queueFront.name.size()); + ^ +core/elf/writer.cpp:76:5: error: + use of undeclared identifier 'memcpy_s' + memcpy_s(curSectionHeader, sizeof(SElf64SectionHeader), + ^ + +--- core/helpers/string.h.orig 2019-11-22 15:41:47 UTC ++++ core/helpers/string.h +@@ -10,7 +10,7 @@ + #include <memory> + #include <type_traits> + +-#if defined(__linux__) ++#if !defined(_WIN32) + + #include <cstring> + #include <errno.h> +--- core/unit_tests/compiler_interface/compiler_interface_tests.cpp.orig 2019-11-22 15:41:47 UTC ++++ core/unit_tests/compiler_interface/compiler_interface_tests.cpp +@@ -24,7 +24,7 @@ using namespace NEO; + + #if defined(_WIN32) + const char *gBadDompilerDllName = "bad_compiler.dll"; +-#elif defined(__linux__) ++#elif !defined(__APPLE__) + const char *gCBadDompilerDllName = "libbad_compiler.so"; + #else + #error "Unknown OS!" +--- core/unit_tests/helpers/memory_management.cpp.orig 2019-11-22 15:41:47 UTC ++++ core/unit_tests/helpers/memory_management.cpp +@@ -18,7 +18,7 @@ + #include <iostream> + #include <new> + +-#if defined(__linux__) ++#if !defined(__APPLE__) && !defined(_WIN32) + #include <cstdio> + #include <dlfcn.h> + #include <execinfo.h> +@@ -109,7 +109,7 @@ static void *allocate(size_t size) { + + eventAllocation.address = p; + eventAllocation.event = typeValid; +-#if defined(__linux__) ++#if !defined(__APPLE__) && !defined(_WIN32) + eventAllocation.frames = logTraces ? (int)backtrace(eventAllocation.callstack, AllocationEvent::CallStackSize) : 0; + #elif defined(_WIN32) + eventAllocation.frames = logTraces ? CaptureStackBackTrace(0, AllocationEvent::CallStackSize, eventAllocation.callstack, NULL) : 0; +@@ -161,7 +161,7 @@ static void *allocate(size_t size, const std::nothrow_ + : typeFail; + eventAllocation.address = p; + eventAllocation.size = size; +-#if defined(__linux__) ++#if !defined(__APPLE__) && !defined(_WIN32) + eventAllocation.frames = logTraces ? (int)backtrace(eventAllocation.callstack, AllocationEvent::CallStackSize) : 0; + #elif defined(_WIN32) + eventAllocation.frames = logTraces ? CaptureStackBackTrace(0, AllocationEvent::CallStackSize, eventAllocation.callstack, NULL) : 0; +@@ -206,7 +206,7 @@ static void deallocate(void *p) { + eventDeallocation.event = typeValid; + eventDeallocation.address = p; + eventDeallocation.size = -1; +-#if defined(__linux__) ++#if !defined(__APPLE__) && !defined(_WIN32) + eventDeallocation.frames = logTraces ? (int)backtrace(eventDeallocation.callstack, AllocationEvent::CallStackSize) : 0; + #elif defined(_WIN32) + eventDeallocation.frames = logTraces ? CaptureStackBackTrace(0, AllocationEvent::CallStackSize, eventDeallocation.callstack, NULL) : 0; +@@ -312,7 +312,7 @@ std::string printCallStack(const MemoryManagement::All + printf("for detailed stack information turn on captureCallStacks in memory_management.h\n"); + } + if (event.frames > 0) { +-#if defined(__linux__) ++#if !defined(__APPLE__) && !defined(_WIN32) + char **bt = backtrace_symbols(event.callstack, event.frames); + char *demangled; + int status; +--- core/unit_tests/helpers/string_tests.cpp.orig 2019-11-22 15:41:47 UTC ++++ core/unit_tests/helpers/string_tests.cpp +@@ -10,7 +10,7 @@ + + #include "gtest/gtest.h" + +-#if defined(__linux__) ++#if !defined(_WIN32) + + TEST(StringHelpers, strncpy) { + char dst[1024] = ""; +--- unit_tests/fixtures/memory_management_fixture.cpp.orig 2019-11-22 15:41:47 UTC ++++ unit_tests/fixtures/memory_management_fixture.cpp +@@ -12,12 +12,12 @@ + #include "runtime/helpers/options.h" + + #include <cinttypes> +-#if defined(__linux__) ++#if !defined(_WIN32) + #include <cstdio> + #include <cxxabi.h> + #include <dlfcn.h> + #include <execinfo.h> +-#elif defined(_WIN32) ++#else + #include <Windows.h> + #pragma warning(push) // Saves the current warning state. + #pragma warning(disable : 4091) // Temporarily disables warning 4091. +--- unit_tests/main.cpp.orig 2019-11-22 15:41:47 UTC ++++ unit_tests/main.cpp +@@ -104,7 +104,7 @@ void applyWorkarounds() { + tempThreadID = t.get_id(); + t.join(); + } +-#ifdef __linux__ ++#ifndef _WIN32 + void handle_SIGALRM(int signal) { + std::cout << "Tests timeout on: " << lastTest << std::endl; + abort(); +@@ -158,7 +158,7 @@ std::string getRunPath(char *argv0) { + res = res.substr(0, pos); + + if (res == "." || pos == std::string::npos) { +-#if defined(__linux__) ++#if !defined(_WIN32) + res = getcwd(nullptr, 0); + #else + res = _getcwd(nullptr, 0); +@@ -176,7 +176,7 @@ int main(int argc, char **argv) { + + applyWorkarounds(); + +-#if defined(__linux__) ++#if !defined(_WIN32) + bool enable_segv = true; + bool enable_abrt = true; + if (getenv("IGDRCL_TEST_SELF_EXEC") == nullptr) { +@@ -373,7 +373,7 @@ int main(int argc, char **argv) { + if (_chdir(executionDirectory.c_str())) { + std::cout << "chdir into " << executionDirectory << " directory failed.\nThis might cause test failures." << std::endl; + } +-#elif defined(__linux__) ++#else + #include <unistd.h> + if (chdir(executionDirectory.c_str()) != 0) { + std::cout << "chdir into " << executionDirectory << " directory failed.\nThis might cause test failures." << std::endl; +@@ -412,7 +412,7 @@ int main(int argc, char **argv) { + gEnvironment->setMockFileNames(fclDebugVars.fileName, igcDebugVars.fileName); + gEnvironment->setDefaultDebugVars(fclDebugVars, igcDebugVars, device); + +-#if defined(__linux__) ++#if !defined(_WIN32) + //ULTs timeout + if (enable_alarm) { + unsigned int alarmTime = NEO::ultIterationMaxTime * ::testing::GTEST_FLAG(repeat); +--- unit_tests/offline_compiler/main.cpp.orig 2019-11-22 15:41:47 UTC ++++ unit_tests/offline_compiler/main.cpp +@@ -14,7 +14,7 @@ + + #ifdef WIN32 + const char *fSeparator = "\\"; +-#elif defined(__linux__) ++#else + const char *fSeparator = "/"; + #endif + +@@ -22,7 +22,7 @@ Environment *gEnvironment; + + std::string getRunPath() { + std::string res; +-#if defined(__linux__) ++#if !defined(_WIN32) + res = getcwd(nullptr, 0); + #else + res = _getcwd(nullptr, 0); +@@ -36,7 +36,7 @@ int main(int argc, char **argv) { + std::string devicePrefix("skl"); + std::string familyNameWithType("Gen9core"); + +-#if defined(__linux__) ++#if !defined(_WIN32) + if (getenv("CLOC_SELFTEST") == nullptr) { + setenv("CLOC_SELFTEST", "YES", 1); + +@@ -88,7 +88,7 @@ int main(int argc, char **argv) { + if (_chdir(familyNameWithType.c_str())) { + std::cout << "chdir into " << familyNameWithType << " directory failed.\nThis might cause test failures." << std::endl; + } +-#elif defined(__linux__) ++#else + #include <unistd.h> + if (chdir(familyNameWithType.c_str()) != 0) { + std::cout << "chdir into " << familyNameWithType << " directory failed.\nThis might cause test failures." << std::endl; +--- unit_tests/os_interface/linux/options.cpp.orig 2019-11-22 15:41:47 UTC ++++ unit_tests/os_interface/linux/options.cpp +@@ -15,7 +15,7 @@ namespace Os { + // These options determine the Linux specific behavior for + // the runtime unit tests + /////////////////////////////////////////////////////////////////////////////// +-#if defined(__linux__) ++#if !defined(__APPLE__) && !defined(_WIN32) + const char *frontEndDllName = "libmock_igdfcl.so"; + const char *igcDllName = "libmock_igc.so"; + const char *libvaDllName = nullptr; +--- unit_tests/os_interface/os_library_tests.cpp.orig 2019-11-22 15:41:47 UTC ++++ unit_tests/os_interface/os_library_tests.cpp +@@ -7,7 +7,7 @@ + + #if defined(_WIN32) + #include "core/os_interface/windows/os_library_win.h" +-#elif defined(__linux__) ++#else + #include "core/os_interface/linux/os_library_linux.h" + #endif + #include "core/os_interface/os_library.h" |