svn commit: r519223 - in head/lang/compute-runtime: . files
Jan Beich
jbeich at FreeBSD.org
Sat Dec 7 17:31:59 UTC 2019
Author: jbeich
Date: Sat Dec 7 17:31:58 2019
New Revision: 519223
URL: https://svnweb.freebsd.org/changeset/ports/519223
Log:
lang/compute-runtime: drop TEST option to reduce maintenance
Done in a separate commit to allow restarting the effort in future.
Deleted:
head/lang/compute-runtime/files/patch-libc++
Modified:
head/lang/compute-runtime/Makefile (contents, props changed)
head/lang/compute-runtime/files/patch-backtrace (contents, props changed)
head/lang/compute-runtime/files/patch-includes (contents, props changed)
head/lang/compute-runtime/files/patch-unix (contents, props changed)
Modified: head/lang/compute-runtime/Makefile
==============================================================================
--- head/lang/compute-runtime/Makefile Sat Dec 7 17:31:44 2019 (r519222)
+++ head/lang/compute-runtime/Makefile Sat Dec 7 17:31:58 2019 (r519223)
@@ -20,25 +20,17 @@ USES= cmake:noninja compiler:c++14-lang pkgconfig
USE_GITHUB= yes
USE_LDCONFIG= yes
GH_ACCOUNT= intel
+CMAKE_ON= SKIP_ALL_ULT
CMAKE_ARGS= -DNEO_DRIVER_VERSION:STRING="${DISTVERSIONFULL}"
PLIST_FILES= etc/OpenCL/vendors/intel.icd \
bin/ocloc \
lib/intel-opencl/libigdrcl.so
-OPTIONS_DEFINE= TEST
-
-# XXX Unbundle googletest
-TEST_CMAKE_BOOL_OFF= SKIP_ALL_ULT
-TEST_BROKEN= many tests fail
-
post-patch:
@${REINPLACE_CMD} -e '/-Werror/d' \
${WRKSRC}/CMakeLists.txt
@${REINPLACE_CMD} -e '/defaults/!s,/etc",${PREFIX}&,' \
${WRKSRC}/package.cmake
-# XXX libexecinfo backtraces are incomplete
- @${REINPLACE_CMD} -e 's/SegFault/DISABLED_&/' \
- ${WRKSRC}/unit_tests/offline_compiler/segfault_test/main.cpp
post-install:
# install/strip has no effect on install(FILES), so strip manually
Modified: head/lang/compute-runtime/files/patch-backtrace
==============================================================================
--- head/lang/compute-runtime/files/patch-backtrace Sat Dec 7 17:31:44 2019 (r519222)
+++ head/lang/compute-runtime/files/patch-backtrace Sat Dec 7 17:31:58 2019 (r519223)
@@ -4,11 +4,6 @@ In file included from offline_compiler/utilities/linux
offline_compiler/utilities/linux/safety_guard_linux.h:36:25: error: implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'int' [-Werror,-Wshorten-64-to-32]
backtraceSize = backtrace(addresses, callstackDepth);
~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-core/unit_tests/helpers/memory_management.cpp:113:46: error:
- implicit conversion loses integer precision: 'size_t' (aka 'unsigned long') to 'int'
- [-Werror,-Wshorten-64-to-32]
- ...= logTraces ? backtrace(eventAllocation.callstack, AllocationEvent::CallStackSize) : 0;
- ~ ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
ld: error: undefined symbol: backtrace
>>> referenced by safety_caller_linux.cpp
@@ -17,39 +12,6 @@ ld: error: undefined symbol: backtrace_symbols
>>> referenced by safety_caller_linux.cpp
>>> CMakeFiles/ocloc.dir/utilities/linux/safety_caller_linux.cpp.o:(SafetyGuardLinux::sigAction(int, __siginfo*, void*))
-ld: error: undefined symbol: backtrace_symbols
->>> referenced by memory_management.cpp
->>> CMakeFiles/elflib_tests.dir/__/__/core/unit_tests/helpers/memory_management.cpp.o:(MemoryManagement::printCallStack(MemoryManagement::AllocationEvent const&))
-
-ld: error: undefined symbol: backtrace
->>> referenced by memory_management.cpp
->>> CMakeFiles/elflib_tests.dir/__/__/core/unit_tests/helpers/memory_management.cpp.o:(void* MemoryManagement::allocate<(MemoryManagement::AllocationEvent::EventType)1, (MemoryManagement::AllocationEvent::EventType)2>(unsigned long))
->>> referenced by memory_management.cpp
->>> CMakeFiles/elflib_tests.dir/__/__/core/unit_tests/helpers/memory_management.cpp.o:(void* MemoryManagement::allocate<(MemoryManagement::AllocationEvent::EventType)3, (MemoryManagement::AllocationEvent::EventType)4>(unsigned long, std::nothrow_t const&))
->>> referenced by memory_management.cpp
->>> CMakeFiles/elflib_tests.dir/__/__/core/unit_tests/helpers/memory_management.cpp.o:(void* MemoryManagement::allocate<(MemoryManagement::AllocationEvent::EventType)5, (MemoryManagement::AllocationEvent::EventType)6>(unsigned long))
->>> referenced by memory_management.cpp
->>> CMakeFiles/elflib_tests.dir/__/__/core/unit_tests/helpers/memory_management.cpp.o:(void* MemoryManagement::allocate<(MemoryManagement::AllocationEvent::EventType)7, (MemoryManagement::AllocationEvent::EventType)8>(unsigned long, std::nothrow_t const&))
->>> referenced by memory_management.cpp
->>> CMakeFiles/elflib_tests.dir/__/__/core/unit_tests/helpers/memory_management.cpp.o:(void MemoryManagement::deallocate<(MemoryManagement::AllocationEvent::EventType)9>(void*))
->>> referenced by memory_management.cpp
->>> CMakeFiles/elflib_tests.dir/__/__/core/unit_tests/helpers/memory_management.cpp.o:(void MemoryManagement::deallocate<(MemoryManagement::AllocationEvent::EventType)10>(void*))
-
-ld: error: undefined symbol: backtrace
->>> referenced by safety_guard_caller_linux.cpp
->>> CMakeFiles/ocloc_segfault_test.dir/linux/safety_guard_caller_linux.cpp.o:(SafetyGuardLinux::sigAction(int, __siginfo*, void*))
-
-ld: error: undefined symbol: backtrace_symbols
->>> referenced by safety_guard_caller_linux.cpp
->>> CMakeFiles/ocloc_segfault_test.dir/linux/safety_guard_caller_linux.cpp.o:(SafetyGuardLinux::sigAction(int, __siginfo*, void*))
-
-ld: error: undefined symbol: backtrace
->>> referenced by safety_caller_linux.cpp
->>> CMakeFiles/ocloc_tests.dir/__/__/offline_compiler/utilities/linux/safety_caller_linux.cpp.o:(SafetyGuardLinux::sigAction(int, __siginfo*, void*))
-ld: error: undefined symbol: backtrace_symbols
->>> referenced by safety_caller_linux.cpp
->>> CMakeFiles/ocloc_tests.dir/__/__/offline_compiler/utilities/linux/safety_caller_linux.cpp.o:(SafetyGuardLinux::sigAction(int, __siginfo*, void*))
-
--- offline_compiler/utilities/linux/safety_guard_linux.h.orig 2019-11-22 15:41:47 UTC
+++ offline_compiler/utilities/linux/safety_guard_linux.h
@@ -33,7 +33,7 @@ class SafetyGuardLinux {
@@ -61,35 +23,6 @@ ld: error: undefined symbol: backtrace_symbols
callstack = backtrace_symbols(addresses, backtraceSize);
for (int i = 0; i < backtraceSize; ++i) {
---- core/unit_tests/helpers/memory_management.cpp.orig 2019-11-22 15:41:47 UTC
-+++ core/unit_tests/helpers/memory_management.cpp
-@@ -110,7 +110,7 @@ static void *allocate(size_t size) {
- eventAllocation.address = p;
- eventAllocation.event = typeValid;
- #if defined(__linux__)
-- eventAllocation.frames = logTraces ? backtrace(eventAllocation.callstack, AllocationEvent::CallStackSize) : 0;
-+ eventAllocation.frames = logTraces ? (int)backtrace(eventAllocation.callstack, AllocationEvent::CallStackSize) : 0;
- #elif defined(_WIN32)
- eventAllocation.frames = logTraces ? CaptureStackBackTrace(0, AllocationEvent::CallStackSize, eventAllocation.callstack, NULL) : 0;
- #else
-@@ -162,7 +162,7 @@ static void *allocate(size_t size, const std::nothrow_
- eventAllocation.address = p;
- eventAllocation.size = size;
- #if defined(__linux__)
-- eventAllocation.frames = logTraces ? backtrace(eventAllocation.callstack, AllocationEvent::CallStackSize) : 0;
-+ eventAllocation.frames = logTraces ? (int)backtrace(eventAllocation.callstack, AllocationEvent::CallStackSize) : 0;
- #elif defined(_WIN32)
- eventAllocation.frames = logTraces ? CaptureStackBackTrace(0, AllocationEvent::CallStackSize, eventAllocation.callstack, NULL) : 0;
- #else
-@@ -207,7 +207,7 @@ static void deallocate(void *p) {
- eventDeallocation.address = p;
- eventDeallocation.size = -1;
- #if defined(__linux__)
-- eventDeallocation.frames = logTraces ? backtrace(eventDeallocation.callstack, AllocationEvent::CallStackSize) : 0;
-+ eventDeallocation.frames = logTraces ? (int)backtrace(eventDeallocation.callstack, AllocationEvent::CallStackSize) : 0;
- #elif defined(_WIN32)
- eventDeallocation.frames = logTraces ? CaptureStackBackTrace(0, AllocationEvent::CallStackSize, eventDeallocation.callstack, NULL) : 0;
- #else
--- offline_compiler/CMakeLists.txt.orig 2019-11-29 14:23:34 UTC
+++ offline_compiler/CMakeLists.txt
@@ -124,6 +124,9 @@ endif()
@@ -102,39 +35,3 @@ ld: error: undefined symbol: backtrace_symbols
endif()
target_link_libraries(ocloc elflib)
---- unit_tests/elflib/CMakeLists.txt.orig 2019-11-29 14:23:34 UTC
-+++ unit_tests/elflib/CMakeLists.txt
-@@ -21,6 +21,9 @@ set_property(TARGET elflib_tests APPEND_STRING PROPERT
-
- if(UNIX)
- target_link_libraries(elflib_tests ${IGDRCL_EXTRA_LIBS})
-+ if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|NetBSD|OpenBSD")
-+ target_link_libraries(elflib_tests execinfo)
-+ endif()
- endif()
-
- add_custom_target(run_elflib_tests ALL DEPENDS unit_tests elflib_tests)
---- unit_tests/offline_compiler/segfault_test/CMakeLists.txt.orig 2019-11-29 14:23:34 UTC
-+++ unit_tests/offline_compiler/segfault_test/CMakeLists.txt
-@@ -39,6 +39,9 @@ if(MSVC)
- endif()
- if(UNIX)
- target_link_libraries(ocloc_segfault_test dl pthread)
-+ if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|NetBSD|OpenBSD")
-+ target_link_libraries(ocloc_segfault_test execinfo)
-+ endif()
- endif()
-
- set(CLOC_SEGFAULT_TEST_INCLUDES
---- unit_tests/offline_compiler/CMakeLists.txt.orig 2019-11-29 14:23:34 UTC
-+++ unit_tests/offline_compiler/CMakeLists.txt
-@@ -86,6 +86,9 @@ endif()
-
- if(UNIX)
- target_link_libraries(ocloc_tests dl pthread)
-+ if(CMAKE_SYSTEM_NAME MATCHES "DragonFly|FreeBSD|NetBSD|OpenBSD")
-+ target_link_libraries(ocloc_tests execinfo)
-+ endif()
- endif()
-
- get_property(CLOC_FOLDER TARGET ocloc PROPERTY FOLDER)
Modified: head/lang/compute-runtime/files/patch-includes
==============================================================================
--- head/lang/compute-runtime/files/patch-includes Sat Dec 7 17:31:44 2019 (r519222)
+++ head/lang/compute-runtime/files/patch-includes Sat Dec 7 17:31:58 2019 (r519223)
@@ -11,15 +11,6 @@ runtime/tbx/tbx_sockets_imp.cpp:107:9: error: unknown
struct sockaddr {
^
-unit_tests/main.cpp:116:18: error:
- variable has incomplete type 'struct sigaction'
-struct sigaction oldSigAbrt;
- ^
-unit_tests/main.cpp:116:8: note:
- forward declaration of 'sigaction'
-struct sigaction oldSigAbrt;
- ^
-
--- runtime/tbx/tbx_sockets_imp.cpp.orig 2019-11-22 15:41:47 UTC
+++ runtime/tbx/tbx_sockets_imp.cpp
@@ -18,6 +18,7 @@ typedef int socklen_t;
@@ -30,16 +21,3 @@ struct sigaction oldSigAbrt;
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
---- unit_tests/main.cpp.orig 2019-11-22 15:41:47 UTC
-+++ unit_tests/main.cpp
-@@ -32,6 +32,10 @@
- #include <sstream>
- #include <thread>
-
-+#ifndef _WIN32
-+#include <signal.h>
-+#endif
-+
- #ifdef WIN32
- const char *fSeparator = "\\";
- #else
Modified: head/lang/compute-runtime/files/patch-unix
==============================================================================
--- head/lang/compute-runtime/files/patch-unix Sat Dec 7 17:31:44 2019 (r519222)
+++ head/lang/compute-runtime/files/patch-unix Sat Dec 7 17:31:58 2019 (r519223)
@@ -24,196 +24,3 @@ core/elf/writer.cpp:76:5: error:
#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"
More information about the svn-ports-all
mailing list