remove llvm-symbolizer

Author: AllanZyne

source/loader/CMakeLists.txt

@@ -120,8 +120,6 @@ if(UR_ENABLE_SANITIZER)
         ${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/device_sanitizer_report.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/stacktrace.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/stacktrace.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/symbolizer_llvm.cpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/symbolizer_llvm.hpp
         ${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/ur_sanddi.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/ur_sanitizer_layer.cpp
         ${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/ur_sanitizer_layer.hpp

source/loader/layers/sanitizer/common.hpp

@@ -82,11 +82,7 @@ inline constexpr uptr ComputeRZLog(uptr user_requested_size) {
             return Result;                                                     \
     }
 
-struct BacktraceInfo {
-    uptr offset;
-    std::string module;
-    std::string debug;
-};
+using BacktraceInfo = std::string;
 
 struct SourceInfo {
     std::string file;

source/loader/layers/sanitizer/linux/backtrace.cpp

@@ -14,40 +14,23 @@
 
 namespace ur_sanitizer_layer {
 
-namespace {
-
-bool ExtractSymbolInfo(const char *symbol, BacktraceInfo &info) {
-    info.debug = std::string(symbol);
-
-    auto s1 = std::strrchr(symbol, '(');
-    info.module = std::string(symbol, s1 - symbol);
-    auto s2 = std::strrchr(symbol, '[');
-    info.offset = std::stoull(s2 + 1, nullptr, 16);
-    return true;
-}
-
-} // namespace
-
 StackTrace GetCurrentBacktrace() {
-    void *backtraceFrames[MAX_BACKTRACE_FRAMES];
-    int frameCount = backtrace(backtraceFrames, MAX_BACKTRACE_FRAMES);
-    char **backtraceStr = backtrace_symbols(backtraceFrames, frameCount);
+    void *Frames[MAX_BACKTRACE_FRAMES];
+    int FrameCount = backtrace(Frames, MAX_BACKTRACE_FRAMES);
+    char **Symbols = backtrace_symbols(Frames, FrameCount);
 
-    if (backtraceStr == nullptr) {
+    if (Symbols == nullptr) {
         return StackTrace();
     }
 
-    StackTrace stack;
-    for (int i = 0; i < frameCount; i++) {
-        BacktraceInfo addr_info;
-        if (!ExtractSymbolInfo(backtraceStr[i], addr_info)) {
-            continue;
-        }
-        stack.stack.emplace_back(std::move(addr_info));
+    StackTrace Stack;
+    for (int i = 0; i < FrameCount; i++) {
+        BacktraceInfo addr_info(Symbols[i]);
+        Stack.stack.emplace_back(std::move(addr_info));
     }
-    free(backtraceStr);
+    free(Symbols);
 
-    return stack;
+    return Stack;
 }
 
 } // namespace ur_sanitizer_layer

source/loader/layers/sanitizer/stacktrace.cpp

@@ -11,20 +11,14 @@
  */
 
 #include "stacktrace.hpp"
-#include "symbolizer_llvm.hpp"
 #include "ur_sanitizer_layer.hpp"
 
 namespace ur_sanitizer_layer {
 
 namespace {
 
-std::string GetFileName(const std::string &FilePath) {
-    auto p = FilePath.find_last_of('/');
-    return FilePath.substr(p + 1);
-}
-
-bool StartWith(const std::string &Str, const char *Pattern) {
-    return Str.rfind(Pattern, 0) == 0;
+bool Contains(const std::string &s, const char *p) {
+    return s.find(p) != std::string::npos;
 }
 
 } // namespace
@@ -37,28 +31,13 @@ void StackTrace::print() const {
     unsigned index = 0;
 
     for (auto &BI : stack) {
-        auto ModuleFile = GetFileName(BI.module);
-        if (StartWith(ModuleFile, "libsycl.so") ||
-            StartWith(ModuleFile, "libpi_unified_runtime.so") ||
-            StartWith(ModuleFile, "libur_loader.so")) {
+        // Skip runtime modules
+        if (Contains(BI, "libsycl.so") ||
+            Contains(BI, "libpi_unified_runtime.so") ||
+            Contains(BI, "libur_loader.so")) {
             continue;
         }
-
-        SourceInfo SI;
-        for (auto &symbolizer : SymbolizerTools) {
-            if (symbolizer->symbolizePC(BI, SI)) {
-                break;
-            }
-        }
-
-        if (!SI.file.empty()) {
-            context.logger.always("  #{} {} in {} {}:{}:{}", index,
-                                  (void *)BI.offset, SI.function, SI.file,
-                                  SI.line, SI.column);
-        } else {
-            context.logger.always("  #{} {} in {} {}", index, (void *)BI.offset,
-                                  SI.function, BI.module);
-        }
+        context.logger.always("  #{} {}", index, BI);
         ++index;
     }
     context.logger.always("");

source/loader/layers/sanitizer/symbolizer_llvm.cpp

@@ -11,7 +11,6 @@
  */
 
 #include "asan_interceptor.hpp"
-#include "symbolizer_llvm.hpp"
 #include "ur_sanitizer_layer.hpp"
 #include "ur_sanitizer_utils.hpp"
 
@@ -543,8 +542,6 @@ ur_result_t context_t::init(ur_dditable_t *dditable,
             UR_API_VERSION_CURRENT, &dditable->USM);
     }
 
-    InitSymbolizers();
-
     return result;
 }